Changeset 12734

Timestamp:

2006-09-13T16:14:23+12:00 (18 years ago)

Author:

kjdon

Message:

changed the add element popup to say subelement if appropriate

Location:

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

Files:

• GEMSConstants.java (modified) (1 diff)
• MetadataSetTree.java (modified) (3 diffs)
• NewMetadataElementNamePrompt.java (modified) (1 diff)

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

@@ -58 +58 @@
     static String DELETE_ATTRIBUTE = "deleteAttribute";
     static String ADD_ELEMENT = "addElement";
+    static String ADD_SUBELEMENT = "addSubElement";
     static String DELETE_ELEMENT = "deleteElement";
     static int METADATA_INFO = 0;

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

@@ -135 +135 @@
    
         if (command.equals(GEMSConstants.ADD_ELEMENT)){
-        addElement();
+        addElement(false);
+        return ;
+    }
+        if (command.equals(GEMSConstants.ADD_SUBELEMENT)){
+        addElement(true);
         return ;
     }
@@ -155 +159 @@
 
      
-    public void addElement(){
+    public void addElement(boolean subelement){
     TreePath tse = self.getSelectionPath();
     if (tse == null) return;
-    NewMetadataElementNamePrompt name_prompt = new NewMetadataElementNamePrompt(parent_frame);
+    NewMetadataElementNamePrompt name_prompt = new NewMetadataElementNamePrompt(parent_frame, subelement);
     if (name_prompt.isCancelled()) {
         return;
@@ -358 +362 @@
         if (root_node) {
         add_element.setText(Dictionary.get("GEMS.Popup.AddElement"));
+        add_element.setActionCommand(GEMSConstants.ADD_ELEMENT);
         } else {
         add_element.setText(Dictionary.get("GEMS.Popup.AddSubElement"));
+        add_element.setActionCommand(GEMSConstants.ADD_SUBELEMENT);
+
         }
         add_element.addActionListener(meta_set_tree);
-        add_element.setActionCommand(GEMSConstants.ADD_ELEMENT);
         add(add_element);
         if (!root_node) {

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

@@ -54 +54 @@
     private JTextField name_textfield = null;
     private JDialog prompt;
-    
-    public NewMetadataElementNamePrompt(Frame parent) {
+
+    public NewMetadataElementNamePrompt(Frame parent, boolean subelement) {
     super(parent, true);
     setSize(SIZE);
-    setTitle(Dictionary.get("GEMS.NewMetadataElementNamePrompt.Title"));
     prompt = this;
+    
     JPanel content_pane = (JPanel) getContentPane();
     content_pane.setOpaque(true);
         
-    JLabel name_label = new JLabel(Dictionary.get("GEMS.NewMetadataElementNamePrompt.Name"));
+    JLabel name_label = new JLabel();
+    if (subelement) {
+        setTitle(Dictionary.get("GEMS.NewMetadataElementNamePrompt.SubTitle"));
+        name_label.setText(Dictionary.get("GEMS.NewMetadataElementNamePrompt.SubName"));
+    } else {
+        setTitle(Dictionary.get("GEMS.NewMetadataElementNamePrompt.Title"));
+        name_label.setText(Dictionary.get("GEMS.NewMetadataElementNamePrompt.Name"));
+    }
+
     name_textfield = new JTextField();