JAL-1807 explicit imports (jalview.gui)

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

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 2818fb9..30794df 100644 (file)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -26,10 +26,15 @@ import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceI;
 import jalview.gui.Help.HelpId;
 import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
 import jalview.schemes.AnnotationColourGradient;
 import jalview.schemes.GraduatedColor;
+import jalview.util.Format;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
+import jalview.util.QuickSort;
 import jalview.viewmodel.AlignmentViewport;
+import jalview.ws.DasSequenceFeatureFetcher;
 import jalview.ws.dbsources.das.api.jalviewSourceI;
 
 import java.awt.BorderLayout;
@@ -94,7 +99,7 @@ public class FeatureSettings extends JPanel implements
 {
   DasSourceBrowser dassourceBrowser;
 
-  jalview.ws.DasSequenceFeatureFetcher dasFeatureFetcher;
+  DasSequenceFeatureFetcher dasFeatureFetcher;
 
   JPanel settingsPane = new JPanel();
 
@@ -249,7 +254,7 @@ public class FeatureSettings extends JPanel implements
 
     frame = new JInternalFrame();
     frame.setContentPane(this);
-    if (new jalview.util.Platform().isAMac())
+    if (Platform.isAMac())
     {
       Desktop.addInternalFrame(frame,
               MessageManager.getString("label.sequence_feature_settings"),
@@ -698,17 +703,17 @@ public class FeatureSettings extends JPanel implements
     }
     if (sort)
     {
-      jalview.util.QuickSort.sortFloat(order, data);
+      QuickSort.sortFloat(order, data);
     }
   }
 
   void load()
   {
     JalviewFileChooser chooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+            Cache.getProperty("LAST_DIRECTORY"), new String[]
             { "fc" }, new String[]
             { "Sequence Feature Colours" }, "Sequence Feature Colours");
-    chooser.setFileView(new jalview.io.JalviewFileView());
+    chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager.getString("label.load_feature_colours"));
     chooser.setToolTipText(MessageManager.getString("action.load"));
 
@@ -803,10 +808,10 @@ public class FeatureSettings extends JPanel implements
   void save()
   {
     JalviewFileChooser chooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
+            Cache.getProperty("LAST_DIRECTORY"), new String[]
             { "fc" }, new String[]
             { "Sequence Feature Colours" }, "Sequence Feature Colours");
-    chooser.setFileView(new jalview.io.JalviewFileView());
+    chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager.getString("label.save_feature_colours"));
     chooser.setToolTipText(MessageManager.getString("action.save"));
 
@@ -833,7 +838,7 @@ public class FeatureSettings extends JPanel implements
           sortOrder[i] = fr.getOrder(sortTypes[i]);
           i++;
         }
-        jalview.util.QuickSort.sortFloat(sortOrder, sortTypes);
+        QuickSort.sortFloat(sortOrder, sortTypes);
         sortOrder = null;
         Object fcol;
         GraduatedColor gcol;
@@ -841,7 +846,7 @@ public class FeatureSettings extends JPanel implements
         {
           jalview.schemabinding.version2.Colour col = new jalview.schemabinding.version2.Colour();
           col.setName(sortTypes[i]);
-          col.setRGB(jalview.util.Format.getHexString(fr.getColour(col
+          col.setRGB(Format.getHexString(fr.getColour(col
                   .getName())));
           fcol = fr.getFeatureStyle(sortTypes[i]);
           if (fcol instanceof GraduatedColor)
@@ -849,7 +854,7 @@ public class FeatureSettings extends JPanel implements
             gcol = (GraduatedColor) fcol;
             col.setMin(gcol.getMin());
             col.setMax(gcol.getMax());
-            col.setMinRGB(jalview.util.Format.getHexString(gcol
+            col.setMinRGB(Format.getHexString(gcol
                     .getMinColor()));
             col.setAutoScale(gcol.isAutoScale());
             col.setThreshold(gcol.getThresh());
@@ -943,7 +948,7 @@ public class FeatureSettings extends JPanel implements
     }
     if (sort)
      {
-      jalview.util.QuickSort.sortFloat(width, data);
+      QuickSort.sortFloat(width, data);
     // update global priority order
     }
 
@@ -1236,7 +1241,7 @@ public class FeatureSettings extends JPanel implements
     }
 
     cancelDAS.setEnabled(true);
-    dasFeatureFetcher = new jalview.ws.DasSequenceFeatureFetcher(dataset,
+    dasFeatureFetcher = new DasSequenceFeatureFetcher(dataset,
             this, selectedSources, checkDbRefs, promptFetchDbRefs);
     af.getViewport().setShowSequenceFeatures(true);
     af.showSeqFeatures.setSelected(true);
@@ -1320,7 +1325,7 @@ public class FeatureSettings extends JPanel implements
   public void saveDAS_actionPerformed(ActionEvent e)
   {
     dassourceBrowser
-            .saveProperties(jalview.bin.Cache.applicationProperties);
+            .saveProperties(Cache.applicationProperties);
   }
 
   public void complete()