Set wrapped mode even if false

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

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