Changeset 6042

Timestamp:

2003-11-28T17:48:54+13:00 (20 years ago)

Author:

jmt12

Message:

All typed in values are correctly handled by the various Codec transforms

File:

• trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java (modified) (21 diffs)

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

@@ -54 +54 @@
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.NonWhitespaceField;
+import org.greenstone.gatherer.gui.TransformCharacterTextField;
 import org.greenstone.gatherer.mem.Attribute;
 import org.greenstone.gatherer.mem.AttributeTableModel;
@@ -59 +60 @@
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.MetadataSet;
+import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.valuetree.GValueModel;
@@ -713 +715 @@
         else {
         // Name combo box is enabled except when attributes are edited
-        name.setEnabled((source != edit_attribute));
+        //name.setEnabled((source != edit_attribute));
         name_to_values.clear();
         name.clear();
@@ -865 +867 @@
     {
         String name_str = name.getSelectedItem().toString();
-        String value_str = value.getText();
+        String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
 
         // Remove the existing attribute if this is an edit
@@ -898 +900 @@
     {
         String name_str = name.getSelectedItem().toString();
-        String value_str = value.getText();                     
+        String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
 
         // Remove the existing attribute if this is an edit
@@ -932 +934 @@
         String name_str = name.getSelectedItem().toString();
         String language_code = (String) language_box.getSelectedItem();
-        String value_str = value.getText();
+        String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
 
         // Remove the existing attribute if this is an edit
@@ -980 +982 @@
         setModal(true);
         setSize(ADD_ELEMENT_SIZE);
-                // Creation
+        // Creation
         JPanel content_pane = (JPanel) getContentPane();
         content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
@@ -1057 +1059 @@
         if(source == ok_button) {
         // Add then dispose
-        String name_str = name_field.getText();
+        String name_str = Codec.transform(Codec.transformUnicode(name_field.getText()), Codec.TEXT_TO_DOM);
         // If this element doesn't already exist.
         if(!current_set.containsElement(name_str)) {
@@ -1191 +1193 @@
         Object source = event.getSource();
         if(source == ok_button) {
-        String name_str = name_field.getText();
+        String name_str = Codec.transform(Codec.transformUnicode(name_field.getText()), Codec.TEXT_TO_DOM);
         // Ensure that this source doesn't already exist.
         if(!Gatherer.c_man.msm.profiler.containsSource(name_str)) {
@@ -1250 +1252 @@
         namespace_label.setPreferredSize(LABEL_SIZE);
         Dictionary.setText(namespace_label, "MEM.Namespace");
-        namespace_field = new JTextField();
+        namespace_field = TransformCharacterTextField.createNamespaceTextField();
         namespace_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
         namespace_field.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
@@ -1318 +1320 @@
         if(source == ok_button) {
         String namespace_str = namespace_field.getText();
-        String name_str = name_field.getText();
+        String name_str = Codec.transform(Codec.transformUnicode(name_field.getText()), Codec.TEXT_TO_DOM);
         // Ensure the set doesn't already exist
         if(Gatherer.c_man.msm.getSet(name_str) == null) {
@@ -1362 +1364 @@
     private JButton ok_button = null;
     private JTextArea value = null;
-    private JTextField alias = null;
     private SmarterTree subject_tree = null;
 
@@ -1400 +1401 @@
         Dictionary.setTooltip(value, "MEM.Value_Tooltip");
 
-        JPanel alias_pane = new JPanel();
-        alias_pane.setOpaque(false);
-        JLabel alias_label = new JLabel();
-        alias_label.setOpaque(false);
-        alias_label.setPreferredSize(LABEL_SIZE);
-        Dictionary.setText(alias_label, "MEM.Alias");
-
-        alias = new JTextField();
-        alias.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        alias.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        alias.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        alias.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setText(alias, "MEM.Alias_Tooltip");
-
         JPanel button_pane = new JPanel();
         button_pane.setOpaque(false);
@@ -1445 +1432 @@
         inner_pane.add(value_pane);
 
-        alias_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
-        alias_pane.setLayout(new BorderLayout());
-        alias_pane.add(alias_label, BorderLayout.WEST);
-        alias_pane.add(alias, BorderLayout.CENTER);
-
-        center_pane.setLayout(new BorderLayout());
-        center_pane.add(inner_pane, BorderLayout.CENTER);
-        center_pane.add(alias_pane, BorderLayout.SOUTH);
-
         button_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
         button_pane.setLayout(new GridLayout(1,2,5,5));
@@ -1460 +1438 @@
 
         content_pane.setLayout(new BorderLayout());
-        content_pane.add(center_pane, BorderLayout.CENTER);
+        content_pane.add(inner_pane, BorderLayout.CENTER);
         content_pane.add(button_pane, BorderLayout.SOUTH);
         setLocation((Gatherer.config.screen_size.width - ADD_OR_EDIT_VALUE_SIZE.width) / 2, (Gatherer.config.screen_size.height - ADD_OR_EDIT_VALUE_SIZE.height) / 2);
@@ -1470 +1448 @@
         Object source = event.getSource();
         if(source == ok_button) {
+        String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
         // Now we action as necessary
         GValueModel model = Gatherer.c_man.msm.getValueTree(current_element);
@@ -1475 +1454 @@
             ///ystem.err.println("Add type - insert node: " + value.getText() + " into " + subject_node);
             // Add this value to the tree.
-            model.addValue(value.getText(), subject_node, alias.getText());
+            model.addValue(value_str, subject_node);
         }
         else {
             // Rewrite this value in the DOM model. Note that this will automatically rewrite all assignments as they are live references.
-            current_value_node.setValue(value.getText());
-            current_value_node.setAlias(alias.getText());
+            current_value_node.setValue(value_str);
             // Now insert the node into the currently selected subject, but only if the parent has changed.
             if(subject_node != current_value_node.getParent()) {
@@ -1551 +1529 @@
             }
             value.setText("");
-            alias.setText("");
             Dictionary.setText(this, "MEM.AddValue");
         }
@@ -1562 +1539 @@
             subject_node = (GValueNode) model.getRoot();
             }
-            value.setText(current_value_node.toString());
-            alias.setText(current_value_node.getAlias());
+            value.setText(Codec.transform(current_value_node.toString(), Codec.DOM_TO_TEXT));
             Dictionary.setText(this, "MEM.EditValue");
         }
@@ -1579 +1555 @@
 
     public void dispose() {
-        alias = null;
         cancel_button = null;
         ok_button = null;
@@ -1635 +1610 @@
         /** Invoked after nodes have been inserted into the tree. */
     public void treeNodesInserted(TreeModelEvent e) {
-        element_values.expandPath(new TreePath(element_values.getModel().getRoot()));
+        if(element_values != null && element_values.getModel() != null && element_values.getModel().getRoot() != null) {
+        element_values.expandPath(new TreePath(element_values.getModel().getRoot()));
+        }
     }
     /** Invoked after nodes have been removed from the tree. */