minor edits

diff --git a/src/jalview/io/cache/AppCache.java b/src/jalview/io/cache/AppCache.java
index 459562d..8b09cd3 100644 (file)
--- a/src/jalview/io/cache/AppCache.java
+++ b/src/jalview/io/cache/AppCache.java
@@ -38,8 +38,8 @@ public class AppCache
 
   public static AppCache getInstance()
   {
-    Instance i = Instance.getInstance();
-    return (i.appCache == null ? i.appCache = new AppCache() : i.appCache);
+    Instance j = Instance.getInstance();
+    return (j.appCache == null ? j.appCache = new AppCache() : j.appCache);
   }
 
   private AppCache()

diff --git a/src/jalview/ws/SequenceFetcher.java b/src/jalview/ws/SequenceFetcher.java
index 2b3b1ee..7ac1179 100644 (file)
--- a/src/jalview/ws/SequenceFetcher.java
+++ b/src/jalview/ws/SequenceFetcher.java
@@ -44,7 +44,7 @@ public class SequenceFetcher extends ASequenceFetcher
 
   /**
    * Returns a new SequenceFetcher singleton, or a mock object if one has been
-   * set. Used by CrossRef and java.gui.SequenceFetcher.
+   * set.
    * 
    * @return
    */
@@ -57,28 +57,28 @@ public class SequenceFetcher extends ASequenceFetcher
   }
 
   /**
+   * Set the instance object to use (intended for unit testing with mock
+   * objects).
    * 
-   * This public constructor is only is for use by testng to anonymously
-   * subclass SequenceFetcher.
-   * 
+   * Be sure to reset to null in the tearDown method of any tests!
    * 
+   * @param sf
    */
-  public SequenceFetcher()
+  public static void setSequenceFetcher(SequenceFetcher sf)
   {
-    addAllDatabases();
+    Instance.getInstance().sequenceFetcher = sf;
   }
 
   /**
-   * Set the instance object to use (intended for unit testing with mock
-   * objects).
    * 
-   * Be sure to reset to null in the tearDown method of any tests!
+   * This public constructor is only is for use by testng to anonymously
+   * subclass SequenceFetcher.
+   * 
    * 
-   * @param sf
    */
-  public static void setSequenceFetcher(SequenceFetcher sf)
+  public SequenceFetcher()
   {
-    Instance.getInstance().sequenceFetcher = sf;
+    addAllDatabases();
   }
 
   public void addAllDatabases()