JAL-1807 explicit imports (jalview.gui)

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

diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java
index a16ea68..900d3be 100644 (file)
--- a/src/jalview/gui/AppJmol.java
+++ b/src/jalview/gui/AppJmol.java
@@ -40,8 +40,11 @@ import jalview.schemes.TaylorColourScheme;
 import jalview.schemes.TurnColourScheme;
 import jalview.schemes.ZappoColourScheme;
 import jalview.structures.models.AAStructureBindingModel;
+import jalview.util.BrowserLauncher;
+import jalview.util.ImageMaker;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
+import jalview.ws.dbsources.Pdb;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -147,7 +150,7 @@ public class AppJmol extends StructureViewerBase
     this.setBounds(bounds);
     initMenus();
     setViewId(viewid);
-    // jalview.gui.Desktop.addInternalFrame(this, "Loading File",
+    // Desktop.addInternalFrame(this, "Loading File",
     // bounds.width,bounds.height);
 
     this.addInternalFrameListener(new InternalFrameAdapter()
@@ -477,7 +480,7 @@ public class AppJmol extends StructureViewerBase
     // TODO: consider waiting until the structure/view is fully loaded before
     // displaying
     this.getContentPane().add(renderPanel, java.awt.BorderLayout.CENTER);
-    jalview.gui.Desktop.addInternalFrame(this, jmb.getViewerTitle(),
+    Desktop.addInternalFrame(this, jmb.getViewerTitle(),
             getBounds().width, getBounds().height);
     if (scriptWindow == null)
     {
@@ -595,7 +598,7 @@ public class AppJmol extends StructureViewerBase
       String[] curfiles = jmb.getPdbFile(); // files currently in viewer
       // TODO: replace with reference fetching/transfer code (validate PDBentry
       // as a DBRef?)
-      jalview.ws.dbsources.Pdb pdbclient = new jalview.ws.dbsources.Pdb();
+      Pdb pdbclient = new Pdb();
       for (int pi = 0; pi < jmb.getPdbCount(); pi++)
       {
         String file = jmb.getPdbEntry(pi).getFile();
@@ -765,7 +768,7 @@ public class AppJmol extends StructureViewerBase
   public void pdbFile_actionPerformed(ActionEvent actionEvent)
   {
     JalviewFileChooser chooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+            Cache.getProperty("LAST_DIRECTORY"));
 
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager.getString("label.save_pdb_file"));
@@ -815,7 +818,7 @@ public class AppJmol extends StructureViewerBase
   @Override
   public void viewMapping_actionPerformed(ActionEvent actionEvent)
   {
-    jalview.gui.CutAndPasteTransfer cap = new jalview.gui.CutAndPasteTransfer();
+    CutAndPasteTransfer cap = new CutAndPasteTransfer();
     try
     {
       cap.appendText(jmb.printMappings());
@@ -827,7 +830,7 @@ public class AppJmol extends StructureViewerBase
       cap.dispose();
       return;
     }
-    jalview.gui.Desktop.addInternalFrame(cap,
+    Desktop.addInternalFrame(cap,
             MessageManager.getString("label.pdb_sequence_mapping"), 550,
             600);
   }
@@ -835,40 +838,38 @@ public class AppJmol extends StructureViewerBase
   @Override
   public void eps_actionPerformed(ActionEvent e)
   {
-    makePDBImage(jalview.util.ImageMaker.TYPE.EPS);
+    makePDBImage(ImageMaker.TYPE.EPS);
   }
 
   @Override
   public void png_actionPerformed(ActionEvent e)
   {
-    makePDBImage(jalview.util.ImageMaker.TYPE.PNG);
+    makePDBImage(ImageMaker.TYPE.PNG);
   }
 
-  void makePDBImage(jalview.util.ImageMaker.TYPE type)
+  void makePDBImage(ImageMaker.TYPE type)
   {
     int width = getWidth();
     int height = getHeight();
 
-    jalview.util.ImageMaker im;
+    ImageMaker im;
 
-    if (type == jalview.util.ImageMaker.TYPE.PNG)
+    if (type == ImageMaker.TYPE.PNG)
     {
-      im = new jalview.util.ImageMaker(this,
-              jalview.util.ImageMaker.TYPE.PNG,
+      im = new ImageMaker(this, ImageMaker.TYPE.PNG,
               "Make PNG image from view", width, height, null, null);
     }
-    else if (type == jalview.util.ImageMaker.TYPE.EPS)
+    else if (type == ImageMaker.TYPE.EPS)
     {
-      im = new jalview.util.ImageMaker(this,
-              jalview.util.ImageMaker.TYPE.EPS,
+      im = new ImageMaker(this, ImageMaker.TYPE.EPS,
               "Make EPS file from view", width, height, null,
               this.getTitle());
     }
     else
     {
 
-      im = new jalview.util.ImageMaker(this,
-              jalview.util.ImageMaker.TYPE.SVG, "Make SVG file from PCA",
+      im = new ImageMaker(this, ImageMaker.TYPE.SVG,
+              "Make SVG file from PCA",
               width, height, null, this.getTitle());
     }
 
@@ -1007,7 +1008,7 @@ public class AppJmol extends StructureViewerBase
   {
     try
     {
-      jalview.util.BrowserLauncher
+      BrowserLauncher
               .openURL("http://jmol.sourceforge.net/docs/JmolUserGuide/");
     } catch (Exception ex)
     {