Merge branch 'develop' into patch/JAL-4110_stdout_for_tests

[jalview.git] / src / jalview / util / Platform.java

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index f5953bf..4ecf637 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -309,7 +309,7 @@ public class Platform
       time = mark = t;
       if (msg != null)
       {
-        System.err.println("Platform: timer reset\t\t\t" + msg);
+        jalview.bin.Console.errPrintln("Platform: timer reset\t\t\t" + msg);
       }
       break;
     case TIME_MARK:
@@ -325,7 +325,7 @@ public class Platform
         }
         if (msg != null)
         {
-          System.err.println("Platform: timer mark\t" + ((t - time) / 1000f)
+          jalview.bin.Console.errPrintln("Platform: timer mark\t" + ((t - time) / 1000f)
                   + "\t" + ((t - mark) / 1000f) + "\t" + msg);
         }
         mark = t;
@@ -337,7 +337,7 @@ public class Platform
     case TIME_GET:
       if (msg != null)
       {
-        System.err.println("Platform: timer dur\t" + ((t - time) / 1000f)
+        jalview.bin.Console.errPrintln("Platform: timer dur\t" + ((t - time) / 1000f)
                 + "\t" + ((duration) / 1000f) + "\t" + msg);
       }
       set = 0;
@@ -494,7 +494,7 @@ public class Platform
      *            info[key];
      */
 
-    System.out.println(
+    jalview.bin.Console.outPrintln(
             "Platform id=" + id + " reading Info." + key + " = " + value);
     p.put(id + "_" + key, value);
 
@@ -620,7 +620,7 @@ public class Platform
 
     if (isJS())
     {
-      System.out.println(
+      jalview.bin.Console.outPrintln(
               "Platform adding known access-control-allow-origin * for domain "
                       + domain);
       /**
@@ -644,11 +644,11 @@ public class Platform
        * @j2sNative var a =
        *            decodeURI((document.location.href.replace("&","?").split("?j2s")[0]
        *            + "?").split("?")[1].split("#")[0]); a &&
-       *            (System.out.println("URL arguments detected were "+a)) &&
+       *            (jalview.bin.Console.outPrintln("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.args = a) && (System.out.println("URL
+       *            (J2S.thisApplet.__Info.args = a) && (jalview.bin.Console.outPrintln("URL
        *            arguments were passed to J2S main."));
        */
     } catch (Throwable t)