From cdefedf239cfb9d70f5e6a1ba6ff8993bbf9d1be Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 7 Jun 2006 13:35:15 +0000
Subject: [PATCH] Checks in case DasSource is null

---
 src/jalview/gui/DasSourceBrowser.java |   61 +++++++++++++++++----------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/jalview/gui/DasSourceBrowser.java b/src/jalview/gui/DasSourceBrowser.java
index 01aa532..e23685c 100755
--- a/src/jalview/gui/DasSourceBrowser.java
+++ b/src/jalview/gui/DasSourceBrowser.java
@@ -490,42 +490,43 @@ public class DasSourceBrowser extends GDasSourceBrowser
       }
     }
 
-  void appendLocalSources()
-  {
-    if(localSources==null)
-      return;
+    void appendLocalSources()
+    {
+      if(localSources==null)
+        return;
 
-    int size = dasSources.length;
-    int lsize = localSources.size();
+      int size = dasSources!=null ? dasSources.length : 0;
+      int lsize = localSources.size();
 
-    Object[][] data = new Object[size+lsize][2];
-    for (int i = 0; i < size; i++)
-    {
-      data[i][0] = dasSources[i].getNickname();
-      data[i][1] = new Boolean(selectedSources.contains(dasSources[i].
-          getNickname()));
-    }
+      Object[][] data = new Object[size+lsize][2];
+      for (int i = 0; i < size; i++)
+      {
+        data[i][0] = dasSources[i].getNickname();
+        data[i][1] = new Boolean(selectedSources.contains(dasSources[i].
+            getNickname()));
+      }
 
-    DasSource [] tmp = new DasSource[size+lsize];
-    System.arraycopy(dasSources, 0, tmp, 0, size);
+      DasSource [] tmp = new DasSource[size+lsize];
+      if(dasSources!=null)
+        System.arraycopy(dasSources, 0, tmp, 0, size);
 
-    Enumeration en = localSources.keys();
-    int index = size;
-    while(en.hasMoreElements())
-    {
-      String key = en.nextElement().toString();
-      data[index][0] = key;
-      data[index][1] = new Boolean(false);
-      tmp[index] = new DasSource();
-      tmp[index].setNickname(key);
-      tmp[index].setUrl( ((DasSource)localSources.get(key)).getUrl() );
-
-      index++;
-    }
+      Enumeration en = localSources.keys();
+      int index = size;
+      while(en.hasMoreElements())
+      {
+        String key = en.nextElement().toString();
+        data[index][0] = key;
+        data[index][1] = new Boolean(false);
+        tmp[index] = new DasSource();
+        tmp[index].setNickname(key);
+        tmp[index].setUrl( ((DasSource)localSources.get(key)).getUrl() );
+
+        index++;
+      }
 
-       dasSources = tmp;
+         dasSources = tmp;
 
-       refreshTableData(data);
+         refreshTableData(data);
   }
 
   public void valueChanged(ListSelectionEvent evt)
-- 
1.7.10.2