Changeset 12666

Timestamp:

2006-09-05T11:44:32+12:00 (18 years ago)

Author:

kjdon

Message:

changed confirm save dialog, added a default file name to save file chooser, some coding style changes, variables renamed

File:

• trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetManager.java (modified) (18 diffs)

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

@@ -64 +64 @@
     private ArrayList mds_list = new ArrayList();                      
     
-    static public Configuration config = null; 
-    
     private MetadataSetModel metadata_set_model;
 
@@ -84 +82 @@
         }
 
-    config = new Configuration(gli_user_directory_path, gsdl_path, null, null, null);         
-        
-        current_language = config.getLanguage(); 
+    new Configuration(gli_user_directory_path, gsdl_path, null, null, null);         
+    current_language = Configuration.getLanguage(); 
 
         languageList = new ArrayList();
@@ -108 +105 @@
 
     public boolean isAttributeRequired(String name){
-    for(int i=0;i<GEMSConstants.REQUIRED_ATTRIBUTES.length;i++){
-            String reName = GEMSConstants.REQUIRED_ATTRIBUTES[i];
-        if (reName.equals(name.trim())) return true; 
-    }
-
+    String tmp_name = name.trim();
+    for(int i=0;i<GEMSConstants.SET_REQUIRED_ATTRIBUTES.length;i++){
+            if (tmp_name.equals(GEMSConstants.SET_REQUIRED_ATTRIBUTES[i])) return true;
+    }
     return false;
     }
@@ -123 +119 @@
     if (confirm){
 
-        int result = JOptionPane.showOptionDialog(null, Dictionary.get("GEMS.Confirm_Save"),Dictionary.get("GEMS.Confirm_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE,null,GEMSConstants.DIALOG_OPTIONS,GEMSConstants.DIALOG_OPTIONS[0]);
-        
-        if (result !=JOptionPane.OK_OPTION) return;
+        //int result = JOptionPane.showOptionDialog(null, Dictionary.get("GEMS.Confirm_Save"), Dictionary.get("GEMS.Confirm_Save_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE,null,Dictionary.get("General.No"),Dictionary.get("General.No"));
+        int result = JOptionPane.showConfirmDialog(null, Dictionary.get("GEMS.Confirm_Save"), Dictionary.get("GEMS.Confirm_Save_Title"), JOptionPane.YES_NO_OPTION);
+        if (result != JOptionPane.YES_OPTION) return;
     }
     
@@ -134 +130 @@
         JFileChooser file_chooser =  new JFileChooser(new File(getGLIMetadataDirectoryPath()));
         file_chooser.setMultiSelectionEnabled(false);
+        file_chooser.setSelectedFile(new File(getGLIMetadataDirectoryPath(), meta_info.getNamespace()+GEMSConstants.METADATA_SET_FILE_EXTENSION));
         int result = file_chooser.showSaveDialog(null);
         if (result == JFileChooser.APPROVE_OPTION){
@@ -141 +138 @@
         } 
     }
-    else{
+    else {
         file_path = new File(meta_info.getFilePath());
     }
 
-    if (file_path !=null) save(file_path);
+    if (file_path != null) save(file_path);
 
     for(int i=0;i<mds_list.size();i++){
@@ -155 +152 @@
         }       
     }
-
+    return;
 
     }
@@ -198 +195 @@
         File child_file = directory_files[i];
                
