X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=3ad5384d626547c262784e60354403d4036d489a;hb=dceb54d45477a8af0632b703c53254c9a80a11db;hp=aeb0facf45be4665b321b2189d0510b31f9fa100;hpb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index aeb0fac..3ad5384 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -20,8 +20,6 @@ */ package jalview.gui; -import java.util.Locale; - import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; @@ -64,6 +62,7 @@ import java.util.HashMap; import java.util.Hashtable; import java.util.List; import java.util.ListIterator; +import java.util.Locale; import java.util.Vector; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -183,7 +182,7 @@ public class Desktop extends jalview.jbgui.GDesktop private static final String EXPERIMENTAL_FEATURES = "EXPERIMENTAL_FEATURES"; - protected static final String CONFIRM_KEYBOARD_QUIT = "CONFIRM_KEYBOARD_QUIT"; + public static final String CONFIRM_KEYBOARD_QUIT = "CONFIRM_KEYBOARD_QUIT"; public static HashMap savingFiles = new HashMap(); @@ -444,24 +443,6 @@ public class Desktop extends jalview.jbgui.GDesktop } } - /** - * APQHandlers sets handlers for About, Preferences and Quit actions - * peculiar to macOS's application menu. APQHandlers will check to see if a - * handler is supported before setting it. - */ - try - { - APQHandlers.setAPQHandlers(this); - } catch (Exception e) - { - System.out.println("Cannot set APQHandlers"); - // e.printStackTrace(); - } catch (Throwable t) - { - jalview.bin.Console - .warn("Error setting APQHandlers: " + t.toString()); - jalview.bin.Console.trace(Cache.getStackTraceString(t)); - } setIconImages(ChannelProperties.getIconList()); addWindowListener(new WindowAdapter()