Changeset 5158

Timestamp:

2003-08-18T14:03:24+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B010

Location:

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

Files:

• GTableModel.java (modified) (9 diffs)
• TableCellRenderer.java (modified) (2 diffs)

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

@@ -31 +31 @@
 import javax.swing.*;
 import javax.swing.table.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -41 +42 @@
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.Utility;
 /** Provides the model for a GTable component, filling it with metadata values for the choosen files or folders. The model also provides several different view of this data; assigned folder metadata, assigned file metadata, all assigned metadata, unassigned metadata, and all metadata. It also differentiates between metadata that is common to all of the files or folders, and that which isn't. The building of the actual model is done on a separate thread so that the gui remains responsive, and the gui is intermitantly updated by this thread. Updating of the model is triggered by events recieved from the metadata set manager in terms of new or obsolete metadata. A new model is rebuilt whenever the user selects a different group of files or folders.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -112 +114 @@
             break;
         case 1:
-            ElementWrapper element = m.getElement();
-            if (element != null) {
-            result = element.toString();
-            }
+            result = m.getElement();
             break;
         case 2:
@@ -261 +260 @@
     Metadata select_exact_metadata = null;
     Metadata select_closest_metadata = null;
-    boolean had_warning = false;
     // If there is a current builder...
     if (builder != null) {
@@ -268 +266 @@
         select_exact_metadata = builder.select_exact_metadata;
         select_closest_metadata = builder.select_closest_metadata;
-        had_warning = builder.had_warning;
         // ...kill it...
         builder.kill();
@@ -281 +278 @@
     builder.select_exact_metadata = select_exact_metadata;
     builder.select_closest_metadata = select_closest_metadata;
-    builder.had_warning = had_warning;
     }
 
@@ -304 +300 @@
     public Metadata select_exact_metadata = null;
     public Metadata select_closest_metadata = null;
-    private boolean had_warning = false;
+    private boolean had_extracted_warning = false;
+    private boolean had_inherited_warning = false;
     private volatile boolean killed = false;
 
@@ -332 +329 @@
             // Ignore hidden metadata
             if (!element.toString().startsWith("hidden.")) {
-            // If a piece of metadata is at folder level, display the warning
-            if (!metadatum.isFileLevel()) {
-                showInheritedMetadataWarning();
+            // Only process extracted metadata if the user has specified to
+            if(!element.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) || Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
+                // If a piece of metadata is at folder level, display the warning
+                if (!metadatum.isFileLevel()) {
+                showInheritedMetadataWarning();
+                }
+                
+                // If the piece of metadata is in the list, increment its count
+                int index = current_metadata.indexOf(metadatum);
+                if (index >= 0) {
+                Metadata existing = (Metadata) current_metadata.get(index);
+                existing.inc();
+                }
+                // Otherwise add it to the list
+                else {
+                metadatum.setCount(1);
+                index = add(current_metadata, metadatum);
+                fireTableRowsInserted(index, index);
+                
+                // Remember we have seen this element
+                if (known_elements.contains(element) == false) {
+                    known_elements.add(element);
+                }
+                }
             }
-
-            // If the piece of metadata is in the list, increment its count
-            int index = current_metadata.indexOf(metadatum);
-            if (index >= 0) {
-                Metadata existing = (Metadata) current_metadata.get(index);
-                existing.inc();
-            }
-            // Otherwise add it to the list
+            // Display a warning
             else {
-                metadatum.setCount(1);
-                index = add(current_metadata, metadatum);
-                fireTableRowsInserted(index, index);
-
-                // Remember we have seen this element
-                if (known_elements.contains(element) == false) {
-                known_elements.add(element);
-                }
+                showExtractedMetadataWarning();
             }
             }
@@ -418 +422 @@
     }
 
+    private void showExtractedMetadataWarning()
+    {
+        if (!had_extracted_warning) {
+        had_extracted_warning = true;
+        Runnable task = new Runnable() {
+            public void run() {
+                WarningDialog dialog = new WarningDialog("warning.ExtractedMetadata", false);
+                dialog.display();
+                dialog.dispose();
+                dialog = null;
+            }
+            };
+        SwingUtilities.invokeLater(task);
+        }
+    }
 
     private void showInheritedMetadataWarning()
     {
-        if (!had_warning) {
-        had_warning = true;
+        if (!had_inherited_warning) {
+        had_inherited_warning = true;
         Runnable task = new Runnable() {
             public void run() {

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

@@ -49 +49 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.table.GTableModel;
+import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.Metadata;
 import org.greenstone.gatherer.util.Utility;
@@ -116 +117 @@
         renderer.setBorder(BorderFactory.createEmptyBorder(0,0,0,0));
     }
+
+    // We set a tooltip over the element column containing the description of the element
+    if(value instanceof ElementWrapper) {
+        renderer.setToolTipText(((ElementWrapper)value).getToolTip());
+    }   
+
     return renderer;
     }