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
Revert "Merge branch 'bug/JAL-3806_mappingCoversSequence' into releases/Release_2_11_...
[jalview.git]
/
src
/
jalview
/
util
/
Platform.java
diff --git
a/src/jalview/util/Platform.java
b/src/jalview/util/Platform.java
index
e8558fa
..
a5bee7c
100644
(file)
--- a/
src/jalview/util/Platform.java
+++ b/
src/jalview/util/Platform.java
@@
-29,11
+29,23
@@
import java.awt.event.MouseEvent;
*/
public class Platform
{
*/
public class Platform
{
- private static Boolean isAMac = null, isWindows = null;
+ private static Boolean isAMac = null, isWindows = null, isLinux = null;
private static Boolean isHeadless = null;
/**
private static Boolean isHeadless = null;
/**
+ * added to check LaF for Linux
+ *
+ * @return
+ */
+ public static boolean isLinux()
+ {
+ return (isLinux == null
+ ? (isLinux = (System.getProperty("os.name").indexOf("Linux") >= 0))
+ : isLinux);
+ }
+
+ /**
* sorry folks - Macs really are different
*
* @return true if we do things in a special way.
* sorry folks - Macs really are different
*
* @return true if we do things in a special way.
@@
-131,7
+143,8
@@
public class Platform
{
return false;
}
{
return false;
}
- return (jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx() // .getMenuShortcutKeyMaskEx()
+ return (jalview.util.ShortcutKeyMaskExWrapper
+ .getMenuShortcutKeyMaskEx() // .getMenuShortcutKeyMaskEx()
& jalview.util.ShortcutKeyMaskExWrapper
.getModifiersEx(e)) != 0; // getModifiers()) != 0;
}
& jalview.util.ShortcutKeyMaskExWrapper
.getModifiersEx(e)) != 0; // getModifiers()) != 0;
}
@@
-139,8
+152,8
@@
public class Platform
}
/**
}
/**
- * A (case sensitive) file path comparator that ignores the difference between /
- * and \
+ * A (case sensitive) file path comparator that ignores the difference between
+ * / and \
*
* @param path1
* @param path2
*
* @param path1
* @param path2