Changeset 5809

Timestamp:

2003-11-07T13:58:03+13:00 (20 years ago)

Author:

jmt12

Message:

Added some more Codec stuff in order to get hierarchies to work

File:

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

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

@@ -64 +64 @@
 import org.greenstone.gatherer.util.DragGroup;
 import org.greenstone.gatherer.util.PatternTokenizer;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;
@@ -175 +176 @@
     expand_for_extracted.setPreferredSize(new Dimension(25, 25));
     Dictionary.registerBoth(expand_for_extracted, "MetaEdit.Expand", "MetaEdit.Expand_Tooltip");
-    
+
     tree = new GValueTree(CONTROL_SIZE.width, CONTROL_SIZE.height);
     }
@@ -228 +229 @@
        private ElementWrapper element = null;
        private String value = null;
-       
+
        private AppendMetadataTask(ElementWrapper element, String value) {
       this.element = element;
@@ -237 +238 @@
 
        public void run() {
-      ///ystem.err.println("Add metadata - '" + value + "'");
+      System.err.println("Add metadata - '" + value + "'");
         // Check the new metadata is valid
         if(records != null && element != null && value != null) {
@@ -263 +264 @@
        private ElementWrapper element;
        private String value;
-       
+
     private UpdateMetadataTask(ElementWrapper element, String value) {
       this.element = element;
@@ -284 +285 @@
     private class RemoveMetadataTask
     extends Thread {
-       
+
        private RemoveMetadataTask() {}
-       
+
     public void run() {
         Gatherer.println("Removing value:");
@@ -556 +557 @@
     table_pane_two.setLayout(new BorderLayout());
     table_pane_two.add(no_metadata_message, BorderLayout.CENTER);
-    
+
     table_card_pane.setLayout(card_layout);
     table_card_pane.add(table_pane_zero, CARD_ZERO);
@@ -793 +794 @@
         inherited_column.setPreferredWidth(20);
         inherited_column.setCellRenderer(new TableCellRenderer(model));
-             
+
         TableColumn element_column = column_model.getColumn(1);
         element_column.setPreferredWidth(TABLE_SIZE.width / 4);
         element_column.setCellRenderer(new TableCellRenderer(model));
-             
+
         TableColumn value_column = column_model.getColumn(2);
         value_column.setPreferredWidth(((3 * TABLE_SIZE.width) / 4) - 15);
@@ -882 +883 @@
                 setValueIsAdjusting(adjusting);
 
-        // Special code for clicking the first column (folder-level metadata) 
+        // Special code for clicking the first column (folder-level metadata)
         if (column == 0) {
             selected_metadata = model.getMetadataAtRow(row);
@@ -1115 +1116 @@
         extracted_header_pane.setLayout(new BorderLayout());
         extracted_header_pane.add(expand_for_extracted, BorderLayout.EAST);
-        
+
         extracted_pane.setBorder(BorderFactory.createEmptyBorder(0,10,25,0));
         extracted_pane.setLayout(new BorderLayout());
@@ -1210 +1211 @@
         if (!card_showing.equals(NONE)) {
         manual_text_edit_event = val.equals("");  // Set to false unless val == ""
-        value.setText(val);
+        value.setText(Codec.transform(val, Codec.GREENSTONE_TO_TEXT));
         value.setCaretPosition(0);
         manual_text_edit_event = true;
@@ -1224 +1225 @@
 
         // Hierarchical values are separated using '\'
-        PatternTokenizer tokenizer = new PatternTokenizer(val, GValueModel.PATH_SEP);
+        PatternTokenizer tokenizer = new PatternTokenizer(val, StaticStrings.PIPE_STR);
         while (tokenizer.hasMoreTokens()) {
         String token = tokenizer.nextToken();
@@ -1295 +1296 @@
             add.doClick();
             }
-        }           
+        }
         }
 
@@ -1328 +1329 @@
         ///ystem.err.println("\n(Validate) Value text: " + value_text);
 
-        // Ignore the validate() with empty text that occurs when value.setText() is used 
+        // Ignore the validate() with empty text that occurs when value.setText() is used
         if (!value_text.equals("") || manual_text_edit_event == true) {
             TreePath closest_path = getClosestPath(value_text);
 
             ///ystem.err.println("The closest path is: " + closest_path);
-            
+
             // Select the new path in the tree
             // The tree selection event this causes must be ignored, since it alters value