Changeset 4312

Timestamp:

2003-05-23T16:35:38+12:00 (21 years ago)

Author:

jmt12

Message:

temporarily disabled the idea of different model views

File:

• trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java (modified) (13 diffs)

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

@@ -58 +58 @@
      private FileNode[] file_nodes;
      /** The current view. */
-     private int current_view;
-
-     private JToggleButton assigned_metadata_view;
-     private JToggleButton unassigned_metadata_view;
+     //private int current_view;
+
+     //private JToggleButton assigned_metadata_view;
+     //private JToggleButton unassigned_metadata_view;
 
      /** An icon showing the current state of the table build. */
-     private JProgressBar activity_bar;
+     //private JProgressBar activity_bar;
      /** The table this model is being displayed in. */
      private JTable table;
@@ -77 +77 @@
      static final private String[] COLUMN_NAMES = {"", Gatherer.dictionary.get("Metadata.Element"),  Gatherer.dictionary.get("Metadata.Value")};
 
+     public GTableModel(JTable table) {
+          this.builder = null;
+          this.table = table;
+          //changeView();
+          // Register this model with the msm manager.
+          if(Gatherer.c_man.ready()) {
+                Gatherer.c_man.getCollection().msm.addMSMListener(this); 
+          }
+     }
+
+     public GTableModel(JTable table, FileNode[] file_nodes) {
+          this(table);
+          this.file_nodes = file_nodes;
+          if(file_nodes != null && file_nodes.length > 0) {
+                // Create model builder
+                builder = new ModelBuilder();
+                builder.start();
+          }
+     }
+
      /** The default constructor creates a new empty model with the current view set to an emtpy 'all metadata'. */
-     public GTableModel(JTable table, JToggleButton assigned_metadata_view, JToggleButton unassigned_metadata_view, JProgressBar activity_bar) {
+     /*
+        public GTableModel(JTable table, JToggleButton assigned_metadata_view, JToggleButton unassigned_metadata_view, JProgressBar activity_bar) {
           this.activity_bar = activity_bar;
           this.assigned_metadata_view = assigned_metadata_view;
@@ -89 +110 @@
                 Gatherer.c_man.getCollection().msm.addMSMListener(this); 
           }
-     }
+        }
+     */
 
      /** This constuctor starts by creating an empty model then, using a separate model builder thread, builds a model from the given files. */
+     /*
      public GTableModel(JTable table, JToggleButton assigned_metadata_view, JToggleButton unassigned_metadata_view, JProgressBar activity_bar, FileNode[] file_nodes) {
           this(table, assigned_metadata_view, unassigned_metadata_view, activity_bar);
@@ -101 +124 @@
           }
      }
-
+     */
+
+     public void changeView() {
+          changeView(SHOW_ALL);
+     }
+
+     /*
      public void changeView() {
           boolean show_assigned = assigned_metadata_view.isSelected();
@@ -115 +144 @@
           }
      }
+     */
 
      /** Change the current view by changing the model that the table is currently based on. */
      public void changeView(int view) {
-          current_view = view;
+          //current_view = view;
           switch(view) {
           case SHOW_ASSIGNED:
@@ -151 +181 @@
           // Inform everyone that the model has changed.
           fireTableDataChanged();
-     }  
+     }
 
      /** Called whenever an element in a set is added, edited or removed from the metadata set manager. We listen for this just incase the name of one of the elements currently shown changes. After that the table will be up to date, as the element references are otherwise live. */
@@ -234 +264 @@
      /** Allows access to this models current view. */
      public int getView() {
-          return current_view;
+          return SHOW_ALL; //current_view;
      }
 
@@ -361 +391 @@
                 }
                 // As a current visible table is most likely affected, update the table component. We do this by calling changeView so as to also update any compound list.
