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
Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
src
/
jalview
/
util
/
Platform.java
diff --git
a/src/jalview/util/Platform.java
b/src/jalview/util/Platform.java
index
7b93fe5
..
5b89db3
100644
(file)
--- a/
src/jalview/util/Platform.java
+++ b/
src/jalview/util/Platform.java
@@
-76,7
+76,6
@@
public class Platform
private static Boolean isNoJSMac = null, isNoJSWin = null, isMac = null,
isWin = null, isLinux = null;
private static Boolean isNoJSMac = null, isNoJSWin = null, isMac = null,
isWin = null, isLinux = null;
-
private static Boolean isHeadless = null;
private static swingjs.api.JSUtilI jsutil;
private static Boolean isHeadless = null;
private static swingjs.api.JSUtilI jsutil;
@@
-98,7
+97,6
@@
public class Platform
}
}
}
}
}
}
-
/**
* added to group mouse events into Windows and nonWindows (mac, unix, linux)
*
/**
* added to group mouse events into Windows and nonWindows (mac, unix, linux)
*
@@
-181,7
+179,8
@@
public class Platform
public static boolean isLinux()
{
return (isLinux == null
public static boolean isLinux()
{
return (isLinux == null
- ? (isLinux = (System.getProperty("os.name").indexOf("Linux") >= 0))
+ ? (isLinux = (System.getProperty("os.name")
+ .indexOf("Linux") >= 0))
: isLinux);
}
: isLinux);
}
@@
-676,8
+675,13
@@
public class Platform
{
jsutil.addDirectDatabaseCall(domain);
System.out.println(
{
jsutil.addDirectDatabaseCall(domain);
System.out.println(
- "Platform adding known access-control-allow-origin * for domain "
- + domain);
+ "Platform adding known access-control-allow-origin * for domain "
+ + domain);
+ /**
+ * @j2sNative
+ *
+ * J2S.addDirectDatabaseCall(domain);
+ */
}
}
}
}
@@
-688,7
+692,6
@@
public class Platform
*/
public static void getURLCommandArguments()
{
*/
public static void getURLCommandArguments()
{
-
try {
/**
* Retrieve the first query field as command arguments to Jalview. Include
try {
/**
* Retrieve the first query field as command arguments to Jalview. Include
@@
-704,7
+707,6
@@
public class Platform
} catch (Throwable t)
{
}
} catch (Throwable t)
{
}
-
}
/**
}
/**