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 releases/Release_2_11_2_Branch
[jalview.git]
/
src
/
jalview
/
util
/
BrowserLauncher.java
diff --git
a/src/jalview/util/BrowserLauncher.java
b/src/jalview/util/BrowserLauncher.java
index
a55a65c
..
8119daa
100755
(executable)
--- a/
src/jalview/util/BrowserLauncher.java
+++ b/
src/jalview/util/BrowserLauncher.java
@@
-236,9
+236,11
@@
public class BrowserLauncher
loadedWithoutErrors = true;
loadedWithoutErrors = true;
+ if (!Platform.isJS())
/**
/**
+ * Java only
*
*
- * @j2sNative
+ * @j2sIgnore
*
*/
{
*
*/
{
@@
-334,8
+336,11
@@
public class BrowserLauncher
private static boolean loadClasses()
{
private static boolean loadClasses()
{
+ if (!Platform.isJS())
/**
/**
- * @j2sNative
+ * Java only
+ *
+ * @j2sIgnore
*
*/
{
*
*/
{
@@
-538,8
+543,11
@@
public class BrowserLauncher
*/
private static Object locateBrowser()
{
*/
private static Object locateBrowser()
{
+ if (!Platform.isJS())
/**
/**
- * @j2sNative
+ * Java only
+ *
+ * @j2sIgnore
*
*/
{
*
*/
{
@@
-735,14
+743,17
@@
public class BrowserLauncher
public static void openURL(String url) throws IOException
{
public static void openURL(String url) throws IOException
{
+ if (Platform.isJS())
+ {
+ Platform.openURL(url);
+ return;
+ }
+ else
/**
/**
- * @j2sNative
- *
- * window.open(url);
- *
+ * Java only
*
*
+ * @j2sIgnore
*/
*/
-
{
if (!loadedWithoutErrors)
{
if (!loadedWithoutErrors)