Checks in case DasSource is null
authoramwaterhouse <Andrew Waterhouse>
Wed, 7 Jun 2006 13:35:15 +0000 (13:35 +0000)
committeramwaterhouse <Andrew Waterhouse>
Wed, 7 Jun 2006 13:35:15 +0000 (13:35 +0000)
src/jalview/gui/DasSourceBrowser.java

index 01aa532..e23685c 100755 (executable)
@@ -490,42 +490,43 @@ public class DasSourceBrowser extends GDasSourceBrowser
       }\r
     }\r
 \r
-  void appendLocalSources()\r
-  {\r
-    if(localSources==null)\r
-      return;\r
+    void appendLocalSources()\r
+    {\r
+      if(localSources==null)\r
+        return;\r
 \r
-    int size = dasSources.length;\r
-    int lsize = localSources.size();\r
+      int size = dasSources!=null ? dasSources.length : 0;\r
+      int lsize = localSources.size();\r
 \r
-    Object[][] data = new Object[size+lsize][2];\r
-    for (int i = 0; i < size; i++)\r
-    {\r
-      data[i][0] = dasSources[i].getNickname();\r
-      data[i][1] = new Boolean(selectedSources.contains(dasSources[i].\r
-          getNickname()));\r
-    }\r
+      Object[][] data = new Object[size+lsize][2];\r
+      for (int i = 0; i < size; i++)\r
+      {\r
+        data[i][0] = dasSources[i].getNickname();\r
+        data[i][1] = new Boolean(selectedSources.contains(dasSources[i].\r
+            getNickname()));\r
+      }\r
 \r
-    DasSource [] tmp = new DasSource[size+lsize];\r
-    System.arraycopy(dasSources, 0, tmp, 0, size);\r
+      DasSource [] tmp = new DasSource[size+lsize];\r
+      if(dasSources!=null)\r
+        System.arraycopy(dasSources, 0, tmp, 0, size);\r
 \r
-    Enumeration en = localSources.keys();\r
-    int index = size;\r
-    while(en.hasMoreElements())\r
-    {\r
-      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].setNickname(key);\r
-      tmp[index].setUrl( ((DasSource)localSources.get(key)).getUrl() );\r
-\r
-      index++;\r
-    }\r
+      Enumeration en = localSources.keys();\r
+      int index = size;\r
+      while(en.hasMoreElements())\r
+      {\r
+        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].setNickname(key);\r
+        tmp[index].setUrl( ((DasSource)localSources.get(key)).getUrl() );\r
+\r
+        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