Changeset 33077

Timestamp:

2019-05-14T16:09:15+12:00 (5 years ago)

Author:

kjdon

Message:

added some more methods to do with default values - want to be able to get out default values from the params class.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java

@@ -20 +20 @@
 
 import java.util.HashMap;
+import java.util.ArrayList;
 
 import org.apache.log4j.Logger;
@@ -93 +94 @@
   protected HashMap<String, Param> service_param_map = null;
 
+    protected ArrayList<String> params_with_default_list = null;
+
     public GSParams()
     {
         this.param_map = new HashMap<String, Param>(30);
         this.service_param_map =  new HashMap<String, Param>(30);
+        this.params_with_default_list = new ArrayList<String>(10);
 
         // we now only need to add in the ones that need saving, as we will default to "not save"
@@ -115 +119 @@
     }
 
-  public boolean addParameter(String name, boolean save, boolean sensitive) {
+    public boolean addParameter(String name, boolean save, boolean sensitive) {
         if (this.param_map.containsKey(name))
         {
@@ -133 +137 @@
 
         this.param_map.put(name, new Param(default_value, save));
+        if (default_value != null && !default_value.equals("")) {
+            this.params_with_default_list.add(name);
+        }
         return true;
     }
@@ -149 +156 @@
     {
         Param p = this.param_map.get(name);
-        if (p == null)
-            return false;
-        p.default_value = default_value;
+        if (p == null) {
+            addParameter(name, default_value, true);
+        }else {
+            p.default_value = default_value;
+        }
+        if (!this.params_with_default_list.contains(name)) {
+            this.params_with_default_list.add(name);
+        }
         return true;
     }
 
+    public String getParamDefault(String name) {
+    Param p = this.param_map.get(name);
+    if (p==null) {
+        return null;
+    }
+    return p.default_value;
+    
+    }
     public boolean shouldSave(String name)
     {
@@ -188 +208 @@
   }
 
+    public ArrayList<String> getParamsWithDefaults() {
+    return (ArrayList<String> )this.params_with_default_list.clone();
+    }
+    
   private class Param
     {