JAL-2316 Unit test updates and associated minor changes and fixes.

[jalview.git] / src / jalview / urls / UrlLinkTableModel.java

diff --git a/src/jalview/urls/UrlLinkTableModel.java b/src/jalview/urls/UrlLinkTableModel.java
index a18341b..a647d9e 100644 (file)
--- a/src/jalview/urls/UrlLinkTableModel.java
+++ b/src/jalview/urls/UrlLinkTableModel.java
@@ -21,6 +21,9 @@
 
 package jalview.urls;
 
+import jalview.bin.Cache;
+import jalview.util.UrlLink;
+
 import java.util.Iterator;
 import java.util.List;
 
@@ -89,8 +92,14 @@ public class UrlLinkTableModel extends AbstractTableModel
       @Override
       public void tableChanged(TableModelEvent e)
       {
-        // update the UrlProvider from data list
-        dataProvider.setUrlData(data);
+        try
+        {
+          // update the UrlProvider from data list
+          dataProvider.setUrlData(data);
+        } catch (IllegalArgumentException ex)
+        {
+          Cache.log.error(ex.getMessage());
+        }
       }
     });
 
@@ -184,7 +193,8 @@ public class UrlLinkTableModel extends AbstractTableModel
   public int insertRow(String name, String url)
   {
     // add a row to the data
-    UrlLinkDisplay u = new UrlLinkDisplay(name, name, url, true, false);
+    UrlLink link = new UrlLink(name, url);
+    UrlLinkDisplay u = new UrlLinkDisplay(name, link, true, false);
     int index = data.size();
     data.add(u);
 
@@ -193,4 +203,28 @@ public class UrlLinkTableModel extends AbstractTableModel
     return index;
   }
 
+  public int getDefaultColumn()
+  {
+    return UrlLinkDisplay.DEFAULT;
+  }
+
+  public int getNameColumn()
+  {
+    return UrlLinkDisplay.NAME;
+  }
+
+  public int getIdColumn()
+  {
+    return UrlLinkDisplay.ID;
+  }
+
+  public int getUrlColumn()
+  {
+    return UrlLinkDisplay.URL;
+  }
+
+  public int getSelectedColumn()
+  {
+    return UrlLinkDisplay.SELECTED;
+  }
 }