Changeset 12572

Timestamp:

2006-08-26T21:26:07+12:00 (18 years ago)

Author:

shaoqun

Message:

fixed bugs of the last commit

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• Attribute.java (modified) (1 diff)
• DeleteMetadataSetPrompt.java (modified) (3 diffs)
• GEMS.java (modified) (5 diffs)
• LangDependElementTable.java (modified) (9 diffs)
• MetadataElementModel.java (modified) (2 diffs)
• MetadataElementTable.java (modified) (10 diffs)
• MetadataSetInfo.java (modified) (4 diffs)
• MetadataSetManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/Attribute.java

@@ -46 +46 @@
 public class Attribute
   {
-      private String name;
-      private String value;
-      private String lang;
+      private String name="";
+      private String value="";
+      private String lang="";
       private boolean isRequired;
       private boolean isLanguageDependent;

trunk/gli/src/org/greenstone/gatherer/gems/DeleteMetadataSetPrompt.java

@@ -168 +168 @@
     available_set_list.setListData(new Vector((Collection)available_metadata_sets));
     delete_button.setEnabled(false);
+    confirmation.setEnabled(false);
+    confirmation.setSelected(false);
         setVisible(true); 
         
@@ -190 +192 @@
         }
         delete_button.setEnabled(false);
+        confirmation.setEnabled(false);
+        confirmation.setSelected(false);
         self.dispose();
     }
