showqual, showcons never used

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

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index e8109c7..fc2b387 100755 (executable)
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -41,10 +41,15 @@ public class DasSourceBrowser extends GDasSourceBrowser
 \r
   Vector selectedSources;\r
 \r
+  String DEFAULT_REGISTRY = "http://das.sanger.ac.uk/registry/das1/sources/";\r
+\r
+  boolean loadingDasSources = false;\r
+\r
+\r
   public DasSourceBrowser()\r
   {\r
     registryURL.setText(jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",\r
-        "http://das.sanger.ac.uk/registry/das1/sources/") );\r
+        DEFAULT_REGISTRY) );\r
 \r
     setSelectedFromProperties();\r
 \r
@@ -61,10 +66,6 @@ public class DasSourceBrowser extends GDasSourceBrowser
     {\r
       public void valueChanged(ListSelectionEvent e)\r
       {\r
-        //Ignore extra messages.\r
-        if (e.getValueIsAdjusting())\r
-          return;\r
-\r
         ListSelectionModel lsm = (ListSelectionModel) e.getSource();\r
         if (!lsm.isSelectionEmpty())\r
         {\r
@@ -84,15 +85,19 @@ public class DasSourceBrowser extends GDasSourceBrowser
           }\r
         });\r
 \r
-    if(dasSources==null)\r
+    if(dasSources!=null)\r
     {\r
-    Thread worker = new Thread(this);\r
-    worker.start();\r
-    }\r
-    else\r
-     {\r
        init();\r
-     }\r
+    }\r
+  }\r
+\r
+  public void paintComponent(java.awt.Graphics g)\r
+  {\r
+    if (dasSources == null && !loadingDasSources)\r
+    {\r
+      Thread worker = new Thread(this);\r
+      worker.start();\r
+    }\r
   }\r
 \r
   void init()\r
@@ -240,6 +245,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
 \r
   public void run()\r
   {\r
+    loadingDasSources = true;\r
 \r
     addLocal.setVisible(false);\r
     refresh.setVisible(false);\r
@@ -251,6 +257,9 @@ public class DasSourceBrowser extends GDasSourceBrowser
     appendLocalSources();\r
 \r
     init();\r
+\r
+    loadingDasSources = false;\r
+\r
   }\r
 \r
   public Vector getSelectedSources()\r
@@ -549,23 +558,26 @@ public class DasSourceBrowser extends GDasSourceBrowser
         index++;\r
       }\r
 \r
-         dasSources = tmp;\r
+      dasSources = tmp;\r
 \r
-         refreshTableData(data);\r
+      refreshTableData(data);\r
   }\r
 \r
   public void valueChanged(ListSelectionEvent evt)\r
   {\r
     //Called when the MainTable selection changes\r
-    if (evt.getValueIsAdjusting())\r
+    if (evt.getValueIsAdjusting() )\r
     {\r
       return;\r
     }\r
 \r
+\r
     displayFullDetails(null);\r
 \r
     // Filter the displayed data sources\r
     int dSize = dasSources.length;\r
+\r
+\r
     ArrayList names = new ArrayList();\r
     ArrayList selected = new ArrayList();\r
     DasSource ds;\r
@@ -575,10 +587,25 @@ public class DasSourceBrowser extends GDasSourceBrowser
     //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
+      DasCoordinateSystem[] dcs = ds.getCoordinateSystem();\r
+\r
+      if (dcs.length == 0 && ds.getCapabilities().length == 0\r
+          && filter1.getSelectedIndex() == 0\r
+          && filter2.getSelectedIndex() == 0\r
+          && filter3.getSelectedIndex() == 0)\r
+      {\r
+        //THIS IS A FIX FOR LOCAL SOURCES WHICH DO NOT\r
+        //HAVE COORDINATE SYSTEMS, INFO WHICH AT PRESENT\r
+        //IS ADDED FROM THE REGISTRY\r
+        names.add(ds.getNickname());\r
+        selected.add(new Boolean(\r
+              selectedSources.contains(ds.getNickname())));\r
+        continue;\r
+      }\r
+\r
 \r
       if (!selectedInList(dummyFeatureList, ds.getCapabilities())\r
       ||  !selectedInList(filter3.getSelectedValues(),\r
@@ -587,12 +614,9 @@ public class DasSourceBrowser extends GDasSourceBrowser
         continue;\r
       }\r
 \r
-      DasCoordinateSystem[] dcs = ds.getCoordinateSystem();\r
       for (int j = 0; j < dcs.length; j++)\r
       {\r
-        if (selectedInList(dummyFeatureList,ds.getCapabilities())\r
-        &&\r
-            selectedInList(filter1.getSelectedValues(),\r
+        if (   selectedInList(filter1.getSelectedValues(),\r
                            new String[]\r
                            {dcs[j].getName()})\r
             && selectedInList(filter2.getSelectedValues(),\r
@@ -622,7 +646,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
   {\r
     for (int i = 0; i < selection.length; i++)\r
     {\r
-      if (selection[i].equals("Any"))\r
+      if (selection[i].equals("Any") )\r
         return true;\r
 \r
       for (int j = 0; j < items.length; j++)\r
@@ -666,6 +690,11 @@ public class DasSourceBrowser extends GDasSourceBrowser
      }\r
   }\r
 \r
+  public void reset_actionPerformed(ActionEvent e)\r
+  {\r
+    registryURL.setText(DEFAULT_REGISTRY);\r
+  }\r
+\r
   public void saveProperties(Properties properties)\r
   {\r
     if (registryURL.getText() == null || registryURL.getText().length() < 1)\r