JAL-2316 Added GUI checks for duplicate link ids

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 9ee3077..b46ae10 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -867,9 +867,18 @@ public class Preferences extends GPreferences
       {
         if (link.checkValid())
         {
-          ((UrlLinkTableModel) linkUrlTable.getModel()).insertRow(
-                  link.getName(), link.getURL());
-          valid = true;
+          if (((UrlLinkTableModel) linkUrlTable.getModel())
+                  .isUniqueName(link.getName()))
+          {
+            ((UrlLinkTableModel) linkUrlTable.getModel()).insertRow(
+                    link.getName(), link.getURL());
+            valid = true;
+          }
+          else
+          {
+            link.notifyDuplicate();
+            continue;
+          }
         }
       }
       else
@@ -904,9 +913,18 @@ public class Preferences extends GPreferences
       {
         if (link.checkValid())
         {
-          linkUrlTable.setValueAt(link.getName(), index, 0);
-          linkUrlTable.setValueAt(link.getURL(), index, 1);
-          valid = true;
+          if (((UrlLinkTableModel) linkUrlTable.getModel())
+                  .isUniqueName(link.getName()))
+          {
+            linkUrlTable.setValueAt(link.getName(), index, 0);
+            linkUrlTable.setValueAt(link.getURL(), index, 1);
+            valid = true;
+          }
+          else
+          {
+            link.notifyDuplicate();
+            continue;
+          }
         }
       }
       else