Changeset 4541

Timestamp:

2003-06-10T15:43:45+12:00 (21 years ago)

Author:

mdewsnip

Message:

Some more improvements and optimizations. Had to add a special case for the nasty extracted metadata set (Note: this was *not* a bug!! This was a new feature request, OK?? Good).

File:

• trunk/gli/src/org/greenstone/gatherer/valuetree/GValueTree.java (modified) (11 diffs)

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueTree.java

@@ -47 +47 @@
 import org.greenstone.gatherer.gui.SmarterTextArea;
 import org.greenstone.gatherer.msm.ElementWrapper;
-import org.greenstone.gatherer.msm.Metadata;
 import org.greenstone.gatherer.util.Utility;
 /**
@@ -58 +57 @@
     private boolean ignore_tree_selection_event = false;
     private boolean manual_text_edit_event;
-    private JPanel center_pane;
     private CardLayout card_layout;
+    private String card_showing = null;
     /** The metadata element that is currently selected. */
     private ElementWrapper selected_metadata_element = null;
     private GValueModel vm;
-    private JTextArea auto_message;
+    private JTextArea extracted_message;
     private JTextField value;
     private JTree tree;
@@ -81 +80 @@
 
     setFont(Gatherer.config.getFont("general.font", false));
-
-    Dimension size = new Dimension(width, height);
-    setPreferredSize(size);
-
-    center_pane = new JPanel();
-
-    card_layout = new CardLayout();
-
-    JPanel auto_pane = new JPanel();
-    args[0] = "Title";
-    auto_message = new SmarterTextArea(get("AutoMessage", args), false);
-    auto_message.setLineWrap(true);
-    auto_message.setOpaque(false);
-    auto_message.setWrapStyleWord(true);
-
-    JPanel tree_pane = new JPanel();
-
-    JLabel tree_label = new JLabel(get("Tree"));
-
-    tree = new JTree(new GValueModel());
-    tree.addTreeSelectionListener(this);
-    tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
-    tree.setRootVisible(true);
-    tree.putClientProperty("JTree.lineStyle", "Angled");
+    setPreferredSize(new Dimension(width, height));
+
+    JPanel metadata_pane = new JPanel();
 
     JPanel value_pane = new JPanel();
@@ -118 +96 @@
     JPanel button_pane = new JPanel();
 
+    JPanel tree_pane = new JPanel();
+    JLabel tree_label = new JLabel(get("Tree"));
+
+    tree = new JTree(new GValueModel());
+    tree.addTreeSelectionListener(this);
+    tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+    tree.setRootVisible(false);
+    tree.putClientProperty("JTree.lineStyle", "Angled");
+
+    JPanel extracted_pane = new JPanel();
+    extracted_message = new SmarterTextArea("", false);
+    extracted_message.setLineWrap(true);
+    extracted_message.setOpaque(false);
+    extracted_message.setWrapStyleWord(true);
+
+    card_layout = new CardLayout();
+
     // Layout
-    tree_pane.setLayout(new BorderLayout());
-    tree_pane.add(tree_label, BorderLayout.NORTH);
-    tree_pane.add(new JScrollPane(tree), BorderLayout.CENTER);
-
-    auto_pane.setBorder(BorderFactory.createEmptyBorder(25,10,25,10));
-    auto_pane.setLayout(new BorderLayout());
-    auto_pane.add(auto_message, BorderLayout.CENTER);
-
-    center_pane.setBorder(BorderFactory.createEmptyBorder(2,0,2,0));
-    center_pane.setLayout(card_layout);
-    center_pane.add(tree_pane, TREE);
-    center_pane.add(auto_pane, NONE);
+
+    value_field_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
+    value_field_pane.setLayout(new BorderLayout(0, 0));
+    value_field_pane.add(value, BorderLayout.CENTER);
 
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
@@ -137 +124 @@
     button_pane.add(update);
     button_pane.add(remove);
-
-    value_field_pane.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
-    value_field_pane.setLayout(new BorderLayout(0, 0));
-    value_field_pane.add(value, BorderLayout.CENTER);
 
     value_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
@@ -149 +132 @@
     value_pane.add(button_pane, BorderLayout.SOUTH);
 
+    tree_pane.setLayout(new BorderLayout());
+    tree_pane.add(tree_label, BorderLayout.NORTH);
+    tree_pane.add(new JScrollPane(tree), BorderLayout.CENTER);
+
+    metadata_pane.setLayout(new BorderLayout());
+    metadata_pane.add(value_pane, BorderLayout.NORTH);
+    metadata_pane.add(tree_pane, BorderLayout.CENTER);
+
+    extracted_pane.setBorder(BorderFactory.createEmptyBorder(25,10,25,10));
+    extracted_pane.setLayout(new BorderLayout());
+    extracted_pane.add(extracted_message, BorderLayout.CENTER);
+
     this.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-    this.setLayout(new BorderLayout());
-    this.add(value_pane, BorderLayout.NORTH);
-    this.add(center_pane, BorderLayout.CENTER);
+    this.setLayout(card_layout);
+    this.add(metadata_pane, TREE);
+    this.add(extracted_pane, NONE);
+    card_showing = TREE;
     }
 
@@ -168 +164 @@
     public String getSelectedValue() {
     return value.getText();
-    }
-
-
-    public void setRootVisible(boolean val) {
-    tree.setRootVisible(val);
     }
 
@@ -181 +172 @@
     if (element == null) {
         selected_metadata_element = null;
-        setTreeEnabled(false);
         return;
     }
@@ -205 +195 @@
     selected_metadata_element = element;
     vm = Gatherer.c_man.getCollection().msm.getValueTree(element);
-    setTreeEnabled(true);
     tree.setModel(vm);
+
+    // Special case the extracted metadata set
+    if (selected_metadata_element.getNamespace().equals("")) {
+        // Display the panel showing the "you cannot edit this metadata" message
+        args[0] = selected_metadata_element.toString();
+        ((SmarterTextArea) extracted_message).systemSetText(get("AutoMessage", args));
+        card_layout.show(this, NONE);
+        card_showing = NONE;
+    }
+    else {
+        // Display the panel for viewing and assigning metadata
+        card_layout.show(this, TREE);
+        card_showing = TREE;
+    }
     }
 
@@ -227 +230 @@
     //   updating the tree is handled there (DocumentListenerImpl::validate())
     // System.err.println("Setting selected value to: " + val);
-    manual_text_edit_event = val.equals("");  // Set to false unless val == ""
-    value.setText(Utility.stripNL(val));
-    value.setCaretPosition(0);
-    manual_text_edit_event = true;
+    if (!card_showing.equals(NONE)) {
+        manual_text_edit_event = val.equals("");  // Set to false unless val == ""
+        value.setText(Utility.stripNL(val));
+        value.setCaretPosition(0);
+        manual_text_edit_event = true;
+    }
     }
 
@@ -243 +248 @@
     }
     return Gatherer.dictionary.get(key,args);
-    }
-
-
-    private void setTreeEnabled(boolean value) {
-    tree.setRootVisible(!value);
-    tree.setEnabled(value);
-    if(value) {
-        card_layout.show(center_pane, TREE);
-    }
-    else {
-        Metadata selected_metadata = metaedit.getSelectedMetadata();
-        if(selected_metadata != null && selected_metadata.getElement() != null) {
-        args[0] = selected_metadata.getElement().toString();
-        }
-        else {
-        args[0] = "";
-        }
-        ((SmarterTextArea)auto_message).systemSetText(get("AutoMessage", args));
-        card_layout.show(center_pane, NONE);
-    }
     }