Changeset 33077 for main/trunk
- Timestamp:
- 2019-05-14T16:09:15+12:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSParams.java
r33039 r33077 20 20 21 21 import java.util.HashMap; 22 import java.util.ArrayList; 22 23 23 24 import org.apache.log4j.Logger; … … 93 94 protected HashMap<String, Param> service_param_map = null; 94 95 96 protected ArrayList<String> params_with_default_list = null; 97 95 98 public GSParams() 96 99 { 97 100 this.param_map = new HashMap<String, Param>(30); 98 101 this.service_param_map = new HashMap<String, Param>(30); 102 this.params_with_default_list = new ArrayList<String>(10); 99 103 100 104 // we now only need to add in the ones that need saving, as we will default to "not save" … … 115 119 } 116 120 117 public boolean addParameter(String name, boolean save, boolean sensitive) {121 public boolean addParameter(String name, boolean save, boolean sensitive) { 118 122 if (this.param_map.containsKey(name)) 119 123 { … … 133 137 134 138 this.param_map.put(name, new Param(default_value, save)); 139 if (default_value != null && !default_value.equals("")) { 140 this.params_with_default_list.add(name); 141 } 135 142 return true; 136 143 } … … 149 156 { 150 157 Param p = this.param_map.get(name); 151 if (p == null) 152 return false; 153 p.default_value = default_value; 158 if (p == null) { 159 addParameter(name, default_value, true); 160 }else { 161 p.default_value = default_value; 162 } 163 if (!this.params_with_default_list.contains(name)) { 164 this.params_with_default_list.add(name); 165 } 154 166 return true; 155 167 } 156 168 169 public String getParamDefault(String name) { 170 Param p = this.param_map.get(name); 171 if (p==null) { 172 return null; 173 } 174 return p.default_value; 175 176 } 157 177 public boolean shouldSave(String name) 158 178 { … … 188 208 } 189 209 210 public ArrayList<String> getParamsWithDefaults() { 211 return (ArrayList<String> )this.params_with_default_list.clone(); 212 } 213 190 214 private class Param 191 215 {
Note:
See TracChangeset
for help on using the changeset viewer.