Changeset 10332

Timestamp:

2005-07-27T16:41:22+12:00 (19 years ago)

Author:

mdewsnip

Message:

Renamed the collect_config_file option to collect_cfg_file, so it is accurate.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (5 diffs)

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

@@ -316 +316 @@
     /** ************************** Private Data Members ***************************/
     
-    private File collect_config_file;
+    private File collect_cfg_file;
 
     /** ************************** Public Methods ***************************/
 
-    public CollectionConfiguration(File collect_config_file) {
+    public CollectionConfiguration(File collect_cfg_file) {
     this.self = this;
-    this.collect_config_file = collect_config_file;
+    this.collect_cfg_file = collect_cfg_file;
     // If collect_cfg is xml we can load it straight away
-    String collect_config_name = collect_config_file.getName();
+    String collect_config_name = collect_cfg_file.getName();
     if(collect_config_name.equals(COLLECTCONFIGURATION_XML)) {
-        document = XMLTools.parseXMLFile(collect_config_file);
+        document = XMLTools.parseXMLFile(collect_cfg_file);
     }
     // Otherwise if this is a legacy collect.cfg file then read in the template and send to magic parser
     else if(collect_config_name.equals(COLLECT_CFG)) {
         document = XMLTools.parseXMLFile("xml/CollectionConfig.xml", true);
-        parse(collect_config_file);
+        parse(collect_cfg_file);
     }
     }
@@ -368 +368 @@
 
     public File getFile() {
-    return collect_config_file;
+    return collect_cfg_file;
     }
 
@@ -456 +456 @@
 
     public void save(boolean force_xml) {
-    if(collect_config_file.exists()) {
-        File original_file = new File(collect_config_file.getParentFile(), COLLECT_CFG);
-        File backup_file = new File(collect_config_file.getParentFile(), "collect.bak");
+    if(collect_cfg_file.exists()) {
+        File original_file = new File(collect_cfg_file.getParentFile(), COLLECT_CFG);
+        File backup_file = new File(collect_cfg_file.getParentFile(), "collect.bak");
         if(backup_file.exists()) {
         backup_file.delete();
@@ -466 +466 @@
         }
     }
-    if(force_xml || collect_config_file.getName().equals(COLLECTCONFIGURATION_XML)) {
+    if(force_xml || collect_cfg_file.getName().equals(COLLECTCONFIGURATION_XML)) {
         ///ystem.err.println("Writing XML");
-        XMLTools.writeXMLFile(new File(collect_config_file.getParentFile(), COLLECTCONFIGURATION_XML), document);
+        XMLTools.writeXMLFile(new File(collect_cfg_file.getParentFile(), COLLECTCONFIGURATION_XML), document);
     }
     else {
         ///ystem.err.println("Writing text");
         try {       
-        OutputStream ostream = new FileOutputStream(collect_config_file);
+        OutputStream ostream = new FileOutputStream(collect_cfg_file);
         Writer file_writer = new OutputStreamWriter(ostream, ENCODING);
-        //FileWriter file_writer = new FileWriter(collect_config_file, false);
+        //FileWriter file_writer = new FileWriter(collect_cfg_file, false);
         BufferedWriter buffered_writer = new BufferedWriter(file_writer);
         Element collect_config_element = document.getDocumentElement();
@@ -834 +834 @@
     /** Parse a collect.cfg into a DOM model representation. 
      * note we are ignoring 2.39 compatibility now. */
-    private void parse(File collect_config_file) {
+    private void parse(File collect_cfg_file) {
     try {
 
         Element collect_cfg_element = document.getDocumentElement();
         // Read in the file one command at a time.
-        InputStream istream = new FileInputStream(collect_config_file);
+        InputStream istream = new FileInputStream(collect_cfg_file);
         Reader in_reader = new InputStreamReader(istream, ENCODING);
         BufferedReader in = new BufferedReader(in_reader);