Changeset 1649

Timestamp:

12/09/11 20:37:32 (13 years ago)

Author:

vronk

Message:

correcting config-loading / -usage

Location:

MDUTILS/src/eu/clarin/cmdi/mdservice/internal

Files:

• MDTransformer.java (modified) (1 diff)
• Utils.java (modified) (2 diffs)

MDUTILS/src/eu/clarin/cmdi/mdservice/internal/MDTransformer.java

@@ -101 +101 @@
 
         public Properties getConfig(){
-                if (config == null){
-                         return Utils.getConfig();
+                if (config == null){ // shouldn't happen  - config should be set by the calling app.
+                                                        // if not - try to use the default config 
+                         return Utils.getAppConfig("");
                 }
                 return config;

MDUTILS/src/eu/clarin/cmdi/mdservice/internal/Utils.java

@@ -129 +129 @@
          */
         //obsolete
-        public static Properties getConfig() {
+        /*
+         * public static Properties getConfig() {
+         
                 if (config==null)  {
                         loadConfig(config_path);
@@ -135 +137 @@
                 return config;
         }
+        */
+        /**
+         * Returns the properties loaded from the configuration, 
+         * the parameter allows to distinguish which application's properties to get
+         * if parameter="" first properties-object will be delivered
+         * if no config-properties are loaded null is returned.  
+         */
         public static Properties getAppConfig(String appname){
-                return config_hashtable.get(appname);
+                Properties ret_prop = null;
+                if (config_hashtable.size() > 0)
+                {
+                        if (appname.equals("")) {
+                                //if no appname specified return the first Properties element available. 
+                                ret_prop = config_hashtable.elements().nextElement();
+                        } else {
+                                ret_prop = config_hashtable.get(appname);
+                        }
+                }
+                
+                return ret_prop;
         }
 /**