Changeset 12836

Timestamp:

2006-09-25T10:13:13+12:00 (18 years ago)

Author:

kjdon

Message:

addElement now passes the model to the new name prompt, so that the new name can be checked against existing elements

File:

• trunk/gli/src/org/greenstone/gatherer/gems/MetadataSetTree.java (modified) (2 diffs)

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

@@ -162 +162 @@
     TreePath tse = self.getSelectionPath();
     if (tse == null) return;
-    NewMetadataElementNamePrompt name_prompt = new NewMetadataElementNamePrompt(parent_frame, subelement);
+    
+    DefaultTreeModel dtm = (DefaultTreeModel)getModel();
+    DefaultMutableTreeNode snode=(DefaultMutableTreeNode)tse.getLastPathComponent();
+    Object data = snode.getUserObject();
+    if (data instanceof MetadataSetInfo){
+        data = metadata_model;
+    }
+    NewMetadataElementNamePrompt name_prompt = new NewMetadataElementNamePrompt(parent_frame, subelement, data);
     if (name_prompt.isCancelled()) {
         return;
@@ -168 +175 @@
     String new_name = name_prompt.getName();
     
-    DefaultTreeModel dtm = (DefaultTreeModel)getModel();
-    DefaultMutableTreeNode snode=(DefaultMutableTreeNode)tse.getLastPathComponent();
     MetadataElementModel element_model = new MetadataElementModel(metadata_model.getMetadataSetInfo(), new_name);
     DefaultMutableTreeNode new_node = new DefaultMutableTreeNode(element_model);
     dtm.insertNodeInto(new_node,snode,snode.getChildCount());
     //update model
-    Object data = snode.getUserObject();
     if (data instanceof MetadataElementModel){
-        MetadataElementModel model = (MetadataElementModel) data;
-        model.addChild(element_model);
-    }
-    else{
-        if(data instanceof MetadataSetInfo){
-        metadata_model.addChild(element_model);
+        ((MetadataElementModel) data).addChild(element_model);
+    }
+    else if(data instanceof MetadataSetModel){
+        ((MetadataSetModel)data).addChild(element_model);
         
-        }
-    }
+    }
+    
     
     dtm.reload(snode);