From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Thu, 9 May 2019 18:54:03 +0000 (-0500)
Subject: Jalview-JS/JAL-3253-applet
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d854188121b342b02f6b887012ad5947935bcdec;p=jalview.git

Jalview-JS/JAL-3253-applet
---

d854188121b342b02f6b887012ad5947935bcdec
diff --cc src/jalview/ws/rest/RestClient.java
index f271e62,f271e62..e5dc4b4
--- a/src/jalview/ws/rest/RestClient.java
+++ b/src/jalview/ws/rest/RestClient.java
@@@ -80,7 -80,7 +80,7 @@@ public class RestClient extends WSClien
      return jalview.gui.Desktop.getAlignFrameFor(av);
    }
  
--  RestClient getInstance()
++  private static RestClient getInstance()
    {
      Jalview j = Jalview.getInstance();
      return (j.restClient == null ? j.restClient = new RestClient()
@@@ -418,7 -418,7 +418,7 @@@
  
    public static RestClient[] getRestClients()
    {
--    RestClient c = Jalview.getInstance().restClient;
++    RestClient c = getInstance();
  
      if (c.services == null)
      {
@@@ -474,7 -474,7 +474,7 @@@
      if (rsbsUrls != null)
      {
        // TODO: consider validating services ?
--      RestClient c = Jalview.getInstance().restClient;
++      RestClient c = getInstance();
        c.services = new Vector<>(rsbsUrls);
        StringBuffer sprop = new StringBuffer();
        for (String s : c.services)