- Timestamp:
- 2009-09-16T13:30:51+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/cdm/ArgumentControl.java
r20455 r20608 164 164 // Now ensure we have the existing value or default value selected if either exist. 165 165 String existing_value = preset_value; 166 if (existing_value == null || existing_value. length() == 0) {166 if (existing_value == null || existing_value.equals("")) { 167 167 existing_value = argument.getValue(); 168 168 } 169 if (existing_value != null && existing_value.length() > 0) { 169 if (existing_value == null || existing_value.equals("")) { 170 // try default value 171 String default_value = argument.getDefaultValue(); 172 if (default_value != null) { 173 // if no namespace for default value, add ex. 174 // won't work if we want to set a non-metadata value 175 if (MetadataTools.getMetadataSetNamespace(default_value).equals("")) { 176 default_value = StaticStrings.EXTRACTED_NAMESPACE+default_value; 177 } 178 existing_value = default_value; 179 } 180 } 181 182 if (existing_value != null && !existing_value.equals("")) { 183 170 184 found = selectValue((JComboBox) value_control, existing_value); 171 185 // It's possible that this is a custom value and so doesn't exist in the combobox … … 174 188 ((JComboBox) value_control).addItem(existing_value); 175 189 ((JComboBox) value_control).setSelectedItem(existing_value); 176 }177 }178 else {179 String default_value = argument.getDefaultValue();180 if (default_value != null) {181 // if no namespace for default value, add ex.182 // won't work if we want to set a non-metadata value183 if (MetadataTools.getMetadataSetNamespace(default_value).equals("")) {184 default_value = StaticStrings.EXTRACTED_NAMESPACE+default_value;185 }186 selectValue((JComboBox) value_control, default_value);187 190 } 188 191 }
Note:
See TracChangeset
for help on using the changeset viewer.