git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b568f2d
)
JAL-4059 Fix an incorrectly applied change of method for JalviewJS
author
Ben Soares
<b.soares@dundee.ac.uk>
Thu, 28 Sep 2023 16:10:29 +0000
(17:10 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Thu, 28 Sep 2023 16:10:29 +0000
(17:10 +0100)
src/jalview/util/Platform.java
patch
|
blob
|
history
diff --git
a/src/jalview/util/Platform.java
b/src/jalview/util/Platform.java
index
4ecf637
..
9c2825f
100644
(file)
--- a/
src/jalview/util/Platform.java
+++ b/
src/jalview/util/Platform.java
@@
-325,8
+325,9
@@
public class Platform
}
if (msg != null)
{
}
if (msg != null)
{
- jalview.bin.Console.errPrintln("Platform: timer mark\t" + ((t - time) / 1000f)
- + "\t" + ((t - mark) / 1000f) + "\t" + msg);
+ jalview.bin.Console.errPrintln(
+ "Platform: timer mark\t" + ((t - time) / 1000f) + "\t"
+ + ((t - mark) / 1000f) + "\t" + msg);
}
mark = t;
}
}
mark = t;
}
@@
-337,8
+338,9
@@
public class Platform
case TIME_GET:
if (msg != null)
{
case TIME_GET:
if (msg != null)
{
- jalview.bin.Console.errPrintln("Platform: timer dur\t" + ((t - time) / 1000f)
- + "\t" + ((duration) / 1000f) + "\t" + msg);
+ jalview.bin.Console
+ .errPrintln("Platform: timer dur\t" + ((t - time) / 1000f)
+ + "\t" + ((duration) / 1000f) + "\t" + msg);
}
set = 0;
break;
}
set = 0;
break;
@@
-644,11
+646,11
@@
public class Platform
* @j2sNative var a =
* decodeURI((document.location.href.replace("&","?").split("?j2s")[0]
* + "?").split("?")[1].split("#")[0]); a &&
* @j2sNative var a =
* decodeURI((document.location.href.replace("&","?").split("?j2s")[0]
* + "?").split("?")[1].split("#")[0]); a &&
- * (jalview.bin.Console.outPrintln("URL arguments detected were "+a)) &&
+ * (System.out.println("URL arguments detected were "+a)) &&
* (J2S.thisApplet.__Info.urlargs = a.split(" "));
* (!J2S.thisApplet.__Info.args || J2S.thisApplet.__Info.args
* == "" || J2S.thisApplet.__Info.args == "??") &&
* (J2S.thisApplet.__Info.urlargs = a.split(" "));
* (!J2S.thisApplet.__Info.args || J2S.thisApplet.__Info.args
* == "" || J2S.thisApplet.__Info.args == "??") &&
- * (J2S.thisApplet.__Info.args = a) && (jalview.bin.Console.outPrintln("URL
+ * (J2S.thisApplet.__Info.args = a) && (System.out.println("URL
* arguments were passed to J2S main."));
*/
} catch (Throwable t)
* arguments were passed to J2S main."));
*/
} catch (Throwable t)