mobeigi/filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move platform-specific utilities into net.filebot.platform.* package

Browse Source
This commit is contained in:
Reinhard Pointner 2017-03-06 20:52:04 +08:00
parent 3f418672eb
commit e2105771c0
25 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/net/filebot/Main.java
View File

@ -38,7 +38,8 @@ import net.filebot.cli.ArgumentBean;
import net.filebot.cli.ArgumentProcessor;
import net.filebot.cli.CmdlineException;
import net.filebot.format.ExpressionFormat;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.platform.windows.WinAppUtilities;
import net.filebot.ui.FileBotMenuBar;
import net.filebot.ui.GettingStartedStage;
import net.filebot.ui.MainFrame;
@ -49,7 +50,6 @@ import net.filebot.ui.SupportDialog;
import net.filebot.ui.transfer.FileTransferable;
import net.filebot.util.PreferencesMap.PreferencesEntry;
import net.filebot.util.ui.SwingEventBus;
import net.filebot.win.WinAppUtilities;
import net.miginfocom.swing.MigLayout;
public class Main {

2
source/net/filebot/MetaAttributeView.java
View File

@ -17,7 +17,7 @@ import java.util.Set;
import com.sun.jna.Platform;
import net.filebot.mac.MacXattrView;
import net.filebot.platform.mac.MacXattrView;
public class MetaAttributeView extends AbstractMap<String, String> {

2
source/net/filebot/UserFiles.java
View File

@ -27,7 +27,7 @@ import javax.swing.JFileChooser;
import com.apple.eio.FileManager;
import com.sun.jna.platform.FileUtils;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.util.FileUtilities;
import net.filebot.util.FileUtilities.ExtensionFileFilter;

2
source/net/filebot/format/ExpressionFormatFunctions.java
View File

@ -19,7 +19,7 @@ import com.sun.jna.Platform;
import groovy.lang.Closure;
import groovy.util.XmlSlurper;
import net.filebot.ApplicationFolder;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.util.FileUtilities;
/**

2
source/net/filebot/gio/GVFS.java → source/net/filebot/platform/gnome/GVFS.java
View File

@ -1,4 +1,4 @@
package net.filebot.gio;
package net.filebot.platform.gnome;
import java.io.File;
import java.net.URI;

2
source/net/filebot/gio/LibGIO.java → source/net/filebot/platform/gnome/LibGIO.java
View File

@ -1,5 +1,5 @@
package net.filebot.gio;
package net.filebot.platform.gnome;
import com.sun.jna.Library;
import com.sun.jna.Pointer;

2
source/net/filebot/gio/NativeGVFS.java → source/net/filebot/platform/gnome/NativeGVFS.java
View File

@ -1,5 +1,5 @@
package net.filebot.gio;
package net.filebot.platform.gnome;
import java.io.File;
import java.net.URI;

2
source/net/filebot/gio/PlatformGVFS.java → source/net/filebot/platform/gnome/PlatformGVFS.java
View File

@ -1,5 +1,5 @@
package net.filebot.gio;
package net.filebot.platform.gnome;
import static java.util.Arrays.*;
import static java.util.stream.Collectors.*;

4
source/net/filebot/mac/DropToUnlock.java → source/net/filebot/platform/mac/DropToUnlock.java
View File

@ -1,10 +1,10 @@
package net.filebot.mac;
package net.filebot.platform.mac;
import static java.util.Collections.*;
import static javax.swing.BorderFactory.*;
import static net.filebot.Logging.*;
import static net.filebot.UserFiles.*;
import static net.filebot.mac.MacAppUtilities.*;
import static net.filebot.platform.mac.MacAppUtilities.*;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.ui.SwingUI.*;

2
source/net/filebot/mac/MacAppUtilities.java → source/net/filebot/platform/mac/MacAppUtilities.java
View File

@ -1,4 +1,4 @@
package net.filebot.mac;
package net.filebot.platform.mac;
import static ca.weblite.objc.util.CocoaUtils.*;
import static net.filebot.Logging.*;

2
source/net/filebot/mac/MacXattrView.java → source/net/filebot/platform/mac/MacXattrView.java
View File

@ -1,4 +1,4 @@
package net.filebot.mac;
package net.filebot.platform.mac;
import java.nio.file.Path;
import java.text.Normalizer;

2
source/net/filebot/win/WinAppUtilities.java → source/net/filebot/platform/windows/WinAppUtilities.java
View File

@ -1,4 +1,4 @@
package net.filebot.win;
package net.filebot.platform.windows;
import static net.filebot.Logging.*;

2
source/net/filebot/ui/MainFrame.java
View File

@ -37,7 +37,7 @@ import com.google.common.eventbus.Subscribe;
import net.filebot.CacheManager;
import net.filebot.Settings;
import net.filebot.cli.GroovyPad;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.util.PreferencesMap.PreferencesEntry;
import net.filebot.util.ui.DefaultFancyListCellRenderer;
import net.filebot.util.ui.ShadowBorder;

2
source/net/filebot/ui/filter/FileTreeTransferablePolicy.java
View File

@ -15,7 +15,7 @@ import java.util.logging.Level;
import javax.swing.tree.TreeNode;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.ui.filter.FileTree.FileNode;
import net.filebot.ui.filter.FileTree.FolderNode;
import net.filebot.ui.transfer.BackgroundFileTransferablePolicy;

2
source/net/filebot/ui/rename/FormatDialog.java
View File

@ -65,8 +65,8 @@ import net.filebot.format.ExpressionFileFormat;
import net.filebot.format.ExpressionFormat;
import net.filebot.format.MediaBindingBean;
import net.filebot.format.SuppressedThrowables;
import net.filebot.mac.MacAppUtilities;
import net.filebot.media.MetaAttributes;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.util.DefaultThreadFactory;
import net.filebot.util.PreferencesList;
import net.filebot.util.PreferencesMap.PreferencesEntry;

2
source/net/filebot/ui/rename/HistoryDialog.java
View File

@ -72,10 +72,10 @@ import javax.swing.table.TableRowSorter;
import net.filebot.History;
import net.filebot.History.Element;
import net.filebot.History.Sequence;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.HistorySpooler;
import net.filebot.ResourceManager;
import net.filebot.StandardRenameAction;
import net.filebot.mac.MacAppUtilities;
import net.filebot.ui.transfer.FileExportHandler;
import net.filebot.ui.transfer.FileTransferablePolicy;
import net.filebot.ui.transfer.LoadAction;

2
source/net/filebot/ui/rename/PresetEditor.java
View File

@ -40,7 +40,7 @@ import net.filebot.WebServices;
import net.filebot.format.ExpressionFileFormat;
import net.filebot.format.ExpressionFilter;
import net.filebot.format.MediaBindingBean;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.ui.HeaderPanel;
import net.filebot.util.FileUtilities.ExtensionFileFilter;
import net.filebot.web.Datasource;

2
source/net/filebot/ui/rename/RenameAction.java
View File

@ -36,7 +36,7 @@ import net.filebot.NativeRenameAction;
import net.filebot.ResourceManager;
import net.filebot.StandardRenameAction;
import net.filebot.UserFiles;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.similarity.Match;
import net.filebot.util.ui.ProgressMonitor;
import net.filebot.util.ui.ProgressMonitor.ProgressWorker;

2
source/net/filebot/ui/rename/RenamePanel.java
View File

@ -68,8 +68,8 @@ import net.filebot.UserFiles;
import net.filebot.WebServices;
import net.filebot.format.ExpressionFileFormat;
import net.filebot.format.MediaBindingBean;
import net.filebot.mac.MacAppUtilities;
import net.filebot.media.MetaAttributes;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.similarity.Match;
import net.filebot.ui.SelectDialog;
import net.filebot.ui.rename.FormatDialog.Mode;

2
source/net/filebot/ui/sfv/ChecksumTableTransferablePolicy.java
View File

@ -21,7 +21,7 @@ import java.util.logging.Level;
import net.filebot.hash.HashType;
import net.filebot.hash.VerificationFileReader;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.ui.transfer.BackgroundFileTransferablePolicy;
import net.filebot.util.ExceptionUtilities;
import net.filebot.util.FileSet;

2
source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
View File

@ -62,7 +62,7 @@ import javax.swing.table.DefaultTableCellRenderer;
import net.filebot.ResourceManager;
import net.filebot.WebServices;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.subtitle.SubtitleMetrics;
import net.filebot.subtitle.SubtitleNaming;
import net.filebot.util.ui.AbstractBean;

2
source/net/filebot/ui/subtitle/SubtitleDropTarget.java
View File

@ -34,7 +34,7 @@ import javax.swing.JDialog;
import javax.swing.SwingUtilities;
import net.filebot.ResourceManager;
import net.filebot.mac.MacAppUtilities;
import net.filebot.platform.mac.MacAppUtilities;
import net.filebot.ui.subtitle.upload.SubtitleUploadDialog;
import net.filebot.util.FileUtilities;
import net.filebot.util.FileUtilities.ParentFilter;

2
source/net/filebot/ui/transfer/FileTransferable.java
View File

@ -17,7 +17,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Scanner;
import net.filebot.gio.GVFS;
import net.filebot.platform.gnome.GVFS;
public class FileTransferable implements Transferable {

3
test/net/filebot/gio/PlatformGVFSTest.java
View File

@ -7,6 +7,9 @@ import java.net.URI;
import org.junit.Test;
import net.filebot.platform.gnome.GVFS;
import net.filebot.platform.gnome.PlatformGVFS;
public class PlatformGVFSTest {
GVFS gvfs = new PlatformGVFS(new File("gvfs"));

1
test/net/filebot/web/TMDbClientTest.java
View File

@ -6,7 +6,6 @@ import static org.junit.Assert.*;
import java.net.URL;
import java.time.Duration;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Map;