git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1919 updated PDBSequenceFetcherTest and JMol parser config settings to enable...
[jalview.git]
/
src
/
jalview
/
util
/
Platform.java
diff --git
a/src/jalview/util/Platform.java
b/src/jalview/util/Platform.java
index
c9907ef
..
786f5bf
100644
(file)
--- a/
src/jalview/util/Platform.java
+++ b/
src/jalview/util/Platform.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,9
@@
*/
package jalview.util;
*/
package jalview.util;
+import java.awt.Toolkit;
+import java.awt.event.MouseEvent;
+
/**
* System platform information used by Applet and Application
*
/**
* System platform information used by Applet and Application
*
@@
-32,13
+35,13
@@
public class Platform
*
* @return true if we do things in a special way.
*/
*
* @return true if we do things in a special way.
*/
- public boolean isAMac()
+ public static boolean isAMac()
{
return java.lang.System.getProperty("os.name").indexOf("Mac") > -1;
}
{
return java.lang.System.getProperty("os.name").indexOf("Mac") > -1;
}
- public boolean isHeadless()
+ public static boolean isHeadless()
{
String hdls = java.lang.System.getProperty("java.awt.headless");
{
String hdls = java.lang.System.getProperty("java.awt.headless");
@@
-74,4
+77,11
@@
public class Platform
f.append(file.substring(lastp));
return f.toString();
}
f.append(file.substring(lastp));
return f.toString();
}
+
+ public static boolean isControlDown(MouseEvent e)
+ {
+ return (jalview.util.Platform.isAMac() ? (Toolkit.getDefaultToolkit()
+ .getMenuShortcutKeyMask() & e.getModifiers()) != 0 : e
+ .isControlDown());
+ }
}
}