From: Jim Procter Date: Thu, 13 Jun 2019 14:49:33 +0000 (+0100) Subject: Merge branch 'bug/JAL-3295_CMD_select_not_working_in_sequence_selection' into develop X-Git-Tag: Release_2_11_0~10^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5e65326dda91b3b914034820d38845be61268c5f;hp=b020939889b1cfad261693a643ebcd2a10d9a2c7;p=jalview.git Merge branch 'bug/JAL-3295_CMD_select_not_working_in_sequence_selection' into develop --- diff --git a/build.gradle b/build.gradle index 0ae4e5c..3876753 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ ext { // TODO: consider allowing this expression to be overridden by -P arg getdownWebsiteDir = jalviewDir + '/' + getdown_website_dir + '/' + JAVA_VERSION getdownAppDir = getdownWebsiteDir + '/' + getdown_app_dir - getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir + //getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir getdownLauncher = jalviewDir + '/' + getdown_launcher getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/' @@ -72,14 +72,18 @@ def additional_compiler_args = [] def getdown_alt_java_min_version // this property is assigned below and expanded to multiple lines in the getdown task def getdown_alt_multi_java_location +// this property is for the Java library used in eclipse +def eclipse_java_runtime_name if (JAVA_VERSION.equals("1.8")) { JAVA_INTEGER_VERSION = "8" + //libDir = j8libDir libDir = j11libDir libDistDir = j8libDir compile_source_compatibility = 1.8 compile_target_compatibility = 1.8 getdown_alt_java_min_version = getdown_alt_java8_min_version getdown_alt_multi_java_location = getdown_alt_java8_txt_multi_java_location + eclipse_java_runtime_name = "JavaSE-1.8" } else if (JAVA_VERSION.equals("11")) { JAVA_INTEGER_VERSION = "11" libDir = j11libDir @@ -88,6 +92,7 @@ if (JAVA_VERSION.equals("1.8")) { compile_target_compatibility = 11 getdown_alt_java_min_version = getdown_alt_java11_min_version getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location + eclipse_java_runtime_name = "JavaSE-11" additional_compiler_args += [ '--module-path', ext.modules_compileClasspath.asPath, '--add-modules', j11modules @@ -106,7 +111,6 @@ sourceSets { resources { srcDirs "$jalviewDir/$resourceDir" - srcDirs "$jalviewDir/$libDistDir" } jar.destinationDir = file("$jalviewDir/$packageDir") @@ -151,8 +155,7 @@ sourceSets { } else { compileClasspath += files(sourceSets.main.java.outputDir) } - //compileClasspath += sourceSets.main.compileClasspath - //compileClasspath += files( sourceSets.main.resources.srcDirs) + compileClasspath += fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"]) compileClasspath += fileTree(dir: "$jalviewDir/$libDir", include: ["*.jar"]) @@ -211,15 +214,18 @@ eclipse { } cp.entries.removeAll(removeTheseToo) + print ("CP="+cp.inspect()) + cp.entries += new Output("bin/main") cp.entries += new Library(fileReference(helpParentDir)) cp.entries += new Library(fileReference(resourceDir)) HashMap addedLibPath = new HashMap<>(); - def allPaths = sourceSets.test.compileClasspath + sourceSets.main.compileClasspath - sourceSets.main.compileClasspath.each{ - //if ((it.isDirectory() || ! it.exists()) && ! (it.equals(sourceSets.main.java.outputDir))) { - //no longer want to add outputDir as eclipse is using its own output dir in bin/main + + // changing from sourcesets.main.classpath to specific Java version lib + //sourceSets.main.compileClasspath.each{ + fileTree("$jalviewDir/$libDistDir").include("**/*.jar").include("*.jar").each { + //don't want to add outputDir as eclipse is using its own output dir in bin/main if (it.isDirectory() || ! it.exists()) { // don't add dirs to classpath return @@ -237,7 +243,9 @@ eclipse { } } - sourceSets.test.compileClasspath.each{ + // changing from sourcesets.main.classpath to specific Java version lib + //sourceSets.test.compileClasspath.each{ + fileTree(dir: "$jalviewDir/$utilsDir", include: ["**/*.jar"]).each { //if ((it.isDirectory() || ! it.exists()) && ! (it.equals(sourceSets.main.java.outputDir))) { //no longer want to add outputDir as eclipse is using its own output dir in bin/main if (it.isDirectory() || ! it.exists()) { @@ -298,9 +306,9 @@ eclipse { jdt { // for the IDE, use java 11 compatibility - sourceCompatibility = 11 - targetCompatibility = 11 - javaRuntimeName = "JavaSE-11" + sourceCompatibility = compile_source_compatibility + targetCompatibility = compile_target_compatibility + javaRuntimeName = eclipse_java_runtime_name file { withProperties { props -> @@ -422,12 +430,14 @@ task setGitVals { exec { commandLine "git", "rev-parse", "--short", "HEAD" standardOutput = hashStdOut + ignoreExitValue true } def branchStdOut = new ByteArrayOutputStream() exec { commandLine "git", "rev-parse", "--abbrev-ref", "HEAD" standardOutput = branchStdOut + ignoreExitValue true } project.ext.gitHash = hashStdOut.toString().trim() diff --git a/gradle.properties b/gradle.properties index 1189f12..f5c6f49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ jalviewDir = . +#JAVA_VERSION = 1.8 JAVA_VERSION = 11 JALVIEW_VERSION = DEVELOPMENT INSTALLATION = Source @@ -15,9 +16,6 @@ jalview_keydig = SHA1 testngGroups = Functional -javac_source = 11 -javac_target = 11 - j8libDir = j8lib j11libDir = j11lib resourceDir = resources @@ -50,7 +48,7 @@ getdown_local = false getdown_website_dir = getdown/website getdown_resource_dir = resource getdown_app_dir = dist -getdown_j11lib_dir = j11lib +#getdown_j11lib_dir = j11lib getdown_files_dir = getdown/files getdown_launcher = getdown/lib/getdown-launcher.jar getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java index c1d8228..e8558fa 100644 --- a/src/jalview/util/Platform.java +++ b/src/jalview/util/Platform.java @@ -132,7 +132,8 @@ public class Platform return false; } return (jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx() // .getMenuShortcutKeyMaskEx() - & e.getModifiersEx()) != 0; // getModifiers()) != 0; + & jalview.util.ShortcutKeyMaskExWrapper + .getModifiersEx(e)) != 0; // getModifiers()) != 0; } return e.isControlDown(); } diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper.java b/src/jalview/util/ShortcutKeyMaskExWrapper.java index 7292c80..c9ed231 100644 --- a/src/jalview/util/ShortcutKeyMaskExWrapper.java +++ b/src/jalview/util/ShortcutKeyMaskExWrapper.java @@ -1,57 +1,46 @@ package jalview.util; -import java.awt.Toolkit; -import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; public class ShortcutKeyMaskExWrapper { - private static boolean init = false; + private static final Float specversion; - private static final Float specversion = Float - .parseFloat(System.getProperty("java.specification.version")); + private static final float modern; - private static final float modern = 11; + public static final int SHIFT_DOWN_MASK; - public static int SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK; + public static final int ALT_DOWN_MASK; - public static int ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK; + private static final ShortcutKeyMaskExWrapperI wrapper; - public ShortcutKeyMaskExWrapper() + static { - } + specversion = Float + .parseFloat(System.getProperty("java.specification.version")); + modern = 11; - private static void init() - { - if (init) - { - return; - } - if (specversion < modern) + if (specversion >= modern) { - SHIFT_DOWN_MASK = KeyEvent.SHIFT_MASK; - ALT_DOWN_MASK = KeyEvent.ALT_MASK; + wrapper = new ShortcutKeyMaskExWrapper11(); } else { - SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK; - ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK; + wrapper = new ShortcutKeyMaskExWrapper8(); } - - init = true; + SHIFT_DOWN_MASK = wrapper.SHIFT_DOWN_MASK; + ALT_DOWN_MASK = wrapper.ALT_DOWN_MASK; } public static int getMenuShortcutKeyMaskEx() { - init(); - if (specversion < modern) - { - return Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); - } - else - { - return Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx(); - } + return wrapper.getMenuShortcutKeyMaskEx(); + } + + public static int getModifiersEx(MouseEvent e) + { + return wrapper.getModifiersEx(e); } } diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper11.java b/src/jalview/util/ShortcutKeyMaskExWrapper11.java new file mode 100644 index 0000000..41a6aa0 --- /dev/null +++ b/src/jalview/util/ShortcutKeyMaskExWrapper11.java @@ -0,0 +1,34 @@ +package jalview.util; + +import java.awt.GraphicsEnvironment; +import java.awt.Toolkit; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; + +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; + + @Override + public int getMenuShortcutKeyMaskEx() + { + try + { + if (!GraphicsEnvironment.isHeadless()) + { + return Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx(); + } + } catch (java.lang.Throwable t) + { + } + return 0; + } + + @Override + public int getModifiersEx(MouseEvent e) + { + return e.getModifiersEx(); + } + +} diff --git a/src/jalview/util/ShortcutKeyMaskExWrapper8.java b/src/jalview/util/ShortcutKeyMaskExWrapper8.java new file mode 100644 index 0000000..78254b5 --- /dev/null +++ b/src/jalview/util/ShortcutKeyMaskExWrapper8.java @@ -0,0 +1,34 @@ +package jalview.util; + +import java.awt.GraphicsEnvironment; +import java.awt.Toolkit; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; + +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; + + @Override + public int getMenuShortcutKeyMaskEx() + { + try + { + if (!GraphicsEnvironment.isHeadless()) + { + return Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); + } + } catch (java.lang.Throwable t) + { + } + return 0; + } + + @Override + public int getModifiersEx(MouseEvent e) + { + return e.getModifiers(); + } + +} diff --git a/src/jalview/util/ShortcutKeyMaskExWrapperI.java b/src/jalview/util/ShortcutKeyMaskExWrapperI.java new file mode 100644 index 0000000..bf17259 --- /dev/null +++ b/src/jalview/util/ShortcutKeyMaskExWrapperI.java @@ -0,0 +1,14 @@ +package jalview.util; + +import java.awt.event.MouseEvent; + +public interface ShortcutKeyMaskExWrapperI +{ + public static int SHIFT_DOWN_MASK = 0; + + public static int ALT_DOWN_MASK = 0; + + public int getMenuShortcutKeyMaskEx(); + + public int getModifiersEx(MouseEvent e); +}