Changeset 12572 for trunk/gli/src/org/greenstone/gatherer
- Timestamp:
- 2006-08-26T21:26:07+12:00 (18 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer/gems
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/gems/Attribute.java
r12564 r12572 46 46 public class Attribute 47 47 { 48 private String name ;49 private String value ;50 private String lang ;48 private String name=""; 49 private String value=""; 50 private String lang=""; 51 51 private boolean isRequired; 52 52 private boolean isLanguageDependent; -
trunk/gli/src/org/greenstone/gatherer/gems/DeleteMetadataSetPrompt.java
r12564 r12572 168 168 available_set_list.setListData(new Vector((Collection)available_metadata_sets)); 169 169 delete_button.setEnabled(false); 170 confirmation.setEnabled(false); 171 confirmation.setSelected(false); 170 172 setVisible(true); 171 173 … … 190 192 } 191 193 delete_button.setEnabled(false); 194 confirmation.setEnabled(false); 195 confirmation.setSelected(false); 192 196 self.dispose(); 193 197 } … … 232 236 private class MetadataSetListSelectionListener implements ListSelectionListener { 233 237 public void valueChanged(ListSelectionEvent lse){ 238 delete_button.setEnabled(false); 234 239 if (lse.getValueIsAdjusting()) return; 235 240 236 241 Object selectedValue = available_set_list.getSelectedValue(); 237 242 -
trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java
r12564 r12572 158 158 metadata_set_model = new MetadataSetModel(msm); 159 159 msm.setMetadataSetModel(metadata_set_model); 160 160 meta_set_tree = new MetadataSetTree(); 161 161 metadata_set_model.addObserver(meta_set_tree); 162 162 … … 173 173 msti.addMetadataSetListener((MetadataSetListener)meta_element_table); 174 174 msti.addMetadataSetListener((MetadataSetListener)lang_element_table); 175 msti.setMetadataSetModel( 175 msti.setMetadataSetModel(metadata_set_model); 176 176 177 177 open_prompt = new OpenMetadataSetPrompt(self,msm); … … 210 210 JPanel buttonPane = new JPanel(new GridLayout(1,2)); 211 211 212 JButton arrow_up_button = new GLIButton( );212 JButton arrow_up_button = new GLIButton(Dictionary.get("GEMS.Move_Up")); 213 213 arrow_up_button.setIcon(JarTools.getImage("arrow-up.gif")); 214 214 215 JButton arrow_down_button = new GLIButton( );215 JButton arrow_down_button = new GLIButton(Dictionary.get("GEMS.Move_Down")); 216 216 arrow_down_button.setIcon(JarTools.getImage("arrow-down.gif")); 217 217 … … 269 269 rightPane.add(tablePane,BorderLayout.NORTH); 270 270 rightPane.add(languageAttributePane,BorderLayout.CENTER); 271 272 273 getContentPane().add(leftPane,BorderLayout.WEST);274 getContentPane().add( rightPane,BorderLayout.CENTER);271 272 JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,leftPane,rightPane); 273 274 getContentPane().add(splitPane,BorderLayout.CENTER); 275 275 276 276 setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2); … … 409 409 file.setText(Dictionary.get("Menu.File")); 410 410 411 file_exit = new JMenuItem(Dictionary.get("Menu.File_ Exit"));411 file_exit = new JMenuItem(Dictionary.get("Menu.File_Close")); 412 412 file_exit.addActionListener(this); 413 413 -
trunk/gli/src/org/greenstone/gatherer/gems/LangDependElementTable.java
r12564 r12572 50 50 51 51 import javax.swing.JOptionPane; 52 import javax.swing.DefaultCellEditor; 53 import javax.swing.JTextField; 54 import javax.swing.ListSelectionModel; 52 55 53 56 import org.greenstone.gatherer.Dictionary; … … 69 72 70 73 private ArrayList listeners = new ArrayList(); 74 private JTextField metadata_value_text_field = new JTextField(); 71 75 72 76 public LangDependElementTable(){ … … 74 78 setRowHeight(20); 75 79 setAutoResizeMode(JTable.AUTO_RESIZE_OFF); 80 metadata_value_text_field.setBorder(null); 81 DefaultCellEditor cellEditor = new DefaultCellEditor(metadata_value_text_field); 82 cellEditor.setClickCountToStart(1); 83 setDefaultEditor(String.class,cellEditor); 76 84 table = this; 85 setSelectionMode(ListSelectionModel.SINGLE_SELECTION); 77 86 } 78 87 … … 89 98 public void languageSelected(String lang){ 90 99 if (state == DISPLAY_ELEMENT){ 91 MetadataElementTableModel model = (MetadataElementTableModel)getModel(); 92 model.addNewLanguage(lang); 100 AbstractTableModel model = (AbstractTableModel)getModel(); 101 if (model instanceof MetadataElementTableModel){ 102 MetadataElementTableModel ml = (MetadataElementTableModel)getModel(); 103 ml.addNewLanguage(lang); 104 } 93 105 } 94 106 else{ 95 MetadataSetInfoTableModel model = (MetadataSetInfoTableModel)getModel(); 96 model.addNewLanguage(lang); 107 AbstractTableModel model = (AbstractTableModel)getModel(); 108 if (model instanceof MetadataSetInfoTableModel){ 109 MetadataSetInfoTableModel ml = (MetadataSetInfoTableModel)getModel(); 110 ml.addNewLanguage(lang); 111 } 97 112 } 98 113 } … … 101 116 102 117 private void deleteAttribute(){ 103 118 int index = getSelectedRow(); 104 119 105 120 if (state == DISPLAY_ELEMENT){ 106 MetadataElementTableModel model = (MetadataElementTableModel)getModel();121 MetadataElementTableModel model = (MetadataElementTableModel)getModel(); 107 122 model.deleteRow(index); 108 123 } 109 124 else{ 110 111 125 MetadataSetInfoTableModel model = (MetadataSetInfoTableModel)getModel(); 112 126 model.deleteRow(index); … … 141 155 getColumnModel().getColumn(0).setPreferredWidth(100); 142 156 getColumnModel().getColumn(1).setPreferredWidth(50); 143 getColumnModel().getColumn(2).setPreferredWidth(3 90);157 getColumnModel().getColumn(2).setPreferredWidth(365); 144 158 } 145 159 … … 151 165 getColumnModel().getColumn(0).setPreferredWidth(100); 152 166 getColumnModel().getColumn(1).setPreferredWidth(50); 153 getColumnModel().getColumn(2).setPreferredWidth(3 90);167 getColumnModel().getColumn(2).setPreferredWidth(365); 154 168 } 155 169 … … 237 251 public void addNewLanguage(String lang){ 238 252 int index =element_model.languageExist(lang); 239 if (index > 253 if (index >=0){ 240 254 table.getSelectionModel().setSelectionInterval(index,index); 241 255 Rectangle rect = table.getCellRect(index, 0, true); … … 360 374 public void addNewLanguage(String lang){ 361 375 int index = metadata_info.languageExist(lang); 362 if (index > 376 if (index >=0){ 363 377 table.getSelectionModel().setSelectionInterval(index,index); 364 378 Rectangle rect = table.getCellRect(index, 0, true); -
trunk/gli/src/org/greenstone/gatherer/gems/MetadataElementModel.java
r12564 r12572 259 259 for(int i=0;i<langDependAttributes.size();i++){ 260 260 Attribute attr = (Attribute) langDependAttributes.get(i); 261 if (attr.getLanguage().trim().equals(lang )){261 if (attr.getLanguage().trim().equals(lang.trim())){ 262 262 return i; 263 263 } … … 325 325 for(int i=0;i<attributes.size();i++){ 326 326 Attribute attr = (Attribute)attributes.get(i); 327 if (attr.getName() == null || attr.getName().trim().equals("")) continue; 327 328 Element attrElement = doc.createElement(GEMSConstants.ATTRIBUTE_ELEMENT); 328 329 attrElement.setAttribute(GEMSConstants.NAME_ATTRIBUTE,attr.getName()); -
trunk/gli/src/org/greenstone/gatherer/gems/MetadataElementTable.java
r12564 r12572 53 53 import java.awt.Color; 54 54 55 import javax.swing.DefaultCellEditor; 56 import javax.swing.JTextField; 57 import javax.swing.ListSelectionModel; 55 58 import org.greenstone.gatherer.Dictionary; 56 59 … … 70 73 71 74 private ArrayList listeners = new ArrayList(); 75 private JTextField metadata_value_text_field = new JTextField(); 72 76 73 77 public MetadataElementTable(){ … … 75 79 setRowHeight(20); 76 80 setAutoResizeMode(JTable.AUTO_RESIZE_OFF); 77 81 82 metadata_value_text_field.setBorder(null); 83 DefaultCellEditor cellEditor = new DefaultCellEditor(metadata_value_text_field); 84 cellEditor.setClickCountToStart(1); 85 setDefaultEditor(String.class,cellEditor); 78 86 table = this; 79 87 setSelectionMode(ListSelectionModel.SINGLE_SELECTION); 80 88 } 81 89 … … 145 153 setModel(table_model); 146 154 getColumnModel().getColumn(0).setPreferredWidth(100); 147 getColumnModel().getColumn(1).setPreferredWidth(50); 148 getColumnModel().getColumn(2).setPreferredWidth(390); 155 getColumnModel().getColumn(1).setPreferredWidth(415); 149 156 } 150 157 … … 155 162 setModel(model); 156 163 getColumnModel().getColumn(0).setPreferredWidth(100); 157 getColumnModel().getColumn(1).setPreferredWidth(4 40);164 getColumnModel().getColumn(1).setPreferredWidth(415); 158 165 } 159 166 … … 181 188 MetadataElementModel element_model; 182 189 ArrayList attributes; 183 String[] columnNames= new String[]{"name"," lang","value"};190 String[] columnNames= new String[]{"name","value"}; 184 191 185 192 … … 217 224 public Object getValueAt(int row, int column){ 218 225 if (row == 0 && column == 0 ) return "<html><body Color=blue>name</body></html>"; 219 if (row == 0 && column == 1 ) return ""; 220 if (row == 0 && column == 2 ) return element_model.getName(); 226 if (row == 0 && column == 1 ) return element_model.getName(); 221 227 if (row <= attributes.size() && attributes.size()>0){ 222 228 Attribute attr = (Attribute)attributes.get(row-1); 223 229 if (column == 0) return attr.getName(); 224 if (column == 1) return attr.getLanguage(); 225 if (column == 2) return attr.getValue(); 230 if (column == 1) return attr.getValue(); 226 231 } 227 232 return null; … … 230 235 public void setValueAt(Object value, int row, int column){ 231 236 // update the element name on tree 232 if (row == 0 && column == 2) {237 if (row == 0 && column == 1) { 233 238 if (((String)value).trim().equals("")){ 234 239 JOptionPane.showMessageDialog(null,Dictionary.get("GEMS.Attribute_Edition_Error_Message"), Dictionary.get("GEMS.Attribute_Edition_Error"),JOptionPane.ERROR_MESSAGE); … … 247 252 248 253 if (column == 0) attr.setName((String)value); 249 if (column == 1) attr.setLanguage((String)value); 250 if (column == 2) attr.setValue((String)value); 254 if (column == 1) attr.setValue((String)value); 251 255 notifyListeners(attr); 252 256 } … … 343 347 } 344 348 349 if (column == 0 && ((String)value).trim().equals("") && !attr.getName().trim().equals("")){ 350 JOptionPane.showMessageDialog(null,Dictionary.get("GEMS.Attribute_Name_Error_Message"), Dictionary.get("GEMS.Attribute_Name_Error"),JOptionPane.ERROR_MESSAGE); 351 return; 352 } 353 345 354 //check namespace conflict 346 if (column ==1 && attr.getName().trim().equals(GEMSConstants.NAMESPACE_ATTRIBUTE) && metadata_info.checkNamespace(((String)value).trim())) 355 if (column == 1 356 && !((String)value).trim().equals(attr.getValue().trim()) 357 && attr.getName().trim().equals(GEMSConstants.NAMESPACE_ATTRIBUTE) 358 && metadata_info.checkNamespace(((String)value).trim())) 347 359 { 348 360 -
trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetInfo.java
r12564 r12572 128 128 for(int i=0;i<attributes.size();i++){ 129 129 Attribute attr = (Attribute) attributes.get(i); 130 if (attr.getName() .trim().equals(name.trim())){130 if (attr.getName() != null && attr.getName().trim().equals(name.trim())){ 131 131 return attr; 132 132 } … … 255 255 for(int i=0;i<langDependAttributes.size();i++){ 256 256 Attribute attr = (Attribute) langDependAttributes.get(i); 257 if (attr.getLanguage() .trim().equals(lang)){257 if (attr.getLanguage() !=null && attr.getLanguage().trim().equals(lang.trim())){ 258 258 return i; 259 259 } … … 318 318 public void deleteMetadataSet(){ 319 319 metadata_model.getMetadataSetManager().deleteMetadataSet(this); 320 if (metadata_model.getMetadataSetInfo().getFilePath().equals(this.getFilePath())){ 320 321 if (metadata_model.getMetadataSetInfo() != null 322 && metadata_model.getMetadataSetInfo().getFilePath().equals(this.getFilePath())){ 321 323 metadata_model.metadataSetDeleted(); 322 324 MetadataSetEvent mse = new MetadataSetEvent(null); … … 360 362 for (int i=0;i<attributes.size();i++){ 361 363 Attribute attr = (Attribute)attributes.get(i); 364 if (attr.getName() == null || attr.getName().trim().equals("")) continue; 362 365 doc_element.setAttribute(attr.getName(),attr.getValue()); 363 364 366 } 365 367 -
trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java
r12564 r12572 147 147 if (file_path !=null) save(file_path); 148 148 149 mds_list.add(meta_info); 149 for(int i=0;i<mds_list.size();i++){ 150 MetadataSetInfo infoItem = (MetadataSetInfo)mds_list.get(i); 151 if (infoItem.getFilePath().trim().equals(meta_info.getFilePath().trim())) { 152 mds_list.remove(infoItem); 153 mds_list.add(meta_info); 154 break; 155 } 156 } 157 158 150 159 } 151 160 … … 244 253 JOptionPane.showMessageDialog(null,Dictionary.get("GEMS.File_Deletion_Error_Message"), Dictionary.get("GEMS..File_Deletion_Error"),JOptionPane.ERROR_MESSAGE); 245 254 } 255 else{ 256 for(int i=0;i<mds_list.size();i++){ 257 MetadataSetInfo infoItem = (MetadataSetInfo)mds_list.get(i); 258 if (infoItem.getFilePath().trim().equals(info.getFilePath().trim())) { 259 mds_list.remove(infoItem); 260 break; 261 } 262 } 263 } 246 264 } 247 265 }
Note:
See TracChangeset
for help on using the changeset viewer.