-            if (!child_file.isDirectory() && child_file.getName().endsWith(".mds")) {
+            if (!child_file.isDirectory() && child_file.getName().endsWith(GEMSConstants.METADATA_SET_FILE_EXTENSION)) {
                    Document document = XMLTools.parseXMLFile(child_file.toString(), true);
                    MetadataSetInfo info = constructMetadataInfo(document);
@@ -210 +207 @@
     }
 
-    public boolean checkNamespace(String namespace){
+    public boolean isNamespaceAlreadyUsed(String namespace){
     for(int i=0;i<mds_list.size();i++){
         MetadataSetInfo info = (MetadataSetInfo)mds_list.get(i);
@@ -219 +216 @@
 
     public MetadataSetInfo getMetadataSet(String metadata_path){
-    MetadataSetInfo info =   constructMetadataInfo(XMLTools.parseXMLFile(metadata_path,true));
-
-    // check whether there is metadata set name for the current langauge
+    MetadataSetInfo info = constructMetadataInfo(XMLTools.parseXMLFile(metadata_path,true));
+
+    // check whether there is metadata set name for the current language
     // if not reset the current_language to the language first encountered
-        ArrayList attrs =   info.getLangDependAttributes();
+        ArrayList attrs = info.getLanguageDependentAttributes();
     boolean foundLanguage = false;
         for (int i=0;i<attrs.size();i++){
@@ -291 +288 @@
         Element set_language = (Element)setLanguages.item(i);
                 lang = set_language.getAttribute(GEMSConstants.CODE_ATTRIBUTE); 
-        setNameAndDescrition(languageList, set_language,lang);  
+        setNameAndDescription(languageList, set_language,lang);     
         }
         
@@ -297 +294 @@
         //no set langugae elements, try load name and description elements
         else{
-            setNameAndDescrition(languageList, document.getDocumentElement(),lang);     
+            setNameAndDescription(languageList, document.getDocumentElement(),lang);     
     }
     
@@ -306 +303 @@
     }
 
-    private void setNameAndDescrition(ArrayList languageList, Element parent,String lang){
+    private void setNameAndDescription(ArrayList languageList, Element parent,String lang){
 
     ArrayList names = XMLTools.getChildElementsByTagName(parent,GEMSConstants.NAME_ELEMENT);         
@@ -313 +310 @@
     if (names.size() > 0){
         Element name_element = (Element)names.get(0);
-            Attribute attr = new Attribute(GEMSConstants.NAME_ATTRIBUTE,XMLTools.getElementTextValue(name_element));
+            Attribute attr = new Attribute(GEMSConstants.NAME_ATTRIBUTE,XMLTools.getElementTextValue(name_element), true);
         if (lang == null){
         attr.setLanguage(name_element.getAttribute(GEMSConstants.LANGUAGE_ATTRIBUTE));
@@ -321 +318 @@
         attr.setLanguage(lang); 
         }
-
-        if (current_language.equals(attr.getLanguage())){
-        attr.setRequired(true);
-                languageList.add(0,attr);
-        }
-        else{
-        languageList.add(attr);
-        }    
+        languageList.add(attr);
+//      if (current_language.equals(attr.getLanguage())){
+//      attr.setRequired(true);
+//                 languageList.add(0,attr);
+//      }
+//      else{
+//      languageList.add(attr);
+//      }    
             
     }
@@ -336 +333 @@
     if (des.size() > 0){
         Element des_element = (Element)des.get(0);
-        Attribute attr = new Attribute(GEMSConstants.DESCRIPTION_ATTRIBUTE,XMLTools.getElementTextValue(des_element)); 
+        Attribute attr = new Attribute(GEMSConstants.DESCRIPTION_ATTRIBUTE,XMLTools.getElementTextValue(des_element), true); 
         if (lang == null){
         attr.setLanguage(des_element.getAttribute(GEMSConstants.LANGUAGE_ATTRIBUTE));
@@ -346 +343 @@
     }
     else{
-        Attribute attr = new Attribute(GEMSConstants.DESCRIPTION_ATTRIBUTE,"");
+        Attribute attr = new Attribute(GEMSConstants.DESCRIPTION_ATTRIBUTE,"", true);
             if (lang == null){
         attr.setLanguage(name_lang);
@@ -378 +375 @@
      static public String getCollectionPath()
     {
-    return config.gsdl_path + File.separator + "collect";
+    return Configuration.gsdl_path + File.separator + "collect";
     } 
 }