JAL-1807 explicit imports (jalview.bin)

[jalview.git] / src / jalview / bin / Cache.java

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 10aba00..4ed6e1a 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -20,6 +20,12 @@
  */
 package jalview.bin;
 
+import jalview.gui.UserDefinedColours;
+import jalview.io.PIRFile;
+import jalview.jbgui.GDesktop;
+import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.UserColourScheme;
+import jalview.util.Format;
 import jalview.ws.dbsources.das.api.DasSourceRegistryI;
 import jalview.ws.dbsources.das.datamodel.DasSourceRegistry;
 
@@ -253,7 +259,7 @@ public class Cache
       // log output
       Logger laxis = Logger.getLogger("org.apache.axis");
       Logger lcastor = Logger.getLogger("org.exolab.castor");
-      jalview.bin.Cache.log = Logger.getLogger("jalview.bin.Jalview");
+      Cache.log = Logger.getLogger("jalview.bin.Jalview");
 
       laxis.setLevel(Level.toLevel(Cache.getDefault("logs.Axis.Level",
               Level.INFO.toString())));
@@ -265,13 +271,13 @@ public class Cache
       // lcastor = Logger.getLogger("org.exolab.castor.xml.Marshaller");
       // lcastor.setLevel(Level.toLevel(Cache.getDefault("logs.Castor.Level",
       // Level.INFO.toString())));
-      jalview.bin.Cache.log.setLevel(Level.toLevel(Cache.getDefault(
+      Cache.log.setLevel(Level.toLevel(Cache.getDefault(
               "logs.Jalview.level", Level.INFO.toString())));
       // laxis.addAppender(ap);
       // lcastor.addAppender(ap);
-      // jalview.bin.Cache.log.addAppender(ap);
+      // Cache.log.addAppender(ap);
       // Tell the user that debug is enabled
-      jalview.bin.Cache.log.debug("Jalview Debugging Output Follows.");
+      Cache.log.debug("Jalview Debugging Output Follows.");
     } catch (Exception ex)
     {
       System.err.println("Problems initializing the log4j system\n");
@@ -470,9 +476,9 @@ public class Cache
     setProperty("VERSION", codeVersion);
 
     // LOAD USERDEFINED COLOURS
-    jalview.gui.UserDefinedColours
+    UserDefinedColours
             .initUserColourSchemes(getProperty("USER_DEFINED_COLOURS"));
-    jalview.io.PIRFile.useModellerOutput = Cache.getDefault("PIR_MODELLER",
+    PIRFile.useModellerOutput = Cache.getDefault("PIR_MODELLER",
             false);
   }
 
@@ -608,10 +614,10 @@ public class Cache
     {
       try
       {
-        if (jalview.jbgui.GDesktop.class.getClassLoader().loadClass(
+        if (GDesktop.class.getClassLoader().loadClass(
                 "uk.ac.vamsas.client.VorbaId") != null)
         {
-          jalview.bin.Cache.log
+          Cache.log
                   .debug("Found Vamsas Classes (uk.ac..vamsas.client.VorbaId can be loaded)");
           vamsasJarsArePresent = 1;
           Logger lvclient = Logger.getLogger("uk.ac.vamsas");
@@ -625,7 +631,7 @@ public class Cache
       } catch (Exception e)
       {
         vamsasJarsArePresent = 0;
-        jalview.bin.Cache.log.debug("Vamsas Classes are not present");
+        Cache.log.debug("Vamsas Classes are not present");
       }
     }
     return (vamsasJarsArePresent > 0);
@@ -650,7 +656,7 @@ public class Cache
         if (Cache.class.getClassLoader().loadClass(
                 "groovy.lang.GroovyObject") != null)
         {
-          jalview.bin.Cache.log
+          Cache.log
                   .debug("Found Groovy (groovy.lang.GroovyObject can be loaded)");
           groovyJarsArePresent = 1;
           Logger lgclient = Logger.getLogger("groovy");
@@ -664,11 +670,11 @@ public class Cache
       } catch (Error e)
       {
         groovyJarsArePresent = 0;
-        jalview.bin.Cache.log.debug("Groovy Classes are not present", e);
+        Cache.log.debug("Groovy Classes are not present", e);
       } catch (Exception e)
       {
         groovyJarsArePresent = 0;
-        jalview.bin.Cache.log.debug("Groovy Classes are not present");
+        Cache.log.debug("Groovy Classes are not present");
       }
     }
     return (groovyJarsArePresent > 0);
@@ -723,9 +729,9 @@ public class Cache
                 new Object[]
                 {
                     "Jalview Desktop",
-                    (vrs = jalview.bin.Cache.getProperty("VERSION")
+                    (vrs = Cache.getProperty("VERSION")
                             + "_"
-                            + jalview.bin.Cache.getDefault("BUILD_DATE",
+                            + Cache.getDefault("BUILD_DATE",
                                     "unknown")), "UA-9060947-1" });
         jgoogleanalyticstracker.getMethod("trackAsynchronously",
                 new Class[]
@@ -811,13 +817,12 @@ public class Cache
     {
       return defcolour;
     }
-    Color col = jalview.schemes.ColourSchemeProperty
-            .getAWTColorFromName(colprop);
+    Color col = ColourSchemeProperty.getAWTColorFromName(colprop);
     if (col == null)
     {
       try
       {
-        col = new jalview.schemes.UserColourScheme(colprop).findColour('A');
+        col = new UserColourScheme(colprop).findColour('A');
       } catch (Exception ex)
       {
         log.warn("Couldn't parse '" + colprop + "' as a colour for "
@@ -836,7 +841,7 @@ public class Cache
    */
   public static void setColourProperty(String property, Color colour)
   {
-    setProperty(property, jalview.util.Format.getHexString(colour));
+    setProperty(property, Format.getHexString(colour));
   }
 
   public static final DateFormat date_format = SimpleDateFormat