From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 20 Nov 2006 18:17:37 +0000 (+0000)
Subject: Cancel DAS fetching
X-Git-Tag: Release_2_2~90
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=38a10817438b42f7cba2ee95d4d65cb9672926ab;p=jalview.git

Cancel DAS fetching
---

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index ef688f7..2405808 100755
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -35,11 +35,12 @@ import java.awt.Color;
 public class FeatureSettings extends JPanel
 {
   DasSourceBrowser dassourceBrowser;
+  jalview.io.DasSequenceFeatureFetcher dasFeatureFetcher;
   JPanel settingsPane = new JPanel();
   JPanel dasSettingsPane = new JPanel();
 
   final FeatureRenderer fr;
-  final AlignFrame af;
+  public final AlignFrame af;
   Object [][] originalData;
   final JInternalFrame frame;
   JScrollPane scrollPane = new JScrollPane();
@@ -450,6 +451,7 @@ public class FeatureSettings extends JPanel
   JPanel dasButtonPanel = new JPanel();
   JButton fetchDAS = new JButton();
   JButton saveDAS = new JButton();
+  JButton cancelDAS = new JButton();
   private void jbInit()
       throws Exception
   {
@@ -532,6 +534,15 @@ public class FeatureSettings extends JPanel
     });
     dasButtonPanel.setBorder(BorderFactory.createEtchedBorder());
     dasSettingsPane.setBorder(null);
+    cancelDAS.setEnabled(false);
+    cancelDAS.setText("Cancel Fetch");
+    cancelDAS.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        cancelDAS_actionPerformed(e);
+      }
+    });
     this.add(tabbedPane, java.awt.BorderLayout.CENTER);
     tabbedPane.addTab("Feature Settings", settingsPane );
     tabbedPane.addTab("DAS Settings", dasSettingsPane);
@@ -545,6 +556,7 @@ public class FeatureSettings extends JPanel
     bigPanel.add(scrollPane, java.awt.BorderLayout.CENTER);
     dasSettingsPane.add(dasButtonPanel, java.awt.BorderLayout.SOUTH);
     dasButtonPanel.add(fetchDAS);
+    dasButtonPanel.add(cancelDAS);
     dasButtonPanel.add(saveDAS);
     settingsPane.add(bigPanel, java.awt.BorderLayout.CENTER);
     settingsPane.add(buttonPanel, java.awt.BorderLayout.SOUTH);
@@ -552,6 +564,8 @@ public class FeatureSettings extends JPanel
 
   public void fetchDAS_actionPerformed(ActionEvent e)
   {
+    fetchDAS.setEnabled(false);
+    cancelDAS.setEnabled(true);
     Vector selectedSources = dassourceBrowser.getSelectedSources();
 
     SequenceI [] dataset, seqs ;
@@ -578,9 +592,10 @@ public class FeatureSettings extends JPanel
       dataset[i] = seqs[i].getDatasetSequence();
     }
 
-    new jalview.io.DasSequenceFeatureFetcher(
+    dasFeatureFetcher =
+        new jalview.io.DasSequenceFeatureFetcher(
         dataset,
-        af,
+        this,
         selectedSources);
 
     af.getViewport().setShowSequenceFeatures(true);
@@ -592,6 +607,19 @@ public class FeatureSettings extends JPanel
     dassourceBrowser.saveProperties(jalview.bin.Cache.applicationProperties);
   }
 
+  public void complete()
+  {
+    fetchDAS.setEnabled(true);
+    cancelDAS.setEnabled(false);
+  }
+
+  public void cancelDAS_actionPerformed(ActionEvent e)
+  {
+    dasFeatureFetcher.cancel();
+    fetchDAS.setEnabled(true);
+    cancelDAS.setEnabled(false);
+  }
+
   /////////////////////////////////////////////////////////////////////////
   // http://java.sun.com/docs/books/tutorial/uiswing/components/table.html
   /////////////////////////////////////////////////////////////////////////