First try at merging didn't go so well.

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 3d91e47..7a3f238 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -2506,18 +2506,10 @@ public class Desktop extends GDesktop
    */
   protected void addQuitHandler()
   {
-<<<<<<< HEAD
-    getRootPane()
-            .getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                    KeyStroke
-                            .getKeyStroke(KeyEvent.VK_Q,
-                                    jalview.util.ShortcutKeyMaskExWrapper
-                                            .getMenuShortcutKeyMaskEx()),
-=======
+
     getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
             .put(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
                     Platform.SHORTCUT_KEY_MASK),
->>>>>>> refs/heads/Jalview-JS/develop.JAL-3446.ctrlDown
                     "Quit");
     getRootPane().getActionMap().put("Quit", new AbstractAction()
     {

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 371cd32..458c02d 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -22,7 +22,9 @@ package jalview.util;
 
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.GraphicsEnvironment;
 import java.awt.Toolkit;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,6 +34,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;