Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / test / jalview / ws / rest / ShmmrRSBSService.java

diff --git a/test/jalview/ws/rest/ShmmrRSBSService.java b/test/jalview/ws/rest/ShmmrRSBSService.java
index 261c059..dded0ee 100644 (file)
--- a/test/jalview/ws/rest/ShmmrRSBSService.java
+++ b/test/jalview/ws/rest/ShmmrRSBSService.java
@@ -70,13 +70,13 @@ public class ShmmrRSBSService
     assertTrue(
             "Couldn't load the test data's annotation file (should be 5 groups but found "
                     + alf.getViewport().getAlignment().getGroups().size()
-                    + ").", alf.getViewport().getAlignment().getGroups()
-                    .size() == 5);
+                    + ").",
+            alf.getViewport().getAlignment().getGroups().size() == 5);
 
     RestClient rc = new RestClient(_rc.service, alf, true);
 
     assertNotNull("Couldn't creat RestClient job.", rc);
-    jalview.bin.Cache.initLogger();
+    jalview.bin.Console.initLogger();
     RestJob rjb = new RestJob(0, new RestJobThread(rc),
             rc.av.getAlignment(), null);
     rjb.setAlignmentForInputs(rc.service.getInputParams().values(),
@@ -103,8 +103,8 @@ public class ShmmrRSBSService
       return testRsdExchange(desc, newService);
     } catch (Throwable x)
     {
-      System.err.println("Failed for service (" + desc + "): "
-              + servicestring);
+      System.err.println(
+              "Failed for service (" + desc + "): " + servicestring);
       x.printStackTrace();
       return false;
     }
@@ -120,9 +120,9 @@ public class ShmmrRSBSService
               fromservicetostring);
       if (!newService.isValid())
       {
-        throw new Error("Failed to create service from '"
-                + fromservicetostring + "'.\n"
-                + newService.getInvalidMessage());
+        throw new Error(
+                "Failed to create service from '" + fromservicetostring
+                        + "'.\n" + newService.getInvalidMessage());
       }
 
       if (!service.equals(newService))
@@ -141,8 +141,8 @@ public class ShmmrRSBSService
       }
     } catch (Throwable x)
     {
-      System.err.println("Failed for service (" + desc + "): "
-              + service.toString());
+      System.err.println(
+              "Failed for service (" + desc + "): " + service.toString());
       x.printStackTrace();
       return false;
     }