Changeset 2660 for vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

Timestamp:

03/07/13 09:54:21 (11 years ago)

Author:

keeloo

Message:

Made VloConfig? truly static.

File:

• vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) (4 diffs)

vlo/branches/vlo-2.13-param/vlo_importer/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java

@@ -129 +129 @@
      * @return the configuration 
      */
-    public static VloConfig readPackagedConfig() {
+    public static void readPackagedConfig() {
         
         // set the name of the packaged configuration file
         String fileName = "/VloConfig";
         
-        config = VloConfig.readConfig (fileName);
+        VloConfig.readConfig (fileName);
         
-        return config;
+        // return config;
     }
     
@@ -149 +149 @@
      * @return the configuration 
      */
-    public static VloConfig readConfig(String fileName) {
+    public static void readConfig(String fileName) {
         
         // may it is safe to first expand the name a litte bit more
@@ -159 +159 @@
 
         // get the XML file configuration from the file by invoking ...
-        config = (VloConfig) read(fileName, config);
-
-        return config;
+        read(fileName, config);
     }
 
     /**
      * Read the configuration from an XML file. 
+     * 
+     * Move the following remarks to a general remark in the class description, 
+     * a remark indicating what you could do if you do not want to use the 
+     * packaged configuration.
      * 
      * Invoke this method instead of readConfig() if you want to change
@@ -177 +179 @@
      * container.
      *     
-     * @param fileName the name of the file to read the configuration from
-     *
-     * @return the configuration
-     */
-    public static VloConfig readTestConfig(String fileName) {
-
-        config = VloConfig.readConfig (fileName);
-        
-        // modify the configuration here
-
-        return config;
-    }
+     */
 
     /**