Changeset 8231 for trunk/gli/src/org/greenstone/gatherer/msm

Timestamp:

2004-10-07T16:44:32+13:00 (20 years ago)

Author:

mdewsnip

Message:

Replaced all "Gatherer.config" with "Configuration".

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• ExportMDSPrompt.java (modified) (2 diffs)
• GreenstoneArchiveParser.java (modified) (1 diff)
• MSMPrompt.java (modified) (5 diffs)
• MSMUtils.java (modified) (3 diffs)
• MetadataSet.java (modified) (4 diffs)
• MetadataSetManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/ExportMDSPrompt.java

@@ -42 +42 @@
 import javax.swing.*;
 import javax.swing.filechooser.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -201 +202 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
     // Display
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - getSize().width) / 2, (screen_size.height - getSize().height) / 2);
     }

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -189 +189 @@
         MetadataSet extracted_mds = Gatherer.c_man.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE);
         if (extracted_mds != null) {
-        element = extracted_mds.addElement(name, Gatherer.config.getLanguage());
+        element = extracted_mds.addElement(name, Configuration.getLanguage());
         }
     }

trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

@@ -43 +43 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -101 +102 @@
     progress.setStringPainted(true);
 
-    screen_size = Gatherer.config.screen_size;
+    screen_size = Configuration.screen_size;
     }
 
@@ -686 +687 @@
     JPanel control_pane = new JPanel();
     JTextArea instructions = new JTextArea();
-    instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     instructions.setEditable(false);
     instructions.setLineWrap(true);
@@ -698 +699 @@
     Dictionary.setText(original_label, "MSMPrompt.Select_Element_Original");
     JTextField original = new JTextField(name);
-    original.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    original.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     original.setEditable(false);
 
@@ -878 +879 @@
         Element element = mds.getElement(name);
         if (element == null) {
-        result = mds.addElement(name, Gatherer.config.getLanguage());
+        result = mds.addElement(name, Configuration.getLanguage());
         }
         else {

trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java

@@ -39 +39 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -379 +380 @@
      */
     static public String getDescription(Element element) {
-    String language_code_str = Gatherer.config.getLanguage();
+    String language_code_str = Configuration.getLanguage();
     StringBuffer description = new StringBuffer(StaticStrings.EMPTY_STR);
     description.append(getElementAttribute(element, StaticStrings.DEFINITION_VALUE, language_code_str));
@@ -532 +533 @@
      */
     static final public String getIdentifier(Element element) {
-    String identifier = getElementAttribute(element, StaticStrings.IDENTIFIER_VALUE, Gatherer.config.getLanguage());
+    String identifier = getElementAttribute(element, StaticStrings.IDENTIFIER_VALUE, Configuration.getLanguage());
     // Failing the above we return the nodes name instead.
     if(identifier == null || identifier.length() == 0) {

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSet.java

@@ -41 +41 @@
 import java.util.*;
 import org.apache.xerces.dom.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -294 +295 @@
      */
     public String getDescription() {
-    if(current_language_code != null && !Gatherer.config.getLanguage().equals(current_language_code)) {
+    if(current_language_code != null && !Configuration.getLanguage().equals(current_language_code)) {
         description = null;
     }
@@ -391 +392 @@
      */
     public String getName() {
-    if(current_language_code != null && !Gatherer.config.getLanguage().equals(current_language_code)) {
+    if(current_language_code != null && !Configuration.getLanguage().equals(current_language_code)) {
         name = null;
     }
@@ -537 +538 @@
 
     // Determine the language code.
-    current_language_code = Gatherer.config.getLanguage();
+    current_language_code = Configuration.getLanguage();
 
     ///ystem.err.println("Searching for the " + element_name + " in " + current_language_code);

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -359 +359 @@
         MetadataSet mds = (MetadataSet)mds_hashtable.get(keys.nextElement());
         if((!mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && !mds.getNamespace().equals(HIDDEN)) 
-           || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) || force_extracted)) 
+           || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && (Configuration.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) || force_extracted)) 
            || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && mds.getNamespace().equals(HIDDEN) && all)) {
         NodeList set_elements = mds.getElements();