basic VamsasSession gui bits.

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 9085b1e..3bc2613 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -27,6 +27,8 @@ import java.awt.event.*;
 \r
 import javax.swing.*;\r
 \r
+import org.vamsas.test.simpleclient.ArchiveClient;\r
+\r
 \r
 /**\r
  * DOCUMENT ME!\r
@@ -576,32 +578,47 @@ public class Desktop extends jalview.jbgui.GDesktop
             Jalview2XML.LoadJalviewAlign(choice);\r
         }\r
     }\r
-\r
-  /*  public void vamsasLoad_actionPerformed(ActionEvent e)\r
+    jalview.io.VamsasClient v_client=null;\r
+    public void vamsasLoad_actionPerformed(ActionEvent e)\r
     {\r
-      JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.\r
-          getProperty("LAST_DIRECTORY"));\r
+      if (v_client==null) {\r
+        // Start a session.\r
+        JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.\r
+            getProperty("LAST_DIRECTORY"));\r
 \r
-      chooser.setFileView(new JalviewFileView());\r
-      chooser.setDialogTitle("Load Vamsas file");\r
-      chooser.setToolTipText("Import");\r
+        chooser.setFileView(new JalviewFileView());\r
+        chooser.setDialogTitle("Load Vamsas file");\r
+        chooser.setToolTipText("Import");\r
 \r
-      int value = chooser.showOpenDialog(this);\r
+        int value = chooser.showOpenDialog(this);\r
 \r
-      if (value == JalviewFileChooser.APPROVE_OPTION)\r
-      {\r
-        jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(null);\r
-        vs.load(\r
-            chooser.getSelectedFile().getAbsolutePath()\r
-            );\r
+        if (value == JalviewFileChooser.APPROVE_OPTION)\r
+        {\r
+          v_client = new jalview.io.VamsasClient(this,\r
+              chooser.getSelectedFile().getAbsolutePath()\r
+              );\r
+          this.vamsasLoad.setText("Session Update");\r
+          this.vamsasStop.setVisible(true);\r
+          v_client.initial_update();\r
+        }\r
+      } else {\r
+        // store current data in session.\r
+         v_client.push_update();\r
       }\r
-\r
-    }*/\r
-\r
-\r
+    }\r
+    public void vamsasStop_actionPerformed(ActionEvent e) {\r
+       if (v_client!=null) {\r
+               v_client.end_session();\r
+               v_client=null;\r
+               this.vamsasStop.setVisible(false);\r
+               this.vamsasLoad.setText("Start Vamsas Session...");\r
+       }\r
+    }\r
+    \r
     public void inputSequence_actionPerformed(ActionEvent e)\r
     {\r
       SequenceFetcher sf = new SequenceFetcher(null);\r
     }\r
+\r
 }\r
 \r