Changeset 8216
- Timestamp:
- 2004-10-04T17:13:59+13:00 (20 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/gui/MetadataImportMappingPrompt.java
r8132 r8216 23 23 24 24 private int result; 25 private String metadata_element_name = null;25 private String metadata_element_name_full = null; 26 26 private GComboBox metadata_sets_combobox = null; 27 27 private GComboBox metadata_elements_combobox = null; … … 32 32 33 33 34 public MetadataImportMappingPrompt(String metadata_element_name )34 public MetadataImportMappingPrompt(String metadata_element_name_full) 35 35 { 36 this.metadata_element_name = metadata_element_name;36 this.metadata_element_name_full = metadata_element_name_full; 37 37 38 38 // Construction and configuration … … 87 87 JPanel right_pane = new JPanel(); 88 88 right_pane.setLayout(new GridLayout(3,1)); 89 right_pane.add(new JLabel(metadata_element_name ));89 right_pane.add(new JLabel(metadata_element_name_full)); 90 90 right_pane.add(metadata_sets_combobox); 91 91 right_pane.add(metadata_elements_combobox); … … 175 175 { 176 176 boolean enable_add_button = true; 177 String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full); 177 178 178 179 MetadataSet metadata_set = (MetadataSet) metadata_sets_combobox.getSelectedItem(); 179 180 ArrayList metadata_elements = metadata_set.getMetadataSetElements(); 181 180 182 metadata_elements_combobox.removeAllItems(); 181 183 for (int i = 0; i < metadata_elements.size(); i++) { -
trunk/gli/src/org/greenstone/gatherer/metadata/MetadataSetManager.java
r8165 r8216 145 145 146 146 147 static public String mapUnloadedMetadataElement(String metadata_element_name )147 static public String mapUnloadedMetadataElement(String metadata_element_name_full) 148 148 { 149 149 // Check if we have an import mapping for this metadata element 150 String target_metadata_element_name_full = ProfileXMLFileManager.getMetadataElementFor(metadata_element_name );150 String target_metadata_element_name_full = ProfileXMLFileManager.getMetadataElementFor(metadata_element_name_full); 151 151 if (target_metadata_element_name_full != null) { 152 152 // Yes, so return it … … 160 160 161 161 // Ask the user how they want to deal with this element 162 MetadataImportMappingPrompt metadata_import_mapping_prompt = new MetadataImportMappingPrompt(metadata_element_name );162 MetadataImportMappingPrompt metadata_import_mapping_prompt = new MetadataImportMappingPrompt(metadata_element_name_full); 163 163 int result = metadata_import_mapping_prompt.getResult(); 164 164 … … 166 166 if (result == MetadataImportMappingPrompt.ADD_BUTTON_PRESSED) { 167 167 MetadataSet target_metadata_set = metadata_import_mapping_prompt.getSelectedMetadataSet(); 168 String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full); 168 169 target_metadata_set.addMetadataElementForThisSession(metadata_element_name); 169 170 target_metadata_element_name_full = target_metadata_set.getNamespace() + "." + metadata_element_name; … … 182 183 183 184 // Store this import mapping for future elements with the same name 184 ProfileXMLFileManager.mapElement(metadata_element_name , target_metadata_element_name_full);185 ProfileXMLFileManager.mapElement(metadata_element_name_full, target_metadata_element_name_full); 185 186 186 187 return target_metadata_element_name_full;
Note:
See TracChangeset
for help on using the changeset viewer.