JAL-1807 explicit imports (jalview.gui)

[jalview.git] / src / jalview / gui / UserDefinedColours.java

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index a907187..b4a513e 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -20,6 +20,19 @@
  */
 package jalview.gui;
 
+import jalview.api.structures.JalviewStructureDisplayI;
+import jalview.bin.Cache;
+import jalview.datamodel.SequenceGroup;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.jbgui.GUserDefinedColours;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ResidueProperties;
+import jalview.schemes.UserColourScheme;
+import jalview.util.ColorUtils;
+import jalview.util.Format;
+import jalview.util.MessageManager;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
@@ -40,16 +53,6 @@ import javax.swing.JOptionPane;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import jalview.api.structures.JalviewStructureDisplayI;
-import jalview.datamodel.SequenceGroup;
-import jalview.io.JalviewFileChooser;
-import jalview.jbgui.GUserDefinedColours;
-import jalview.schemes.ColourSchemeI;
-import jalview.schemes.ResidueProperties;
-import jalview.schemes.UserColourScheme;
-import jalview.util.ColorUtils;
-import jalview.util.MessageManager;
-
 /**
  * This panel allows the user to assign colours to Amino Acid residue codes, and
  * save the colour scheme.
@@ -585,10 +588,10 @@ public class UserDefinedColours extends GUserDefinedColours implements
     lowerCaseButtons = new ArrayList<JButton>();
 
     JalviewFileChooser chooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+            Cache.getProperty("LAST_DIRECTORY"), new String[]
             { "jc" }, new String[]
             { "Jalview User Colours" }, "Jalview User Colours");
-    chooser.setFileView(new jalview.io.JalviewFileView());
+    chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager
             .getString("label.load_colour_scheme"));
     chooser.setToolTipText(MessageManager.getString("action.load"));
@@ -598,8 +601,8 @@ public class UserDefinedColours extends GUserDefinedColours implements
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       File choice = chooser.getSelectedFile();
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
-      String defaultColours = jalview.bin.Cache.getDefault(
+      Cache.setProperty("LAST_DIRECTORY", choice.getParent());
+      String defaultColours = Cache.getDefault(
               "USER_DEFINED_COLOURS", choice.getPath());
       if (defaultColours.indexOf(choice.getPath()) == -1)
       {
@@ -607,7 +610,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
                 .concat(choice.getPath());
       }
 
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
+      Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
 
       UserColourScheme ucs = loadColours(choice.getAbsolutePath());
       Color[] colors = ucs.getColours();
@@ -650,7 +653,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
   {
     UserColourScheme ret = null;
 
-    String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
+    String colours = Cache.getProperty("USER_DEFINED_COLOURS");
     if (colours != null)
     {
       if (colours.indexOf("|") > -1)
@@ -822,11 +825,11 @@ public class UserDefinedColours extends GUserDefinedColours implements
       userColourSchemes.remove(schemeName.getText());
     }
     JalviewFileChooser chooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+            Cache.getProperty("LAST_DIRECTORY"), new String[]
             { "jc" }, new String[]
             { "Jalview User Colours" }, "Jalview User Colours");
 
-    chooser.setFileView(new jalview.io.JalviewFileView());
+    chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager.getString("label.save_colour_scheme"));
     chooser.setToolTipText(MessageManager.getString("action.save"));
 
@@ -835,7 +838,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
       String choice = chooser.getSelectedFile().getPath();
-      String defaultColours = jalview.bin.Cache.getDefault(
+      String defaultColours = Cache.getDefault(
               "USER_DEFINED_COLOURS", choice);
       if (defaultColours.indexOf(choice) == -1)
       {
@@ -850,7 +853,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
 
       ap.alignFrame.updateUserColourMenu();
 
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
+      Cache.setProperty("USER_DEFINED_COLOURS", defaultColours);
 
       jalview.schemabinding.version2.JalviewUserColours ucs = new jalview.schemabinding.version2.JalviewUserColours();
 
@@ -865,8 +868,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
           JButton button = (JButton) buttonPanel.getComponent(i);
           jalview.schemabinding.version2.Colour col = new jalview.schemabinding.version2.Colour();
           col.setName(button.getText());
-          col.setRGB(jalview.util.Format.getHexString(button
-                  .getBackground()));
+          col.setRGB(Format.getHexString(button.getBackground()));
           ucs.addColour(col);
         }
 
@@ -958,12 +960,12 @@ public class UserDefinedColours extends GUserDefinedColours implements
     {
       if (coloursFound.toString().length() > 1)
       {
-        jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
+        Cache.setProperty("USER_DEFINED_COLOURS",
                 coloursFound.toString());
       }
       else
       {
-        jalview.bin.Cache.applicationProperties
+        Cache.applicationProperties
                 .remove("USER_DEFINED_COLOURS");
       }
     }
@@ -979,7 +981,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
 
     StringBuffer coloursFound = new StringBuffer();
     StringTokenizer st = new StringTokenizer(
-            jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"), "|");
+            Cache.getProperty("USER_DEFINED_COLOURS"), "|");
 
     while (st.hasMoreElements())
     {
@@ -1004,12 +1006,12 @@ public class UserDefinedColours extends GUserDefinedColours implements
 
     if (coloursFound.toString().length() > 1)
     {
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
+      Cache.setProperty("USER_DEFINED_COLOURS",
               coloursFound.toString());
     }
     else
     {
-      jalview.bin.Cache.applicationProperties
+      Cache.applicationProperties
               .remove("USER_DEFINED_COLOURS");
     }