Changeset 12728

Timestamp:

2006-09-13T14:04:28+12:00 (18 years ago)

Author:

kjdon

Message:

changed the language_metadata object from a Language (which it wasn't) to an Element. hopefully it won't get saved multiple times anymore

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/LanguageManager.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/LanguageManager.java

@@ -68 +68 @@
     /** The default language object. */
     private Language default_language = null;
-    // this is not actually a language, but we will use it anyway.
-    private Language language_metadata = null;
-    
+    /** The language metadata element - specifies which metadata the 
+    language should be read from to determine the partitons */
+    private Element language_metadata = null;
    /** Constructor. */
     public LanguageManager(Element languages_element) {
@@ -85 +85 @@
 
     // Retrieve the language metadata
-    language_metadata = new Language(CollectionDesignManager.collect_config.getLanguageMetadata());
+    language_metadata = CollectionDesignManager.collect_config.getLanguageMetadata();
     // Load a series of code->language mappings into known_languages, by reading from the 'languages.xml' file, which is essentially a subset of the ISO 639 Standard.
     known_languages = new LinkedHashMap();
@@ -324 +324 @@
         JLabel language_metadata_label = new JLabel(Dictionary.get("CDM.LanguageManager.LanguageMetadata"));
         String current_value = "ex.Language";
-        if (language_metadata.getCode() != null) {
-        current_value = language_metadata.getCode();
+        if (language_metadata.getAttribute(StaticStrings.ASSIGNED_ATTRIBUTE).equals(StaticStrings.TRUE_STR) && !language_metadata.getAttribute(StaticStrings.NAME_ATTRIBUTE).equals("")) {
+        current_value = language_metadata.getAttribute(StaticStrings.NAME_ATTRIBUTE);
         }
         ArgumentControl.selectValue(language_metadata_combo, current_value);
@@ -370 +370 @@
             public void actionPerformed(ActionEvent event) {
             String value = ((MetadataElement)language_metadata_combo.getSelectedItem()).getFullName();
-            language_metadata.setAssigned(true);
-            language_metadata.setCode(value);
+            language_metadata.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
+            language_metadata.setAttribute(StaticStrings.NAME_ATTRIBUTE, value);
             Gatherer.c_man.configurationChanged();
             }