check helperUrl is not null
authoramwaterhouse <Andrew Waterhouse>
Thu, 15 Jun 2006 14:02:03 +0000 (14:02 +0000)
committeramwaterhouse <Andrew Waterhouse>
Thu, 15 Jun 2006 14:02:03 +0000 (14:02 +0000)
src/jalview/gui/DasSourceBrowser.java

index f57967c..5b1adb1 100755 (executable)
@@ -27,8 +27,9 @@ import javax.swing.*;
 import java.util.*;\r
 \r
 \r
-import org.biojava.services.das.registry.DasCoordinateSystem;\r
-import org.biojava.services.das.registry.DasSource;\r
+import org.biojava.dasobert.dasregistry.DasCoordinateSystem;\r
+import org.biojava.dasobert.dasregistry.DasSource;\r
+import org.biojava.dasobert.dasregistry.Das1Source;\r
 import java.awt.BorderLayout;\r
 \r
 public class DasSourceBrowser extends GDasSourceBrowser\r
@@ -212,7 +213,9 @@ public class DasSourceBrowser extends GDasSourceBrowser
       text.append("<font color=\"#0000FF\">Description:</font> " +\r
                   dasSources[i].getDescription() + "<br>");\r
 \r
-      if (dasSources[i].getHelperurl().length() > 0)\r
+\r
+      if (dasSources[i].getHelperurl()!=null\r
+          && dasSources[i].getHelperurl().length() > 0)\r
       {\r
         text.append("<font color=\"#0000FF\"><a href=\"" +\r
                     dasSources[i].getHelperurl()\r
@@ -354,7 +357,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
        if(!urltf.getText().endsWith("/"))\r
          urltf.setText(urltf.getText()+"/");\r
 \r
-       DasSource local = new DasSource();\r
+       Das1Source local = new Das1Source();\r
 \r
        local.setUrl(urltf.getText());\r
        local.setNickname(nametf.getText());\r
@@ -517,7 +520,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
         String key = en.nextElement().toString();\r
         data[index][0] = key;\r
         data[index][1] = new Boolean(false);\r
-        tmp[index] = new DasSource();\r
+        tmp[index] = new Das1Source();\r
         tmp[index].setNickname(key);\r
         tmp[index].setUrl( ((DasSource)localSources.get(key)).getUrl() );\r
 \r
@@ -621,7 +624,7 @@ public class DasSourceBrowser extends GDasSourceBrowser
        {\r
          String token = st.nextToken();\r
          int bar = token.indexOf("|");\r
-         DasSource source = new DasSource();\r
+         Das1Source source = new Das1Source();\r
 \r
          source.setUrl(token.substring(bar + 1));\r
          source.setNickname(token.substring(0, bar));\r