Changeset 6394

Timestamp:

2004-01-09T15:17:29+13:00 (20 years ago)

Author:

jmt12

Message:

As part of setting up modes we also added the ability to programatically access the MEM from within design view

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• mem/MetadataEditorManager.java (modified) (9 diffs)
• msm/MetadataSetManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

@@ -73 +73 @@
 public class MetadataEditorManager
     extends ModalDialog {
+    static final public int ADD_SET    = 0;
+    static final public int NORMAL     = 1;
+    static final public int REMOVE_SET = 2;
+    /** The default size of the editor dialog. */
+    static final private Dimension ADD_ELEMENT_SIZE = new Dimension(400,125);
+    static final private Dimension ADD_FILE_SIZE = new Dimension(400,125);
+    static final private Dimension ADD_SET_SIZE = new Dimension(400,125);
+    static final private Dimension ADD_OR_EDIT_ATTRIBUTE_SIZE = new Dimension(600,325);
+    static final private Dimension ADD_OR_EDIT_VALUE_SIZE = new Dimension(600,440);
+    static final private Dimension LABEL_SIZE = new Dimension(100,30);
+    static final private Dimension SIZE = new Dimension(800,480);
+    static final private String BLANK = "blank";
+    static final private String ELEMENT = "element";
+    static final private String PROFILE = "profile";
+    static final private String SET = "set";
+    static final private String VALUES = "values";
+
     private AddElementActionListener add_element_action_listener = null;
     private AddFileActionListener add_file_action_listener = null;
@@ -119 +136 @@
     private MetadataSet current_set = null;
     private Object target = null;
+    private RemoveSetActionListener remove_set_action_listener;
     private SmarterTable element_attributes = null;
     private SmarterTable profile_attributes = null;
@@ -127 +145 @@
     private String current_collection_file = null;
     private String dialog_options[] = null;
-    /** The default size of the editor dialog. */
-    static final private Dimension ADD_ELEMENT_SIZE = new Dimension(400,125);
-    static final private Dimension ADD_FILE_SIZE = new Dimension(400,125);
-    static final private Dimension ADD_SET_SIZE = new Dimension(400,125);
-    static final private Dimension ADD_OR_EDIT_ATTRIBUTE_SIZE = new Dimension(600,325);
-    static final private Dimension ADD_OR_EDIT_VALUE_SIZE = new Dimension(600,440);
-    static final private Dimension LABEL_SIZE = new Dimension(100,30);
-    static final private Dimension SIZE = new Dimension(800,480);
-    static final private String BLANK = "blank";
-    static final private String ELEMENT = "element";
-    static final private String PROFILE = "profile";
-    static final private String SET = "set";
-    static final private String VALUES = "values";
-    /** Constructor. */
-    public MetadataEditorManager() {
+
+    /** Constructor.
+     * @param set a MetadataSet that should be initially selected
+     * @param action a systematic action that should be performed
+     */
+    public MetadataEditorManager(MetadataSet set, int action) {
     super(Gatherer.g_man);
     this.dialog_options = new String[2];
@@ -175 +184 @@
     mds_tree.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     mds_tree.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    // We may have been asked to select a cetain initial set
+    if(set != null) {
+        MEMNode root = (MEMNode) model.getRoot();
+        for(int i = 0; i < root.getChildCount(); i++) {
+        MEMNode child = (MEMNode) root.getChildAt(i);
+        if(set.equals(child.getUserObject())) {
+            TreePath path = new TreePath(child.getPath());
+            mds_tree.setSelectionPath(path);
+            mds_tree.expandPath(path);
+            path = null;
+        }
+        child = null;
+        }
+        root = null;
+    }
 
     details_pane = new JPanel();
@@ -363 +387 @@
     add_or_edit_attribute_action_listener = new AddOrEditAttributeActionListener();
     add_or_edit_value_action_listener = new AddOrEditValueActionListener();
+    remove_set_action_listener = new RemoveSetActionListener();
 
     // Some blank panel
@@ -386 +411 @@
     remove_element.addActionListener(new RemoveElementActionListener());
     remove_file.addActionListener(new RemoveFileActionListener());
-    remove_set.addActionListener(new RemoveSetActionListener());
+    remove_set.addActionListener(remove_set_action_listener);
     remove_value.addActionListener(new RemoveValueActionListener());
     element_attributes.getSelectionModel().addListSelectionListener(new AttributesListSelectionListener(element_attributes));
@@ -499 +524 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
 
+    // Callback - we may have been asked to perform some systematic action, but we can't do that until the dialog is visible, which in itself causes a problem as the dialog is modal and setVisible won't return until the dialog is cancelled. The solution is to spawn a task on a new thread which waits until the dialog is visible then calls doClick on the appropriate button.
+    if(action != NORMAL) {
+        ActionTask task = new ActionTask(action);
+        task.start();
+    }
     // Display
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
@@ -504 +534 @@
     }
      
+    private class ActionTask
+    extends Thread {
+    private int action;
+    public ActionTask(int action) {
+        this.action = action;
+    }
+    public void run() {
+        boolean complete = false;
+        while(!complete) {
+        if(self.isVisible()) {
+            switch(action) {
+            case ADD_SET:
+            add_set_action_listener.actionPerformed(new ActionEvent(this, 0, "Blarg!"));
+            break;
+            case REMOVE_SET:
+            if(!mds_tree.isSelectionEmpty()) {
+                remove_set_action_listener.actionPerformed(new ActionEvent(this, 0, "Blarg!"));
+            }
+            break;
+            }
+            complete = true;
+        }
+        else {
+            try {
+            synchronized(this) {
+                wait(100);
+            }
+            }
+            catch(Exception exception) {
+            }
+        }
+        }
+    }
+    }
+
     public void dispose() {
     // Destructor
@@ -544 +609 @@
         add_or_edit_value_action_listener = null;
     }
+    remove_set_action_listener = null;
     super.dispose();
     }

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

@@ -192 +192 @@
      * @return A boolean indicating if the edit was successful.
      */
-    public boolean editMDS() {
-    MetadataEditorManager mem = new MetadataEditorManager();
+    public boolean editMDS(MetadataSet set, int action) {
+    MetadataEditorManager mem = new MetadataEditorManager(set, action);
     mem.dispose();
     mem = null;