Changeset 5782

Timestamp:

2003-11-04T18:28:07+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed bug 171: clicking on the icon indicating folder-level metadata (in the Enrich pane) does nothing. I have fixed the code for doing this and moved it out of the TableCellRenderer (!!).

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• MetaEditPane.java (modified) (3 diffs)
• table/TableCellRenderer.java (modified) (1 diff)

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

@@ -711 +711 @@
         int selected = table.getSelectedRow();
         selected_metadata = model.getMetadataAtRow(selected);
-        if(selected_metadata != null) { // Check something is selected.
+        if (selected_metadata != null) { // Check something is selected.
         tree.setSelectedMetadataElement(selected_metadata.getElement());
         GValueNode value_node = selected_metadata.getValueNode();
@@ -881 +881 @@
         boolean adjusting = (e.getID() == MouseEvent.MOUSE_PRESSED) ? true : false;
                 setValueIsAdjusting(adjusting);
+
+        // Special code for clicking the first column (folder-level metadata) 
         if (column == 0) {
+            selected_metadata = model.getMetadataAtRow(row);
+
+            // If there is folder-level metadata, switch to the folder it came from
+            File folder_inherited_from = selected_metadata.getFile();
+            if (folder_inherited_from != null) {
+            collection_tree.setSelection(folder_inherited_from);
+            }
+
             table.changeSelection(row, 0, e.isControlDown(), e.isShiftDown());
         }
@@ -887 +897 @@
             table.changeSelection(row, 1, e.isControlDown(), e.isShiftDown());
         }
-                // table.changeSelection(row, column, e.isControlDown(), e.isShiftDown());
         }
         }

trunk/gli/src/org/greenstone/gatherer/gui/table/TableCellRenderer.java

@@ -70 +70 @@
     if(value instanceof File) {
         if(value != null) {
-        // if(isSelected && hasFocus) {
-        // Metadata data = model.getMetadataAtRow(row);
-        // Gatherer.g_man.metaedit_pane.setSelection((File)value);
-        // Gatherer.g_man.metaedit_pane.setSelectedMetadata(data);
-        // }
         renderer = new JLabel(Utility.getImage("upfolder.gif"));
         }