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

Refactor com.apple.* usages to JDK 9

This commit is contained in:
Reinhard Pointner 2017-10-16 21:35:36 +02:00
parent f39b490061
commit 6cc4851fab
2 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,9 +199,7 @@ public class Main {
// configure main window // configure main window
if (isMacApp()) { if (isMacApp()) {
// Mac specific configuration // Mac specific configuration
MacAppUtilities.initializeApplication(); MacAppUtilities.initializeApplication(FileBotMenuBar.createHelp(), files -> SwingEventBus.getInstance().post(new FileTransferable(files)));
MacAppUtilities.setDefaultMenuBar(FileBotMenuBar.createHelp());
MacAppUtilities.setOpenFileHandler(openFiles -> SwingEventBus.getInstance().post(new FileTransferable(openFiles)));
} else if (isUbuntuApp()) { } else if (isUbuntuApp()) {
// Ubuntu/Debian specific configuration // Ubuntu/Debian specific configuration
frame.setIconImages(ResourceManager.getApplicationIcons()); frame.setIconImages(ResourceManager.getApplicationIcons());

46
source/net/filebot/platform/mac/MacAppUtilities.java
View File

@ -1,7 +1,6 @@
package net.filebot.platform.mac; package net.filebot.platform.mac;
import static ca.weblite.objc.util.CocoaUtils.*; import static ca.weblite.objc.util.CocoaUtils.*;
import static net.filebot.Logging.*;
import java.awt.Desktop; import java.awt.Desktop;
import java.awt.EventQueue; import java.awt.EventQueue;
@ -14,7 +13,6 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.logging.Level;
import javax.swing.JMenuBar; import javax.swing.JMenuBar;
import javax.swing.UIManager; import javax.swing.UIManager;
@ -94,41 +92,23 @@ public class MacAppUtilities {
return result; return result;
} }
public static void setDefaultMenuBar(JMenuBar menu) { public static void initializeApplication(JMenuBar appMenuBar, Consumer<List<File>> openFileHandler) {
try {
Desktop.getDesktop().setDefaultMenuBar(menu);
} catch (Throwable t) {
debug.log(Level.WARNING, t.getMessage(), t);
}
}
public static void setQuitStrategyCloseAll() {
try {
Desktop.getDesktop().setQuitStrategy(QuitStrategy.CLOSE_ALL_WINDOWS);
} catch (Throwable t) {
debug.log(Level.WARNING, t.getMessage(), t);
}
}
public static void setOpenFileHandler(Consumer<List<File>> handler) {
try {
Desktop.getDesktop().setOpenFileHandler(evt -> {
List<File> files = evt.getFiles();
if (files.size() > 0) {
handler.accept(files);
}
});
} catch (Throwable t) {
debug.log(Level.WARNING, t.getMessage(), t);
}
}
public static void initializeApplication() {
// improved UI defaults // improved UI defaults
UIManager.put("TitledBorder.border", UIManager.getBorder("InsetBorder.aquaVariant")); UIManager.put("TitledBorder.border", UIManager.getBorder("InsetBorder.aquaVariant"));
// make sure Application Quit Events get forwarded to normal Window Listeners // make sure Application Quit Events get forwarded to normal Window Listeners
setQuitStrategyCloseAll(); Desktop.getDesktop().setQuitStrategy(QuitStrategy.CLOSE_ALL_WINDOWS);
// set global menu bar
Desktop.getDesktop().setDefaultMenuBar(appMenuBar);
// set open file handler
Desktop.getDesktop().setOpenFileHandler(evt -> {
List<File> files = evt.getFiles();
if (files.size() > 0) {
openFileHandler.accept(files);
}
});
} }
public static boolean isLockedFolder(File folder) { public static boolean isLockedFolder(File folder) {