2.5.1 release branding

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

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 1dc577e..b307b73 100755 (executable)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5.1)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -134,7 +134,7 @@ public class FeatureSettings extends JPanel
 
     scrollPane.setViewportView(table);
 
-    dassourceBrowser = new DasSourceBrowser();
+    dassourceBrowser = new DasSourceBrowser(this);
     dasSettingsPane.add(dassourceBrowser, BorderLayout.CENTER);
 
     if (af.getViewport().featuresDisplayed == null
@@ -163,7 +163,13 @@ public class FeatureSettings extends JPanel
 
     frame = new JInternalFrame();
     frame.setContentPane(this);
-    Desktop.addInternalFrame(frame, "Sequence Feature Settings", 400, 450);
+    if (new jalview.util.Platform().isAMac())
+    {
+       Desktop.addInternalFrame(frame, "Sequence Feature Settings", 475, 480);
+    } else {
+       Desktop.addInternalFrame(frame, "Sequence Feature Settings", 400, 450);
+    }
+    
     frame
             .addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
             {
@@ -171,6 +177,7 @@ public class FeatureSettings extends JPanel
                       javax.swing.event.InternalFrameEvent evt)
               {
                 fr.removePropertyChangeListener(change);
+                dassourceBrowser.fs = null;
               };
             });
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -1158,6 +1165,7 @@ public class FeatureSettings extends JPanel
   {
     fetchDAS.setEnabled(false);
     cancelDAS.setEnabled(true);
+    dassourceBrowser.setGuiEnabled(false);
     Vector selectedSources = dassourceBrowser.getSelectedSources();
     doDasFeatureFetch(selectedSources, true, true);
   }
@@ -1285,6 +1293,8 @@ public class FeatureSettings extends JPanel
   {
     fetchDAS.setEnabled(true);
     cancelDAS.setEnabled(false);
+    dassourceBrowser.setGuiEnabled(true);
+    
   }
 
   public void cancelDAS_actionPerformed(ActionEvent e)
@@ -1293,8 +1303,7 @@ public class FeatureSettings extends JPanel
     {
       dasFeatureFetcher.cancel();
     }
-    fetchDAS.setEnabled(true);
-    cancelDAS.setEnabled(false);
+    complete();
   }
 
   public void noDasSourceActive()