Changeset 10371

Timestamp:

2005-08-01T13:52:40+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up some more usage of gsdl_path.

Location:

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

Files:

• GEMS.java (modified) (5 diffs)
• GEMSPreferences.java (modified) (1 diff)
• MSMUtils.java (modified) (1 diff)

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

@@ -119 +119 @@
     /** A reference to ourselves so our inner classes can dispose of us. */
     private GEMS self = null;
-    private String gsdl_path = null;
     private int current_attribute = -1;
     private int current_attribute_type = -1;
@@ -183 +182 @@
     this.dialog_options = new String[2];
     this.screen_size = config.screen_size;
-        this.gsdl_path = gsdl_path;
         
     // Initialise some common images
@@ -728 +726 @@
     private Vector attributeLists = null;      
 
-    org.w3c.dom.Document lang = XMLTools.parseXMLFile(Configuration.gsdl_path + File.separator + "gli" + File.separator + "classes" + File.separator + "xml" + File.separator + "languages.xml", false);
+    org.w3c.dom.Document lang = XMLTools.parseXMLFile(getGLIDirectoryPath() + "classes" + File.separator + "xml" + File.separator + "languages.xml", false);
     
     /** Constructor. */
@@ -850 +848 @@
         setLocation((config.screen_size.width - ADD_OR_EDIT_ATTRIBUTE_SIZE.width) / 2, (config.screen_size.height - ADD_OR_EDIT_ATTRIBUTE_SIZE.height) / 2);
 
-        GEMSLanguageManager GemsLangManager = new GEMSLanguageManager(Configuration.gsdl_path + File.separator + "gli" + File.separator + "classes" + File.separator + "xml" + File.separator + "languages.xml");
+        GEMSLanguageManager GemsLangManager = new GEMSLanguageManager(getGLIDirectoryPath() + "classes" + File.separator + "xml" + File.separator + "languages.xml");
         
             Vector languagecodes = GemsLangManager.getLanguageCodes();
@@ -1666 +1664 @@
             File[] col_dir = new File(Configuration.gsdl_path + File.separator + "collect").listFiles();
             
-            existingSetJComboBox.addItem("Default Metadata Sets                                                                                        #% " + Configuration.gsdl_path + "gli" + File.separator + "metadata");
+            existingSetJComboBox.addItem("Default Metadata Sets                                                                                        #% " + getGLIMetadataDirectoryPath());
                 
             for(int k = 0; k < col_dir.length; k++){

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

@@ -175 +175 @@
     int selectedLanguagesLength = 0;
                  
-        GEMSLanguageManager gemsLangManager = new GEMSLanguageManager(Configuration.gsdl_path + File.separator + "gli" + File.separator + "classes" + File.separator + "xml" + File.separator + "languages.xml");
+        GEMSLanguageManager gemsLangManager = new GEMSLanguageManager(GEMS.getGLIDirectoryPath() + "classes" + File.separator + "xml" + File.separator + "languages.xml");
 
     //Create the visible JList, and then another one with just the language codes. 

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

@@ -118 +118 @@
     TreeSet attribute_tree = new TreeSet();
 
-        GEMSLanguageManager gemsLangManager = new GEMSLanguageManager(Configuration.gsdl_path + File.separator + "gli" + File.separator + "classes" + File.separator + "xml" + File.separator + "languages.xml");
+        GEMSLanguageManager gemsLangManager = new GEMSLanguageManager(GEMS.getGLIDirectoryPath() + "classes" + File.separator + "xml" + File.separator + "languages.xml");
         
         String[] enabled_langs = gemsLangManager.getEnabledLanguageCodesToArray();