X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=8ce09955227ebe3a517c1a08a34ebe77ad40ec7c;hb=f149a335b5467a4802eded5da0ca2fc732d7caf7;hp=4bd31bd47f65f34f7772af9d4694efc69539f710;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index 4bd31bd..8ce0995 100755
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -59,8 +59,9 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
     return registry;
   }
 
-  public DasSourceBrowser()
+  public DasSourceBrowser(FeatureSettings featureSettings)
   {
+    fs = featureSettings;
     String registry = getDasRegistryURL();
 
     registryURL.setText(registry);
@@ -107,6 +108,13 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
     }
   }
 
+  FeatureSettings fs = null;
+
+  public DasSourceBrowser()
+  {
+    this(null);
+  }
+
   public void paintComponent(java.awt.Graphics g)
   {
     if (dasSources == null && !loadingDasSources)
@@ -183,11 +191,10 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
       text.append("<font color=\"#0000FF\">URL:</font> "
               + dasSources[i].getUrl() + "<br>");
 
-      text
-              .append("<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"
-                      + dasSources[i].getAdminemail()
-                      + "\">"
-                      + dasSources[i].getAdminemail() + "</a>" + "<br>");
+      text.append("<font color=\"#0000FF\">Admin Email:</font> <a href=\"mailto:"
+              + dasSources[i].getAdminemail()
+              + "\">"
+              + dasSources[i].getAdminemail() + "</a>" + "<br>");
 
       text.append("<font color=\"#0000FF\">Registered at:</font> "
               + dasSources[i].getRegisterDate() + "<br>");
@@ -271,16 +278,27 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
     refresh.setVisible(false);
     progressBar.setVisible(true);
     progressBar.setIndeterminate(true);
+    setParentGuiEnabled(false);
     // Refresh the source list.
     dasSources = null;
     getDASSource();
 
     init();
 
+    setParentGuiEnabled(true);
     loadingDasSources = false;
 
   }
 
+  private void setParentGuiEnabled(boolean b)
+  {
+    if (fs != null)
+    {
+      fs.fetchDAS.setEnabled(b);
+      fs.saveDAS.setEnabled(b);
+    }
+  }
+
   public Vector getSelectedSources()
   {
     // wait around if we're still loading.
@@ -570,8 +588,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
         {
           tmp[index] = dasSources[i];
           data[index][0] = dasSources[i].getNickname();
-          data[index][1] = new Boolean(selectedSources
-                  .contains(dasSources[i].getNickname()));
+          data[index][1] = new Boolean(
+                  selectedSources.contains(dasSources[i].getNickname()));
           index++;
         }
       }
@@ -671,14 +689,13 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
         // HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT
         // IS ADDED FROM THE REGISTRY
         names.add(ds.getNickname());
-        selected
-                .add(new Boolean(selectedSources.contains(ds.getNickname())));
+        selected.add(new Boolean(selectedSources.contains(ds.getNickname())));
         continue;
       }
 
       if (!selectedInList(dummyFeatureList, ds.getCapabilities())
-              || !selectedInList(filter3.getSelectedValues(), ds
-                      .getLabels()))
+              || !selectedInList(filter3.getSelectedValues(),
+                      ds.getLabels()))
       {
         continue;
       }
@@ -788,8 +805,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
       }
     }
 
-    properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE, sb
-            .toString());
+    properties.setProperty(jalview.bin.Cache.DAS_ACTIVE_SOURCE,
+            sb.toString());
 
     if (localSources != null)
     {
@@ -805,8 +822,8 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
                 + ((DasSource) localSources.get(token)).getUrl() + "\t");
       }
 
-      properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE, sb
-              .toString());
+      properties.setProperty(jalview.bin.Cache.DAS_LOCAL_SOURCE,
+              sb.toString());
     }
 
   }
@@ -931,4 +948,15 @@ public class DasSourceBrowser extends GDasSourceBrowser implements
     }
     return resolved;
   }
+
+  /**
+   * disable or enable the buttons on the source browser
+   * 
+   * @param b
+   */
+  public void setGuiEnabled(boolean b)
+  {
+    refresh.setEnabled(b);
+    addLocal.setEnabled(b);
+  }
 }