Moved from Java 8 to Java 12

husonlab · Jun 7, 2019 · a8189ef · a8189ef
1 parent 5026913
commit a8189ef
Show file tree

Hide file tree

Showing 66 changed files with 71 additions and 72 deletions.
diff --git a/src/dendroscope/algorithms/levelknet/tmp/Cass.java b/src/dendroscope/algorithms/levelknet/tmp/Cass.java
@@ -409,16 +409,16 @@ public Vector SL(int k) {
                 // loop through each pair of edges
                 for (int e1 = 0; e1 < e; e1++) {
                     // skip this edge if it is not a cherry-edge and there are two cherries
-                    if (cherries.size() == 2 && !cherry1.contains(new Integer(e1)) && !cherry2.contains(new Integer(e1)) && xint[0] != Cass.DUMMY_NUMBER) {
+                    if (cherries.size() == 2 && !cherry1.contains((int) (e1)) && !cherry2.contains((int) (e1)) && xint[0] != Cass.DUMMY_NUMBER) {
                         continue;
                     }
                     for (int e2 = e1; e2 < e; e2++) {
                         // if there is a cherry we have to hit it
-                        if (cherries.size() > 0 && !cherry1.contains(new Integer(e1)) && !cherry1.contains(new Integer(e2)) && xint[0] != Cass.DUMMY_NUMBER) {
+                        if (cherries.size() > 0 && !cherry1.contains((int) (e1)) && !cherry1.contains((int) (e2)) && xint[0] != Cass.DUMMY_NUMBER) {
                             continue;
                         }
                         // if there are two cherries we have to hit both of them
-                        if (cherries.size() == 2 && !cherry2.contains(new Integer(e1)) && !cherry2.contains(new Integer(e2)) && xint[0] != Cass.DUMMY_NUMBER) {
+                        if (cherries.size() == 2 && !cherry2.contains((int) (e1)) && !cherry2.contains((int) (e2)) && xint[0] != Cass.DUMMY_NUMBER) {
                             continue;
                         }
                         // if e1 = e2 we subdivide this edge twice
@@ -630,7 +630,7 @@ public void addCluster(int cluster[]) {
             vecCluster.add(aCluster);
             Vector singleton = new Vector(0);
             singleton.add(aCluster);
-            if (!taxa.contains(new Integer(aCluster))) {
+            if (!taxa.contains((int) (aCluster))) {
                 clusterVec.add(singleton);
                 taxa.add(aCluster);
                 taxaInTaxa.add(singleton);

diff --git a/src/dendroscope/commands/AddTreeOrNetworkCommand.java b/src/dendroscope/commands/AddTreeOrNetworkCommand.java
@@ -75,7 +75,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/CloseCommand.java b/src/dendroscope/commands/CloseCommand.java
@@ -73,7 +73,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/ContractEdgeCommand.java b/src/dendroscope/commands/ContractEdgeCommand.java
@@ -74,7 +74,7 @@ public ImageIcon getIcon() {
      */
     public KeyStroke getAcceleratorKey() {
         return KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, Toolkit
-                .getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+                .getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/CopyCommand.java b/src/dendroscope/commands/CopyCommand.java
@@ -76,7 +76,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/CopyImageCommand.java b/src/dendroscope/commands/CopyImageCommand.java
@@ -70,7 +70,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/ExportCommand.java b/src/dendroscope/commands/ExportCommand.java
@@ -73,7 +73,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/ExportImageCommand.java b/src/dendroscope/commands/ExportImageCommand.java
@@ -74,7 +74,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/FindAgainCommand.java b/src/dendroscope/commands/FindAgainCommand.java
@@ -68,7 +68,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/FlipHorizontallyCommand.java b/src/dendroscope/commands/FlipHorizontallyCommand.java
@@ -81,7 +81,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/LessPanelsCommand.java b/src/dendroscope/commands/LessPanelsCommand.java
@@ -67,7 +67,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/LoadTaxonImageCommand.java b/src/dendroscope/commands/LoadTaxonImageCommand.java
@@ -28,7 +28,6 @@
 import jloda.util.parse.NexusStreamParser;
 
 import javax.swing.*;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -105,7 +104,7 @@ public void actionPerformed(ActionEvent event) {
         File file = null;
 
 
-        if (ProgramProperties.isMacOS() && (event != null && (event.getModifiers() & Event.SHIFT_MASK) == 0)) {
+        if (ProgramProperties.isMacOS() && (event != null && (event.getModifiers() & ActionEvent.SHIFT_MASK) == 0)) {
             //Use native file dialog on mac
             java.awt.FileDialog dialog = new java.awt.FileDialog(getViewer().getFrame(), "Open image directory", java.awt.FileDialog.LOAD);
             dialog.setFilenameFilter(new FilenameFilter() {

diff --git a/src/dendroscope/commands/MorePanelsCommand.java b/src/dendroscope/commands/MorePanelsCommand.java
@@ -67,7 +67,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_UP, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_UP, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/NewCommand.java b/src/dendroscope/commands/NewCommand.java
@@ -74,7 +74,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/OpenFileCommand.java b/src/dendroscope/commands/OpenFileCommand.java
@@ -81,7 +81,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
 
     }
 

diff --git a/src/dendroscope/commands/PasteCommand.java b/src/dendroscope/commands/PasteCommand.java
@@ -73,7 +73,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/PrintCommand.java b/src/dendroscope/commands/PrintCommand.java
@@ -73,7 +73,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_P, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/QuitCommand.java b/src/dendroscope/commands/QuitCommand.java
@@ -68,7 +68,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/RemoveTaxaCommand.java b/src/dendroscope/commands/RemoveTaxaCommand.java
@@ -74,7 +74,7 @@ public ImageIcon getIcon() {
      */
     public KeyStroke getAcceleratorKey() {
         return KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, Toolkit
-                .getDefaultToolkit().getMenuShortcutKeyMask());
+                .getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/RerootCommand.java b/src/dendroscope/commands/RerootCommand.java
@@ -74,7 +74,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/RotateLeftCommand.java b/src/dendroscope/commands/RotateLeftCommand.java
@@ -79,7 +79,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/RotateSubTreesCommand.java b/src/dendroscope/commands/RotateSubTreesCommand.java
@@ -71,7 +71,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/SaveAsCommand.java b/src/dendroscope/commands/SaveAsCommand.java
@@ -72,7 +72,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/SetGridCommand.java b/src/dendroscope/commands/SetGridCommand.java
@@ -71,7 +71,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/ShowEdgeLabelsCommand.java b/src/dendroscope/commands/ShowEdgeLabelsCommand.java
@@ -91,7 +91,7 @@ public ImageIcon getIcon() {
      */
     public KeyStroke getAcceleratorKey() {
         return KeyStroke.getKeyStroke(KeyEvent.VK_Y,
-                Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+                Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/ShowEdgeWeightsCommand.java b/src/dendroscope/commands/ShowEdgeWeightsCommand.java
@@ -70,7 +70,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_B, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_B, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/ShowFindDialogCommand.java b/src/dendroscope/commands/ShowFindDialogCommand.java
@@ -72,7 +72,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/ShowFormatterCommand.java b/src/dendroscope/commands/ShowFormatterCommand.java
@@ -108,7 +108,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/ShowHelpCommand.java b/src/dendroscope/commands/ShowHelpCommand.java
@@ -69,7 +69,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_I, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     public String getSyntax() {

diff --git a/src/dendroscope/commands/ShowInputDialogCommand.java b/src/dendroscope/commands/ShowInputDialogCommand.java
@@ -67,7 +67,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_COMMA, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/ShowMessageWindowCommand.java b/src/dendroscope/commands/ShowMessageWindowCommand.java
@@ -69,7 +69,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/ShowReplaceDialogCommand.java b/src/dendroscope/commands/ShowReplaceDialogCommand.java
@@ -76,7 +76,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/SwapSubTreesCommand.java b/src/dendroscope/commands/SwapSubTreesCommand.java
@@ -70,7 +70,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/TanglegramNeighborNetCommand.java b/src/dendroscope/commands/TanglegramNeighborNetCommand.java
@@ -85,7 +85,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/UndoCommand.java b/src/dendroscope/commands/UndoCommand.java
@@ -79,7 +79,7 @@ public void apply(NexusStreamParser np) throws Exception {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/UseMagnifierCommand.java b/src/dendroscope/commands/UseMagnifierCommand.java
@@ -78,7 +78,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     /**

diff --git a/src/dendroscope/commands/ZoomToFitCommand.java b/src/dendroscope/commands/ZoomToFitCommand.java
@@ -68,7 +68,7 @@ public ImageIcon getIcon() {
      * @return accelerator key
      */
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     /**

diff --git a/src/dendroscope/commands/collapse/CollapseCommand.java b/src/dendroscope/commands/collapse/CollapseCommand.java
@@ -66,7 +66,7 @@ public void actionPerformed(ActionEvent ev) {
     }
 
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_K, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_K, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
     public String getDescription() {

diff --git a/src/dendroscope/commands/collapse/CollapseComplementCommand.java b/src/dendroscope/commands/collapse/CollapseComplementCommand.java
@@ -40,7 +40,7 @@ public void actionPerformed(ActionEvent ev) {
     }
 
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_K, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_K, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }
 
     public String getDescription() {

diff --git a/src/dendroscope/commands/collapse/UncollapseSelectionCommand.java b/src/dendroscope/commands/collapse/UncollapseSelectionCommand.java
@@ -79,7 +79,7 @@ public void actionPerformed(ActionEvent ev) {
 
 
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
+        return KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
     }
 
 

diff --git a/src/dendroscope/commands/collapse/UncollapseSubtreeCommand.java b/src/dendroscope/commands/collapse/UncollapseSubtreeCommand.java
@@ -41,7 +41,7 @@ public void actionPerformed(ActionEvent ev) {
 
 
     public KeyStroke getAcceleratorKey() {
-        return KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK);
+        return KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() | InputEvent.SHIFT_DOWN_MASK);
     }