Changeset 5255

Timestamp:

2003-08-22T10:08:26+12:00 (21 years ago)

Author:

jmt12

Message:

Changed calls to CollectionMeta to reflect the two modes of retrieving value - as text, or as greenstone format

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• GeneralManager.java (modified) (2 diffs)
• Index.java (modified) (1 diff)
• Level.java (modified) (1 diff)
• SubcollectionIndex.java (modified) (1 diff)
• TranslationView.java (modified) (5 diffs)

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

@@ -213 +213 @@
         maintainer_label.setPreferredSize(LABEL_SIZE);
         maintainer_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
-        public_checkbox = new JCheckBox("CDM.General.Access", public_collectionmeta.getValue().equals(CollectionConfiguration.TRUE_STR));
-        beta_checkbox = new JCheckBox("CDM.General.Beta", beta_collectionmeta.getValue().equals(CollectionConfiguration.TRUE_STR));
+        public_checkbox = new JCheckBox("CDM.General.Access", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        beta_checkbox = new JCheckBox("CDM.General.Beta", beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
         JPanel name_panel = new JPanel();
         name_label = new JLabel("CDM.General.Collection_Name");
@@ -322 +322 @@
         maintainer_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getMaintainer());
         // Make sure the components are up to date
-        creator_emailfield.setText(creator_collectionmeta.getValue());
+        creator_emailfield.setText(creator_collectionmeta.getValue(CollectionMeta.TEXT));
         creator_emailfield.setCaretPosition(0);
-        description_textarea.setText(collection_extra_collectionmeta.getValue());
+        description_textarea.setText(collection_extra_collectionmeta.getValue(CollectionMeta.TEXT));
         description_textarea.setCaretPosition(0);
-        icon_textfield.setText(icon_collection_collectionmeta.getValue());
+        icon_textfield.setText(icon_collection_collectionmeta.getValue(CollectionMeta.TEXT));
         icon_textfield.setCaretPosition(0);
-        maintainer_emailfield.setText(maintainer_collectionmeta.getValue());
+        maintainer_emailfield.setText(maintainer_collectionmeta.getValue(CollectionMeta.TEXT));
         maintainer_emailfield.setCaretPosition(0);
-        name_textfield.setText(collection_name_collectionmeta.getValue());
+        name_textfield.setText(collection_name_collectionmeta.getValue(CollectionMeta.TEXT));
         name_textfield.setCaretPosition(0);
-        small_icon_textfield.setText(icon_collection_small_collectionmeta.getValue());
+        small_icon_textfield.setText(icon_collection_small_collectionmeta.getValue(CollectionMeta.TEXT));
         small_icon_textfield.setCaretPosition(0);
         ready = true;

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

@@ -306 +306 @@
     if(metadatum != null) {
         text_buffer.append(" \"");
-        text_buffer.append(metadatum.getValue());
+        text_buffer.append(metadatum.getValue(CollectionMeta.TEXT));
         text_buffer.append("\"");
     }

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

@@ -160 +160 @@
         if(metadatum != null) {
             text_buffer.append(" \"");
-            text_buffer.append(metadatum.getValue());
+            text_buffer.append(metadatum.getValue(CollectionMeta.TEXT));
             text_buffer.append("\"");
         }

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

@@ -188 +188 @@
     if(metadatum != null) {
         text.append(" \"");
-        text.append(metadatum.getValue());
+        text.append(metadatum.getValue(CollectionMeta.TEXT));
         text.append("\"");
     }

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

@@ -435 +435 @@
             CollectionMeta default_metadata = CollectionDesignManager.collectionmeta_manager.getMetadatum(selected_feature.getName());
             if(default_metadata != null) {
-                default_area.setText(default_metadata.getValue());
+                default_area.setText(default_metadata.getValue(CollectionMeta.TEXT));
             }
             // Update the text fragment table.
@@ -447 +447 @@
                 CollectionMeta metadata = fragment_table_model.getMetadata(index);
                 fragment_table.setRowSelectionInterval(index, index);
-                translation_area.setText(metadata.getValue());
+                translation_area.setText(metadata.getValue(CollectionMeta.TEXT));
                 metadata = null;
             }
@@ -490 +490 @@
                 }
             }
-            translation_area.setText(metadata.getValue());
+            translation_area.setText(metadata.getValue(CollectionMeta.TEXT));
             remove_button.setEnabled(true);
             }
@@ -543 +543 @@
             return CollectionDesignManager.language_manager.getLanguageName(metadatum.getLanguage());
             default:
-            return metadatum.getValue();
+            return metadatum.getValue(CollectionMeta.TEXT);
             }
         }
@@ -599 +599 @@
             CollectionMeta metadata = fragment_table_model.getMetadata(index);
             fragment_table.setRowSelectionInterval(index, index);
-            translation_area.setText(metadata.getValue());
+            translation_area.setText(metadata.getValue(CollectionMeta.TEXT));
             }
             else {