Changeset 9943

Timestamp:

2005-05-24T17:00:37+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fix to the bug that prevented adding the same attribute to an element in different languages. By Matthew Whyte.

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• AttributeTableModel.java (modified) (2 diffs)
• GEMS.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/AttributeTableModel.java

@@ -97 +97 @@
     }
 
+    /**
+     * Checks to see if the table contains a given value in a given column
+     *
+     * @param value the <strong>String</strong> to check for
+     * @param column the column number to check in, as an <strong>int</strong>
+     * @return boolean - true if the table contains the value.
+     */
     public boolean contains(String value, int column) {
     boolean result = false;
@@ -107 +114 @@
     }  
     return result;
+    }
+
+    /**
+     * Checks to see if the table contains a given value in a given language
+     *
+     * @param value the <strong>String</strong> to check for
+     * @param language_code the language code to check for, as a <strong>String</strong>
+     * @return boolean - true if the table contains the value.
+     */
+    public boolean contains(String value, String language_code) {
+    Iterator iterator = attributes.iterator();
+    while(iterator.hasNext()) {
+        Attribute attribute = (Attribute) iterator.next();
+        String attributeLanguage = attribute.language;
+        if(attributeLanguage == null) {
+        attributeLanguage = "";
+        }       
+        if(language_code == null) {
+        language_code = "";
+        }
+      
+        if(value.equals(attribute.name) && language_code.equalsIgnoreCase(attribute.language)) {
+        return true;
+        }
+    }
+    return false;
     }
 

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -1056 +1056 @@
         String new_name_str = name.getSelectedItem().toString();
         String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
+        String language_code = (String) language_box.getSelectedItem();
         String old_name_str = null;
         boolean cont = false;
@@ -1067 +1068 @@
 
         // Check that there isn't already an entry for this attribute
-        if (!model.contains(new_name_str, 0) || (edit && new_name_str.equals(old_name_str)))
+        if (!model.contains(new_name_str, language_code) || (edit && new_name_str.equals(old_name_str)))
         {
             if(edit) //If edit, remove old attribute
@@ -1085 +1086 @@
         {
             cont = false;
-            JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self,
+                          Dictionary.get("GEMS.Attribute_Already_Exists"),
+                          Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
        
@@ -1115 +1118 @@
 
         //Check that there isn't already an entry for this attribute
-        if (!model.contains(new_name_str, 0) || (edit && new_name_str.equals(old_name_str)))
+        if (!model.contains(new_name_str, language_code) || (edit && new_name_str.equals(old_name_str)))
         {
             if(edit) //If this is an edit, remove the old attribute
@@ -1135 +1138 @@
         {
             cont = false;
-            JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self,
+                          Dictionary.get("GEMS.Attribute_Already_Exists"),
+                          Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }