Changeset 5289

Timestamp:

2003-08-27T14:49:24+12:00 (21 years ago)

Author:

jmt12

Message:

Had to remove little bit of left over stupid code.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java (modified) (10 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java

@@ -61 +61 @@
 import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.DragGroup;
+import org.greenstone.gatherer.util.PatternTokenizer;
 import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;
@@ -617 +618 @@
     else {
         // Check if the text in the value field is the same as the metadata value
-        if (tree.getSelectedValue().equals(value_node.getFullPath())) {
+        if (tree.getSelectedValue().equals(value_node.getFullPath(false))) {
         // Can't append or replace
         add.setEnabled(false);
@@ -667 +668 @@
         GValueNode value_node = selected_metadata.getValueNode();
         if(value_node != null) {
-            tree.setSelectedValue(value_node.getFullPath());
+            tree.setSelectedValue(value_node.getFullPath(true));
         }
         else {
@@ -1017 +1018 @@
         JPanel value_field_pane = new JPanel();
         value = new JTextField();
-        value.setDocument();
         value.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
         value.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
@@ -1095 +1095 @@
 
     public String getSelectedValue() {
-        return value.getText();
+        return Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_GREENSTONE);
     }
 
@@ -1152 +1152 @@
         TreePath path = tree.getSelectionPath();
         GValueNode node = (GValueNode) path.getLastPathComponent();
-        setSelectedValue(node.getFullPath());
+        setSelectedValue(node.getFullPath(false));
         }
     }
@@ -1165 +1165 @@
         if (!card_showing.equals(NONE)) {
         manual_text_edit_event = val.equals("");  // Set to false unless val == ""
-        value.setText(Utility.stripNL(val));
+        value.setText(val);
         value.setCaretPosition(0);
         manual_text_edit_event = true;
@@ -1191 +1191 @@
 
         // Hierarchical values are separated using '\'
-        StringTokenizer tokenizer = new StringTokenizer(val, "\\");
+        PatternTokenizer tokenizer = new PatternTokenizer(val, GValueModel.PATH_SEP);
         while (tokenizer.hasMoreTokens()) {
         String token = tokenizer.nextToken();
@@ -1251 +1251 @@
         if (e.getKeyCode() == KeyEvent.VK_TAB) {
             // Tab: Auto-complete
-            if (tree.getSelectionCount() != 0 && !value.getText().equals("")) {
+            if (tree.getSelectionCount() != 0 && !getSelectedValue().equals("")) {
             TreePath path = tree.getSelectionPath();
             GValueNode node = (GValueNode) path.getLastPathComponent();
-            value.setText(Utility.stripNL(node.getFullPath()));
+            value.setText(node.getFullPath(true));
             }
         }
@@ -1292 +1292 @@
         private void validate()
         {
-        String value_text = value.getText();
+        String value_text = getSelectedValue();
         ///ystem.err.println("\n(Validate) Value text: " + value_text);