JAL-3312 Fixed SHIFT-CMD/SHIFT-CTRL Key combinations missing SHIFT

diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper.java b/src/jalview/util/ShortcutKeyMaskExWrapper.java
index c9ed231..f73b8d4 100644 (file)
--- a/src/jalview/util/ShortcutKeyMaskExWrapper.java
+++ b/src/jalview/util/ShortcutKeyMaskExWrapper.java
@@ -23,14 +23,16 @@ public class ShortcutKeyMaskExWrapper
 
     if (specversion >= modern)
     {
 
     if (specversion >= modern)
     {

-      wrapper = new ShortcutKeyMaskExWrapper11();
+      wrapper = new jalview.util.ShortcutKeyMaskExWrapper11();
+      SHIFT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper11.SHIFT_DOWN_MASK;
+      ALT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper11.ALT_DOWN_MASK;

     }
     else
     {
     }
     else
     {

-      wrapper = new ShortcutKeyMaskExWrapper8();
+      wrapper = new jalview.util.ShortcutKeyMaskExWrapper8();
+      SHIFT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper8.SHIFT_DOWN_MASK;
+      ALT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper8.ALT_DOWN_MASK;

     }
     }

-    SHIFT_DOWN_MASK = wrapper.SHIFT_DOWN_MASK;
-    ALT_DOWN_MASK = wrapper.ALT_DOWN_MASK;

   }
 
   public static int getMenuShortcutKeyMaskEx()
   }
 
   public static int getMenuShortcutKeyMaskEx()

diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper11.java b/src/jalview/util/ShortcutKeyMaskExWrapper11.java
index 41a6aa0..7a3c8ca 100644 (file)
--- a/src/jalview/util/ShortcutKeyMaskExWrapper11.java
+++ b/src/jalview/util/ShortcutKeyMaskExWrapper11.java
@@ -7,8 +7,15 @@ import java.awt.event.MouseEvent;
 
 public class ShortcutKeyMaskExWrapper11 implements ShortcutKeyMaskExWrapperI
 {
 
 public class ShortcutKeyMaskExWrapper11 implements ShortcutKeyMaskExWrapperI
 {

-  public final static int SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK;
-  public final static int ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK;
+  public final static int SHIFT_DOWN_MASK;
+
+  public final static int ALT_DOWN_MASK;
+
+  static
+  {
+    SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK;
+    ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK;
+  }

 
   @Override
   public int getMenuShortcutKeyMaskEx()
 
   @Override
   public int getMenuShortcutKeyMaskEx()

@@ -31,4 +38,5 @@ public class ShortcutKeyMaskExWrapper11 implements ShortcutKeyMaskExWrapperI
     return e.getModifiersEx();
   }
 
     return e.getModifiersEx();
   }
 

+

 }
 }

diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper8.java b/src/jalview/util/ShortcutKeyMaskExWrapper8.java
index 78254b5..a7817bd 100644 (file)
--- a/src/jalview/util/ShortcutKeyMaskExWrapper8.java
+++ b/src/jalview/util/ShortcutKeyMaskExWrapper8.java
@@ -7,8 +7,15 @@ import java.awt.event.MouseEvent;
 
 public class ShortcutKeyMaskExWrapper8 implements ShortcutKeyMaskExWrapperI
 {
 
 public class ShortcutKeyMaskExWrapper8 implements ShortcutKeyMaskExWrapperI
 {

-  public final static int SHIFT_DOWN_MASK = KeyEvent.SHIFT_MASK;
-  public final static int ALT_DOWN_MASK = KeyEvent.ALT_MASK;
+  public final static int SHIFT_DOWN_MASK;
+
+  public final static int ALT_DOWN_MASK;
+
+  static
+  {
+    SHIFT_DOWN_MASK = KeyEvent.SHIFT_MASK;
+    ALT_DOWN_MASK = KeyEvent.ALT_MASK;
+  }

 
   @Override
   public int getMenuShortcutKeyMaskEx()
 
   @Override
   public int getMenuShortcutKeyMaskEx()