-                changeView(current_view);
+                //changeView(current_view);
           }
           else {
@@ -442 +472 @@
                 Vector elements = Gatherer.c_man.getCollection().msm.getElements();
                 // Show some visual indication that building is occuring.
-                assigned_metadata_view.setEnabled(false);
-                unassigned_metadata_view.setEnabled(false);
-                activity_bar.setMaximum(file_nodes.length + elements.size());
-                activity_bar.setValue(0);
-                activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Building"));
+                //assigned_metadata_view.setEnabled(false);
+                //unassigned_metadata_view.setEnabled(false);
+                //activity_bar.setMaximum(file_nodes.length + elements.size());
+                //activity_bar.setValue(0);
+                //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Building"));
                 //long start = System.currentTimeMillis();
                 
@@ -473 +503 @@
                                 data.inc();
                                 // If the table shown is stale, refresh it.
-                                if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+                                //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+                                // fireTableRowsUpdated(index, index);
+                                //}
+                                // We may have to update a compound list
+                                //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
+                                if((index = current_metadata.indexOf(data)) == -1) {
                                      fireTableRowsUpdated(index, index);
                                 }
-                                // We may have to update a compound list
-                                else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
-                                     if((index = current_metadata.indexOf(data)) == -1) {
-                                          fireTableRowsUpdated(index, index);
-                                     }
-                                }
+                                //}
                           }
                           // Ensure the metadata's element is in our list of showable elements.
@@ -490 +520 @@
                                 known_elements.add(data.getElement());
                                 // If the table shown is stale, refresh it.
-                                if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+                                //if((modified_metadata == file_metadata && current_view == SHOW_FILE) || (modified_metadata == inherited_metadata && current_view == SHOW_INHERITED)) {
+                                //   fireTableRowsInserted(index, index);
+                                //}
+                                // We may have to update a compound list
+                                //else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
+                                if((index = current_metadata.indexOf(data)) == -1) {
+                                     index = add(current_metadata, data);
                                      fireTableRowsInserted(index, index);
                                 }
-                                // We may have to update a compound list
-                                else if(current_view == SHOW_ALL || current_view == SHOW_ASSIGNED) {
-                                     if((index = current_metadata.indexOf(data)) == -1) {
-                                          index = add(current_metadata, data);
-                                          fireTableRowsInserted(index, index);
-                                     }
-                                     else {
-                                          fireTableRowsUpdated(index, index);
-                                          
-                                     }
-                                }
+                                else {
+                                     fireTableRowsUpdated(index, index);     
+                                }
+                                //}
                           }
                           else {
@@ -509 +538 @@
                           }
                      }
-                     activity_bar.setValue(activity_bar.getValue() + 1);
+                     //activity_bar.setValue(activity_bar.getValue() + 1);
                      Gatherer.g_man.metaedit_pane.validateMetadataTable();
                 }
@@ -520 +549 @@
                           int index = add(unassigned_metadata, data);
                           // Inform everyone that the model has changed, but only if it affects the current view.
-                          if(current_view == SHOW_UNASSIGNED) {
+                          //if(current_view == SHOW_UNASSIGNED) {
+                          //    fireTableRowsInserted(index, index);
+                          //}
+                          //else if(current_view == SHOW_ALL) {
+                          if((index = current_metadata.indexOf(data)) == -1) {
+                                index = add(current_metadata, data);
                                 fireTableRowsInserted(index, index);
                           }
-                          else if(current_view == SHOW_ALL) {
-                                if((index = current_metadata.indexOf(data)) == -1) {
-                                     index = add(current_metadata, data);
-                                     fireTableRowsInserted(index, index);
-                                }
-                                else {
-                                     fireTableRowsUpdated(index, index);
-                                }
-                          }
-                     }
-                     activity_bar.setValue(activity_bar.getValue() + 1);
+                          else {
+                                fireTableRowsUpdated(index, index);
+                          }
+                          //}
+                     }
+                     //activity_bar.setValue(activity_bar.getValue() + 1);
                      Gatherer.g_man.metaedit_pane.validateMetadataTable();
                 }
                 //long end = System.currentTimeMillis();
                 ///ystem.err.println("Took " + (end - start) + "ms to build table.");
-                assigned_metadata_view.setEnabled(true);
-                unassigned_metadata_view.setEnabled(true);
-                activity_bar.setValue(activity_bar.getMaximum());
-                activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Ready"));
+                //assigned_metadata_view.setEnabled(true);
+                //unassigned_metadata_view.setEnabled(true);
+                //activity_bar.setValue(activity_bar.getMaximum());
+                //activity_bar.setString(Gatherer.dictionary.get("MetaEdit.Ready"));
                 // Finally complete
                 complete = true;