From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 15 Jun 2006 14:02:03 +0000 (+0000)
Subject: check helperUrl is not null
X-Git-Tag: Release_2_1~340
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=07af649391c1b952c268b8e5776531ab6f3d2f0e;hp=ac8acb905e84708b759ae1e87eaf6691d9376d57;p=jalview.git

check helperUrl is not null
---

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