@@ -232 +236 @@
     private class MetadataSetListSelectionListener implements ListSelectionListener  {
         public void valueChanged(ListSelectionEvent lse){
+         delete_button.setEnabled(false);
         if (lse.getValueIsAdjusting()) return;
-
+       
         Object selectedValue = available_set_list.getSelectedValue();
 

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -158 +158 @@
         metadata_set_model = new MetadataSetModel(msm);
         msm.setMetadataSetModel(metadata_set_model);
-        meta_set_tree = new MetadataSetTree();
+    meta_set_tree = new MetadataSetTree();
         metadata_set_model.addObserver(meta_set_tree);
 
@@ -173 +173 @@
         msti.addMetadataSetListener((MetadataSetListener)meta_element_table);
         msti.addMetadataSetListener((MetadataSetListener)lang_element_table);
-        msti.setMetadataSetModel( metadata_set_model);
+        msti.setMetadataSetModel(metadata_set_model);
         
         open_prompt = new OpenMetadataSetPrompt(self,msm);
@@ -210 +210 @@
         JPanel buttonPane = new JPanel(new GridLayout(1,2));
         
-        JButton arrow_up_button = new GLIButton();
+        JButton arrow_up_button = new GLIButton(Dictionary.get("GEMS.Move_Up"));
     arrow_up_button.setIcon(JarTools.getImage("arrow-up.gif"));
 
-        JButton arrow_down_button = new GLIButton();
+        JButton arrow_down_button = new GLIButton(Dictionary.get("GEMS.Move_Down"));
     arrow_down_button.setIcon(JarTools.getImage("arrow-down.gif")); 
         
@@ -269 +269 @@
     rightPane.add(tablePane,BorderLayout.NORTH);  
         rightPane.add(languageAttributePane,BorderLayout.CENTER); 
-    
-                         
-        getContentPane().add(leftPane,BorderLayout.WEST);                 
-    getContentPane().add(rightPane,BorderLayout.CENTER);
+
+    JSplitPane splitPane =  new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,leftPane,rightPane);     
+                                    
+    getContentPane().add(splitPane,BorderLayout.CENTER);
 
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
@@ -409 +409 @@
         file.setText(Dictionary.get("Menu.File"));
         
-        file_exit = new JMenuItem(Dictionary.get("Menu.File_Exit"));
+        file_exit = new JMenuItem(Dictionary.get("Menu.File_Close"));
         file_exit.addActionListener(this);
         

trunk/gli/src/org/greenstone/gatherer/gems/LangDependElementTable.java

@@ -50 +50 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
 
 import org.greenstone.gatherer.Dictionary;
@@ -69 +72 @@
 
     private ArrayList listeners = new ArrayList();
+    private JTextField metadata_value_text_field = new JTextField();
 
     public LangDependElementTable(){
@@ -74 +78 @@
         setRowHeight(20);
         setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+    metadata_value_text_field.setBorder(null);
+    DefaultCellEditor cellEditor = new DefaultCellEditor(metadata_value_text_field);
+    cellEditor.setClickCountToStart(1);
+    setDefaultEditor(String.class,cellEditor);
         table = this;
+    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     }
     
@@ -89 +98 @@
     public void languageSelected(String lang){
     if (state == DISPLAY_ELEMENT){
-        MetadataElementTableModel model = (MetadataElementTableModel)getModel();
-            model.addNewLanguage(lang);
+        AbstractTableModel model = (AbstractTableModel)getModel();
+        if (model instanceof MetadataElementTableModel){
+        MetadataElementTableModel ml = (MetadataElementTableModel)getModel();
+        ml.addNewLanguage(lang);
+        }
     }                           
     else{
-        MetadataSetInfoTableModel model = (MetadataSetInfoTableModel)getModel();
-        model.addNewLanguage(lang);
+        AbstractTableModel model = (AbstractTableModel)getModel();
+        if (model instanceof MetadataSetInfoTableModel){
+        MetadataSetInfoTableModel ml = (MetadataSetInfoTableModel)getModel();
+        ml.addNewLanguage(lang);
+        }
     }
     }
@@ -101 +116 @@
   
     private void deleteAttribute(){
-            int index = getSelectedRow();     
+    int index = getSelectedRow();     
 
     if (state == DISPLAY_ELEMENT){
-        MetadataElementTableModel model = (MetadataElementTableModel)getModel();
+        MetadataElementTableModel  model = (MetadataElementTableModel)getModel();
         model.deleteRow(index);
     }                           
     else{
-        
         MetadataSetInfoTableModel model = (MetadataSetInfoTableModel)getModel();
         model.deleteRow(index);  
@@ -141 +155 @@
     getColumnModel().getColumn(0).setPreferredWidth(100);
         getColumnModel().getColumn(1).setPreferredWidth(50);
-    getColumnModel().getColumn(2).setPreferredWidth(390);
+    getColumnModel().getColumn(2).setPreferredWidth(365);
     }
       
@@ -151 +165 @@
     getColumnModel().getColumn(0).setPreferredWidth(100);
     getColumnModel().getColumn(1).setPreferredWidth(50);
-        getColumnModel().getColumn(2).setPreferredWidth(390);         
+        getColumnModel().getColumn(2).setPreferredWidth(365);         
     } 
 
@@ -237 +251 @@
     public void addNewLanguage(String lang){
         int index =element_model.languageExist(lang);  
-        if (index > 0){
+        if (index >=0){
         table.getSelectionModel().setSelectionInterval(index,index);
         Rectangle rect = table.getCellRect(index, 0, true);
@@ -360 +374 @@
         public void addNewLanguage(String lang){
         int index =  metadata_info.languageExist(lang);  
-        if (index > 0){
+        if (index >=0){
         table.getSelectionModel().setSelectionInterval(index,index);     
         Rectangle rect = table.getCellRect(index, 0, true);

trunk/gli/src/org/greenstone/gatherer/gems/MetadataElementModel.java

@@ -259 +259 @@
       for(int i=0;i<langDependAttributes.size();i++){
           Attribute attr = (Attribute) langDependAttributes.get(i);
-          if (attr.getLanguage().trim().equals(lang)){
+          if (attr.getLanguage().trim().equals(lang.trim())){
           return i;
           } 
@@ -325 +325 @@
           for(int i=0;i<attributes.size();i++){
           Attribute attr = (Attribute)attributes.get(i);
+          if (attr.getName() == null || attr.getName().trim().equals("")) continue;
           Element attrElement =  doc.createElement(GEMSConstants.ATTRIBUTE_ELEMENT);
           attrElement.setAttribute(GEMSConstants.NAME_ATTRIBUTE,attr.getName());

trunk/gli/src/org/greenstone/gatherer/gems/MetadataElementTable.java

@@ -53 +53 @@
 import java.awt.Color;
 
+import javax.swing.DefaultCellEditor;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
 import org.greenstone.gatherer.Dictionary;
 
@@ -70 +73 @@
 
     private ArrayList listeners = new ArrayList();
+    private JTextField metadata_value_text_field = new JTextField();
 
     public MetadataElementTable(){
@@ -75 +79 @@
         setRowHeight(20);
         setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-       
+
+        metadata_value_text_field.setBorder(null);
+    DefaultCellEditor cellEditor = new DefaultCellEditor(metadata_value_text_field);
+    cellEditor.setClickCountToStart(1);
+    setDefaultEditor(String.class,cellEditor);   
         table = this;
-    
+    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
       }
 
@@ -145 +153 @@
         setModel(table_model);
     getColumnModel().getColumn(0).setPreferredWidth(100);
-        getColumnModel().getColumn(1).setPreferredWidth(50);
-        getColumnModel().getColumn(2).setPreferredWidth(390);
+        getColumnModel().getColumn(1).setPreferredWidth(415);
     }
       
@@ -155 +162 @@
     setModel(model);
     getColumnModel().getColumn(0).setPreferredWidth(100);
-        getColumnModel().getColumn(1).setPreferredWidth(440);         
+        getColumnModel().getColumn(1).setPreferredWidth(415);         
     } 
 
@@ -181 +188 @@
     MetadataElementModel element_model;
         ArrayList attributes;
-    String[] columnNames= new String[]{"name","lang","value"};    
+    String[] columnNames= new String[]{"name","value"};    
 
     
@@ -217 +224 @@
     public  Object getValueAt(int row, int column){
         if (row == 0 && column == 0 ) return "<html><body Color=blue>name</body></html>";
-            if (row == 0 && column == 1 ) return "";
-        if (row == 0 && column == 2 ) return element_model.getName();
+            if (row == 0 && column == 1 ) return element_model.getName();
         if (row <= attributes.size() && attributes.size()>0){
         Attribute attr = (Attribute)attributes.get(row-1);
         if (column == 0) return attr.getName();
-        if (column == 1) return attr.getLanguage();
-                if (column == 2) return attr.getValue();
+        if (column == 1) return attr.getValue();
         }
         return null;                
@@ -230 +235 @@
         public void setValueAt(Object value, int row, int column){    
         // update the element name on tree
-         if (row == 0 && column == 2) {
+         if (row == 0 && column == 1) {
          if (((String)value).trim().equals("")){
              JOptionPane.showMessageDialog(null,Dictionary.get("GEMS.Attribute_Edition_Error_Message"), Dictionary.get("GEMS.Attribute_Edition_Error"),JOptionPane.ERROR_MESSAGE);
@@ -247 +252 @@
 
         if (column == 0) attr.setName((String)value);
-        if (column == 1) attr.setLanguage((String)value);
-                if (column == 2) attr.setValue((String)value);
+                if (column == 1) attr.setValue((String)value);
         notifyListeners(attr);
         }
@@ -343 +347 @@
         }
 
+            if (column == 0 && ((String)value).trim().equals("") && !attr.getName().trim().equals("")){
+            JOptionPane.showMessageDialog(null,Dictionary.get("GEMS.Attribute_Name_Error_Message"), Dictionary.get("GEMS.Attribute_Name_Error"),JOptionPane.ERROR_MESSAGE);
+            return; 
+        }
+
         //check namespace conflict
-        if (column ==1 && attr.getName().trim().equals(GEMSConstants.NAMESPACE_ATTRIBUTE) && metadata_info.checkNamespace(((String)value).trim()))
+        if (column == 1
+            && !((String)value).trim().equals(attr.getValue().trim())
+                     && attr.getName().trim().equals(GEMSConstants.NAMESPACE_ATTRIBUTE)
+                     && metadata_info.checkNamespace(((String)value).trim()))
         {
             

trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetInfo.java

@@ -128 +128 @@
         for(int i=0;i<attributes.size();i++){
         Attribute attr = (Attribute) attributes.get(i);
-            if (attr.getName().trim().equals(name.trim())){
+            if (attr.getName() != null && attr.getName().trim().equals(name.trim())){
         return attr;
         } 
@@ -255 +255 @@
       for(int i=0;i<langDependAttributes.size();i++){
           Attribute attr = (Attribute) langDependAttributes.get(i);
-          if (attr.getLanguage().trim().equals(lang)){
+          if (attr.getLanguage() !=null && attr.getLanguage().trim().equals(lang.trim())){
           return i;
           } 
@@ -318 +318 @@
     public void deleteMetadataSet(){
     metadata_model.getMetadataSetManager().deleteMetadataSet(this);
-        if (metadata_model.getMetadataSetInfo().getFilePath().equals(this.getFilePath())){
+
+        if (metadata_model.getMetadataSetInfo() != null 
+        && metadata_model.getMetadataSetInfo().getFilePath().equals(this.getFilePath())){
         metadata_model.metadataSetDeleted();
         MetadataSetEvent mse = new MetadataSetEvent(null);
@@ -360 +362 @@
     for (int i=0;i<attributes.size();i++){
         Attribute attr = (Attribute)attributes.get(i);
+        if (attr.getName() == null || attr.getName().trim().equals("")) continue;
             doc_element.setAttribute(attr.getName(),attr.getValue());
-
     }
 

trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java

@@ -147 +147 @@
     if (file_path !=null) save(file_path);
 
-    mds_list.add(meta_info); 
+    for(int i=0;i<mds_list.size();i++){
+        MetadataSetInfo infoItem = (MetadataSetInfo)mds_list.get(i);
+        if (infoItem.getFilePath().trim().equals(meta_info.getFilePath().trim())) {
+        mds_list.remove(infoItem);
+        mds_list.add(meta_info); 
+        break;
+        }       
+    }
+
+
     }
 
@@ -244 +253 @@
             JOptionPane.showMessageDialog(null,Dictionary.get("GEMS.File_Deletion_Error_Message"), Dictionary.get("GEMS..File_Deletion_Error"),JOptionPane.ERROR_MESSAGE);
       }
+      else{
+            for(int i=0;i<mds_list.size();i++){
+            MetadataSetInfo infoItem = (MetadataSetInfo)mds_list.get(i);
+            if (infoItem.getFilePath().trim().equals(info.getFilePath().trim())) {
+            mds_list.remove(infoItem);
+            break;
+            }       
+        }
+      }
     }
     }