Remove redundancy in Eclipse

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 9243e99..90e911e 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -27,7 +27,6 @@ import java.awt.datatransfer.*;
 import java.awt.event.*;\r
 import java.awt.print.*;\r
 import javax.swing.*;\r
-import javax.swing.event.*;\r
 \r
 import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
@@ -1280,7 +1279,7 @@ public class AlignFrame
     if (viewport.showSequenceFeatures &&\r
         ! ( (Alignment) viewport.alignment).featuresAdded)\r
     {\r
-      SequenceFeatureFetcher sft = new SequenceFeatureFetcher(viewport.\r
+      new SequenceFeatureFetcher(viewport.\r
           alignment,\r
           alignPanel);\r
       ( (Alignment) viewport.alignment).featuresAdded = true;\r
@@ -1627,8 +1626,6 @@ public class AlignFrame
     conservationMenuItem.setSelected(false);\r
     viewport.setConservationSelected(false);\r
 \r
-    ColourSchemeI cs = viewport.getGlobalColourScheme();\r
-\r
     changeColour(viewport.getGlobalColourScheme());\r
 \r
     modifyPID_actionPerformed(null);\r
@@ -2242,11 +2239,11 @@ public class AlignFrame
    */\r
   public void BuildWebServiceMenu()\r
   {\r
-    if ( (Desktop.discoverer.services != null)\r
-        && (Desktop.discoverer.services.size() > 0))\r
+    if ( (Discoverer.services != null)\r
+        && (Discoverer.services.size() > 0))\r
     {\r
-      Vector msaws = (Vector) Desktop.discoverer.services.get("MsaWS");\r
-      Vector secstrpr = (Vector) Desktop.discoverer.services.get("SecStrPred");\r
+      Vector msaws = (Vector) Discoverer.services.get("MsaWS");\r
+      Vector secstrpr = (Vector) Discoverer.services.get("SecStrPred");\r
       Vector wsmenu = new Vector();\r
       if (msaws != null)\r
       {\r
@@ -2262,7 +2259,7 @@ public class AlignFrame
             public void actionPerformed(ActionEvent e)\r
             {\r
               SequenceI[] msa = gatherSequencesForAlignment();\r
-              MsaWSClient ct = new jalview.ws.MsaWSClient(sh, title, msa,\r
+              new jalview.ws.MsaWSClient(sh, title, msa,\r
                   false, true);\r
 \r
             }\r
@@ -2279,7 +2276,7 @@ public class AlignFrame
               public void actionPerformed(ActionEvent e)\r
               {\r
                 SequenceI[] msa = gatherSequencesForAlignment();\r
-                MsaWSClient ct = new jalview.ws.MsaWSClient(sh, title, msa,\r
+                new jalview.ws.MsaWSClient(sh, title, msa,\r
                     true, true);\r
 \r
               }\r
@@ -2308,8 +2305,7 @@ public class AlignFrame
               if (msa.length == 1)\r
               {\r
                 // Single Sequence prediction\r
-                jalview.ws.JPredClient ct = new jalview.ws.JPredClient(sh,\r
-                    title, msa[0]);\r
+                new jalview.ws.JPredClient(sh,title, msa[0]);\r
               }\r
               else\r
               {\r
@@ -2342,4 +2338,30 @@ public class AlignFrame
     // TODO: group services by location as well as function.\r
   }\r
 \r
+  public void vamsasStore_actionPerformed(ActionEvent e)\r
+{\r
+  /* JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.\r
+       getProperty("LAST_DIRECTORY"));\r
+\r
+   chooser.setFileView(new JalviewFileView());\r
+   chooser.setDialogTitle("Export to Vamsas file");\r
+   chooser.setToolTipText("Export");\r
+\r
+   int value = chooser.showSaveDialog(this);\r
+   */\r
+  //  if (value == JalviewFileChooser.APPROVE_OPTION)\r
+  {\r
+         jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);\r
+    vs.store("C:\\Documents And Settings\\andrew\\Desktop\\vamsas.zip");\r
+   // chooser.getSelectedFile().getAbsolutePath();\r
+  }\r
+}\r
+\r
+public void vamsasLoad_actionPerformed(ActionEvent e)\r
+{\r
+  jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);\r
+  vs.load("C:\\Documents And Settings\\andrew\\Desktop\\vamsas.zip");\r
+}\r
+\r
+\r
 }\r