X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FShortcutKeyMaskExWrapper.java;h=83330b9145e25af518211034e41e256eff896c73;hb=HEAD;hp=c9ed231eb0674c2f16e0b3299307f3eeba348676;hpb=9d2ac8fe3057585a37586379a3c1cd2ead49aafe;p=jalview.git diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper.java b/src/jalview/util/ShortcutKeyMaskExWrapper.java index c9ed231..83330b9 100644 --- a/src/jalview/util/ShortcutKeyMaskExWrapper.java +++ b/src/jalview/util/ShortcutKeyMaskExWrapper.java @@ -1,3 +1,23 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.util; import java.awt.event.MouseEvent; @@ -17,20 +37,23 @@ public class ShortcutKeyMaskExWrapper static { - specversion = Float - .parseFloat(System.getProperty("java.specification.version")); + specversion = Platform.isJS() ? Float.valueOf(8) + : Float.parseFloat( + System.getProperty("java.specification.version")); modern = 11; 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 { - 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()