X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FDasSourceBrowser.java;h=7875d7bb886c0c1efd8a5b95c2dc08dabd7a7899;hb=e3eb93bc131a0f088312fddde91b728dbebe40d4;hp=afacb41f3d9eab4c72664bf12b33227b083943f9;hpb=df9b85c1cf39894039018499fe802406cc37f209;p=jalview.git

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index afacb41..7875d7b 100755
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -44,7 +44,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
   public DasSourceBrowser()
   {
     registryURL.setText(jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
-        "http://www.spice-3d.org/dasregistry/das1/sources") );
+        "http://das.sanger.ac.uk/registry/das1/sources/") );
 
     setSelectedFromProperties();
 
@@ -240,6 +240,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
 
   public void run()
   {
+
     addLocal.setVisible(false);
     refresh.setVisible(false);
     progressBar.setVisible(true);
@@ -252,6 +253,25 @@ public class DasSourceBrowser extends GDasSourceBrowser
     init();
   }
 
+  public Vector getSelectedSources()
+  {
+    Vector selected = new Vector();
+    for (int r = 0; r < selectedSources.size(); r++)
+    {
+        for (int i = 0; i < dasSources.length; i++)
+        {
+          if (dasSources[i].getNickname().equals(
+              selectedSources.elementAt(r)))
+          {
+            selected.addElement(dasSources[i]);
+            break;
+          }
+        }
+    }
+
+    return selected;
+  }
+
   public DasSource[] getDASSource()
   {
     if(dasSources==null)
@@ -280,8 +300,6 @@ public class DasSourceBrowser extends GDasSourceBrowser
     authority.addElement("Any");
     type.addElement("Any");
     label.addElement("Any");
-    label.addElement("NOT IMPLEMENTED YET");
-    filter3.setEnabled(false);
 
     for (int i = 0; i < sources.length; i++)
     {
@@ -552,12 +570,19 @@ public class DasSourceBrowser extends GDasSourceBrowser
     ArrayList selected = new ArrayList();
     DasSource ds;
 
+    //The features filter is not visible, but we must still
+    //filter the das source list here.
+    //July 2006 - only 6 sources fo not serve features
+    Object [] dummyFeatureList = new Object[]{"features"};
+
     // capabilities.get
     for (int i = 0; i < dSize; i++)
     {
       ds = dasSources[i];
 
-      if (!selectedInList(filter3, ds.getLabels()))
+      if (!selectedInList(dummyFeatureList, ds.getCapabilities())
+      ||  !selectedInList(filter3.getSelectedValues(),
+                          ds.getLabels()))
       {
         continue;
       }
@@ -565,9 +590,13 @@ public class DasSourceBrowser extends GDasSourceBrowser
       DasCoordinateSystem[] dcs = ds.getCoordinateSystem();
       for (int j = 0; j < dcs.length; j++)
       {
-        if (selectedInList(filter1, new String[]
+        if (selectedInList(dummyFeatureList,ds.getCapabilities())
+        &&
+            selectedInList(filter1.getSelectedValues(),
+                           new String[]
                            {dcs[j].getName()})
-            && selectedInList(filter2, new String[]
+            && selectedInList(filter2.getSelectedValues(),
+                              new String[]
                               {dcs[j].getCategory()}))
         {
           names.add(ds.getNickname());
@@ -589,9 +618,8 @@ public class DasSourceBrowser extends GDasSourceBrowser
     refreshTableData(data);
   }
 
-  boolean selectedInList(JList list, String[] items)
+  boolean selectedInList(Object [] selection, String[] items)
   {
-    Object[] selection = list.getSelectedValues();
     for (int i = 0; i < selection.length; i++)
     {
       if (selection[i].equals("Any"))
@@ -638,7 +666,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
      }
   }
 
-  void saveProperties(Properties properties)
+  public void saveProperties(Properties properties)
   {
     properties.setProperty("DAS_REGISTRY_URL", registryURL.getText());