Changeset 8588

Timestamp:

2004-11-17T13:30:09+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed some more dead code: the "meta audit" menu bar stuff.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (1 diff)
• gui/GatherPane.java (modified) (1 diff)
• gui/MenuBar.java (modified) (1 diff)
• gui/tree/DragTree.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1307 +1307 @@
 
 
-    public void setClosingThread(boolean set) {
-    if(set) {
-        closing_thread = Thread.currentThread();
-    }
-    else {
-        closing_thread = null;
-    }
-    }
-
-
     /** I started giving the user the choice of using an existing meta set or creating a new one. The second option being so that they didn't have to add/merge/ignore each element, they could all be added automatically. However, I am not sure where the merge prompt gets called from, and it is not essential, so I am leaving it for now - it should be added back in and finished. [kjdon] */
     private boolean addSomeMetadataSets(File collection_dir) {
@@ -1384 +1374 @@
 
     try {
-        // We have to ensure that the local library has released this collection so we can delete the index directory
+        // Ensure that the local library has released this collection so we can delete the index directory
         if (!Gatherer.GS3 && Configuration.exec_file != null) {
         Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());

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

@@ -772 +772 @@
         }
     }
-    // "View assigned metadata" menu item is disabled by default
-    // menu_bar.metadata_view.setCanEnable(false);
-    menu_bar.setMetaAuditSuffix(null);
 
     menu_bar.tabSelected(tab_pane.getSelectedIndex());
     int selected_index = tab_pane.getSelectedIndex();
-    if( selected_index == tab_pane.indexOfComponent(gather_pane)) {
+    if (selected_index == tab_pane.indexOfComponent(mirror_pane)) {
+        mirror_pane.gainFocus();
+    }
+    else if (selected_index == tab_pane.indexOfComponent(gather_pane)) {
         gather_pane.gainFocus();
-        // "View assigned metadata" menu item is enabled for the "Gather" pane
-        // menu_bar.metadata_view.setCanEnable(true);
-    }
-    else if(selected_index == tab_pane.indexOfComponent(enrich_pane)) {
+    }
+    else if (selected_index == tab_pane.indexOfComponent(enrich_pane)) {
         enrich_pane.gainFocus();
-        // "View assigned metadata" menu item is enabled for the "Enrich" pane
-        // menu_bar.metadata_view.setCanEnable(true);
-    }
-    else if(selected_index == tab_pane.indexOfComponent(design_pane)) {
+    }
+    else if (selected_index == tab_pane.indexOfComponent(design_pane)) {
         design_pane.gainFocus();
     }
-    else if(selected_index == tab_pane.indexOfComponent(create_pane)) {
+    else if (selected_index == tab_pane.indexOfComponent(create_pane)) {
         create_pane.gainFocus();
     }
-    else if(selected_index == tab_pane.indexOfComponent(mirror_pane)) {
-        mirror_pane.gainFocus();
-    }
 
     previous_pane = (JPanel) tab_pane.getSelectedComponent();
     }
+
 
     private MouseListener mouse_blocker_listener = new MouseAdapter() {};

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

@@ -404 +404 @@
 
     /** Called to inform this control panel that it has just gained focus as an effect of the user clicking on its tab.
-     * @see org.greenstone.gatherer.gui.tree.DragTree
      */
     public void gainFocus() {
-    // Update the menubar's idea of whats been selected
-    if (collection_tree != null) {
-        if (collection_tree.isSelectionEmpty()) {
-        Gatherer.g_man.menu_bar.setMetaAuditSuffix(null);
-        }
-        else {
-        Gatherer.g_man.menu_bar.setMetaAuditSuffix(collection_tree.getSelectionDetails());
-        }
-    }
     // Update the meta-audit view to show the current selection, if any.
     Gatherer.g_man.meta_audit.setRecords(getSelected());

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

@@ -269 +269 @@
     }
 
-    public void setMetaAuditSuffix(String metaaudit_suffix) {
-//  ///ystem.err.println("**** Set suffix: " + metaaudit_suffix);
-//  if(metaaudit_suffix == null) {
-//      metadata_view.setText(Dictionary.get("Menu.Metadata_View") + " " + Dictionary.get("FileActions.No_Selection"));
-//      metadata_view.setEnabled(false);
-//  }
-//  else {
-//      ///ystem.err.println("Set metadata view suffix: " + metaaudit_suffix);
-//      metadata_view.setText(Dictionary.get("Menu.Metadata_View") + " " + metaaudit_suffix);
-//      metadata_view.setEnabled(true);
-//  }
-    }
-
 
     /** In order to provide context aware help advice we keep track of which

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -620 +620 @@
         group.grabFocus(this);
     }
-    if(name.equals("Collection") || name.equals("MetaEdit")) {
-        if(event.getNewLeadSelectionPath() == null) {
-        Gatherer.g_man.menu_bar.setMetaAuditSuffix(null);
-        }
-        else {
-        Gatherer.g_man.menu_bar.setMetaAuditSuffix(getSelectionDetails());
-        }
-    }
     }