Changeset 4421

Timestamp:

2003-05-30T13:40:17+12:00 (21 years ago)

Author:

kjdon

Message:

the modal dialog now is one of our special ModalDialogs which only block the parent, enabling the use of help files while the dialog is open. A SimpleMenuBar with help on it has been added to the dialog.

Location:

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

Files:

• AutofilterDialog.java (modified) (6 diffs)
• MetaAuditFrame.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

@@ -44 +44 @@
 import org.greenstone.gatherer.gui.metaaudit.Filter;
 import org.greenstone.gatherer.gui.metaaudit.MetaAuditFrame;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.gui.ModalDialog;
+
 /** The autofilter concept comes from Microsoft Excel spreadsheets that use autofilters to filter to the sheet. When you click on the heading of a column, a new prompt allows you to specify what filter should be acting apon the selected column. Any new filter is conjoined with any previous filters to provide a sheet containing only rows that match all current filters. Each column must also provide an indicator for determining if a filter is set (in this case a special icon) and and a method for removing a filter (use the clear filter button within the autofilter dialog). Having recently discovered that most JVMs aren't very good at recoving memory used by dialog and frame windows, special care must be made to deallocate all references properly, as a user may open several dozen autofilter prompts over the lifetime of a session.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -49 +52 @@
  */
 public final class AutofilterDialog
-    extends JDialog {
+    extends ModalDialog {
     /** The filter being edited. */
     private Autofilter filter;
@@ -89 +92 @@
     private MetaAuditFrame dialog;
     /** The default size for the autofilter control. */
-    static final private Dimension SIZE = new Dimension(640, 220);
+    static final private Dimension SIZE = new Dimension(640, 245);
     /** Constructor.
      * @param dialog A reference to the <strong>MetaAuditFrame</strong> that spawned this dialog.
@@ -103 +106 @@
     setSize(SIZE);
     setTitle(get("Title"));
+    setJMenuBar(new SimpleMenuBar("6.7")); 
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
@@ -294 +298 @@
     }
     // Display    
-    show();
+    setVisible(true);
     dialog.toFront();
     return this.filter;
@@ -352 +356 @@
         filter = null;
         }
-        hide();
+        setVisible(false);
     }
     }

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditFrame.java

@@ -45 +45 @@
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.TreeSynchronizer;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.gui.ModalDialog;
+
 /** The MetaAuditFrame provides a table view of all of the metadata assigned to a selection of FileNodes. All values for a certain file and a certain metadata element appear in the same cell. This table can be sorted by any column, and also has a MS Excel-like AutoFilter allowing you to restrict the rows visible to only those that match a certain set of criteria (applied to each column, and then 'ANDED', or cojoined, to determine the filter). Finally this dialog does not block the Gatherer tool, so the file selection can be changed and the dialog will just generate a new table dynamically.<BR>
  * Much effort has gone into optimizing this table, as it quickly becomes slow and unresponsive to build/filter/sort when the number of records selected is high. However its performance is still nowhere as good as the Excel spreadsheet, and selections of 1000+ records can cause some serious waiting problems. Performance progression, shown in terms of time taken to perform action, are shown below. Note that building includes both the creation of the data model, and/or the time taken to lay out row and column sizes (due to this using multiple entry cells). Also all tables, by default, must be sorted by one column, which is initially the first column in ascending order:<BR><BR>
@@ -78 +81 @@
  */
 public class MetaAuditFrame
-    extends JDialog 
+    extends ModalDialog 
     implements TreeSelectionListener {
     public AutofilterDialog autofilter_dialog;
@@ -90 +93 @@
     private MetaAuditTable table;
     /** The default size for the metaaudit dialog. */
-    static final private Dimension SIZE = new Dimension(640,480);
+    static final private Dimension SIZE = new Dimension(640,505);
     /** The tolerance used to determine between a column resize, and a request for an AutoFilterDialog. */
     static final private int TOLERANCE = 3;
     /** Constructor.*/
     public MetaAuditFrame(TreeSynchronizer tree_sync, FileNode records[]) {
-    super();
+    super(Gatherer.g_man);
     // Arguments
     this.autofilter_dialog = new AutofilterDialog(this);
@@ -105 +108 @@
     setSize(SIZE);
     setTitle(get("Title"));
-
+    setJMenuBar(new SimpleMenuBar("6.7")); 
     JPanel content_pane = (JPanel) getContentPane();
     JPanel button_pane = new JPanel();
@@ -142 +145 @@
         rebuildModel();
     }
-    show();
+    setVisible(true);
     }
     /** This method is called whenever the selection within the collection tree changes. This causes the table to be rebuilt with a new model.
@@ -203 +206 @@
      */
     public void actionPerformed(ActionEvent event) {
-        self.hide();
+        self.setVisible(false);
     }
     }