Changeset 6842

Timestamp:

2004-02-18T17:14:17+13:00 (20 years ago)

Author:

mdewsnip

Message:

Variable names changes needed because of the name change of the Gather, Enrich and Design pane java files.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (4 diffs)
• collection/DeleteCollectionPrompt.java (modified) (1 diff)
• collection/Job.java (modified) (1 diff)
• collection/SaveCollectionTask.java (modified) (2 diffs)
• gui/Filter.java (modified) (1 diff)
• gui/GUIManager.java (modified) (22 diffs)
• gui/Preferences.java (modified) (1 diff)
• gui/table/GTableModel.java (modified) (1 diff)
• mem/MetadataEditorManager.java (modified) (1 diff)

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

@@ -142 +142 @@
     Gatherer.config.addDirectoryMapping(name, file);
     // Now update the tree
-    Gatherer.g_man.collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+    Gatherer.g_man.gather_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     }
     /** This method calls the builcol.pl scripts via a GShell so as to not lock up the processor.
@@ -461 +461 @@
         // workspace_model = null;
         // set the view to Gather pane
-        Gatherer.g_man.setSelectedView(Gatherer.g_man.collection_pane);
+        Gatherer.g_man.setSelectedView(Gatherer.g_man.gather_pane);
         Gatherer.g_man.collectionChanged(ready());
     }
@@ -1177 +1177 @@
     File file = Gatherer.config.removeDirectoryMapping(target.toString());
     // Update tree.
-    Gatherer.g_man.collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+    Gatherer.g_man.gather_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     return file;
     }
@@ -1196 +1196 @@
      * @see org.greenstone.gatherer.Gatherer
      * @see org.greenstone.gatherer.gui.GUIManager
-     * @see org.greenstone.gatherer.gui.GConfigPane
      * @see org.greenstone.gatherer.collection.Collection
      */

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

@@ -319 +319 @@
 
         // Refresh the collects shown in the workspace tree
-        Gatherer.g_man.collection_pane.refreshWorkspaceTree(DragTree.LIBRARY_CONTENTS_CHANGED);
+        Gatherer.g_man.gather_pane.refreshWorkspaceTree(DragTree.LIBRARY_CONTENTS_CHANGED);
 
         resultPrompt(true);

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

@@ -482 +482 @@
     Gatherer.println("Current File: " + current_file_downloading);
     //WorkspaceTreeModel.refreshWebCacheMappings();
-    if(Gatherer.g_man.collection_pane.workspace_tree != null) {
-        FileSystemModel tree_model = (FileSystemModel) Gatherer.g_man.collection_pane.workspace_tree.getModel();
+    if(Gatherer.g_man.gather_pane.workspace_tree != null) {
+        FileSystemModel tree_model = (FileSystemModel) Gatherer.g_man.gather_pane.workspace_tree.getModel();
         File new_file = new File(current_file_downloading);
         File parent_file = new_file.getParentFile();

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

@@ -101 +101 @@
      * @see org.greenstone.gatherer.collection.Collection
      * @see org.greenstone.gatherer.gui.GUIManager
-     * @see org.greenstone.gatherer.gui.GConfigPane
      * @see org.greenstone.gatherer.msm.MetadataSetManager
      * @see org.greenstone.gatherer.util.Utility
@@ -141 +140 @@
 
         // Write out the collection configuration file.
-        Gatherer.g_man.config_pane.saveConfiguration();
+        Gatherer.g_man.design_pane.saveConfiguration();
         // spd.setProgress(getValue(COLLECTION_CFG_SAVED));
 

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

@@ -48 +48 @@
 import org.greenstone.gatherer.gui.tree.DragTree;
 
-/** <p>This object allows the user to set a filter on one of the workspace trees, specifying a preset type, or a regular expression that a files must match to be in the tree. Note that all directories are included. This class includes the controls for editing the filter. The trick is that several instances of the Filter class can share the same internal data (termed a 'run' of filters), so that the filter set on the CollectionPane and the MetaEditPane are virtually the same.</p>
+/** <p>This object allows the user to set a filter on one of the workspace trees, specifying a preset type, or a regular expression that a files must match to be in the tree. Note that all directories are included. This class includes the controls for editing the filter. The trick is that several instances of the Filter class can share the same internal data (termed a 'run' of filters), so that the filter set on the GatherPane and the EnrichPane are virtually the same.</p>
  * <p>The regular expression typed uses '*' as a wildcard character (equivalent to '.*'), and does not use '.' to match any single character (use '?' instead).</p>
  * @author John Thompson, Greenstone Digital Library, University of Waikato

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

@@ -59 +59 @@
 import org.greenstone.gatherer.gui.AboutDialog;
 //import org.greenstone.gatherer.gui.BrowsingPane;
-import org.greenstone.gatherer.gui.CollectionPane;
+import org.greenstone.gatherer.gui.GatherPane;
 import org.greenstone.gatherer.gui.CreatePane;
 import org.greenstone.gatherer.gui.Filter;
-import org.greenstone.gatherer.gui.GConfigPane;
+import org.greenstone.gatherer.gui.DesignPane;
 import org.greenstone.gatherer.gui.MenuBar;
-import org.greenstone.gatherer.gui.MetaEditPane;
+import org.greenstone.gatherer.gui.EnrichPane;
 import org.greenstone.gatherer.gui.MirrorPane;
 import org.greenstone.gatherer.gui.OpenCollectionDialog;
@@ -88 +88 @@
     /** The browsing pane behaves much like an internet browser, or at least will some day. */
     //public BrowsingPane browser_pane = null;
-    /** The collection pane is more like a file manager where you drag files from one tree to another. */
-    public CollectionPane collection_pane = null;
+    /** The mirror pane contains controls for mirroring internet sites. */
+    public MirrorPane mirror_pane = null;
+    /** The gather pane is more like a file manager where you drag files from one tree to another. */
+    public GatherPane gather_pane = null;
+    /** The enrich pane is used to assign, edit and remove metadata from files within the collection. */
+    public EnrichPane enrich_pane = null;
+    /** The design pane allows you to edit the design of the library in terms of the collection configuration file. */
+    public DesignPane design_pane = null;
     /** The create pane contains scripting options for importing and building collections into libraries. */
     public CreatePane create_pane = null;
+    /** The preview pane contains a preview of your build collection. */
+    //public PreviewPane preview_pane = null;
 
     public FileOpenActionListener foa_listener = new FileOpenActionListener();
 
-    /** The configuration pane allows you to edit the design of the library in terms of the collection configuration file. */
-    public GConfigPane config_pane = null;
     /** A reference to the currently instantiated help window, if any. */
     public HelpFrame help = null;
@@ -102 +108 @@
     public MenuBar menu_bar = null;
     public MetaAuditFrame meta_audit;
-    /** The metaedit pane is used to assign, edit and remove metadata from files within the collection. */
-    public MetaEditPane metaedit_pane = null;
-    /** The mirror pane contains controls for mirroring internet sites. */
-    public MirrorPane mirror_pane = null;
-    /** The preview pane contains a preview of your build collection. */
-    //public PreviewPane preview_pane = null;
     /** Are certain panes currently locked? */
     private boolean locked = false;
@@ -189 +189 @@
         // }
         if(cont) {
-        tab_pane.setSelectedComponent(collection_pane);
+        tab_pane.setSelectedComponent(gather_pane);
         }
     }
@@ -216 +216 @@
     else if(esrc == menu_bar.file_open) {
         if (showLoadCollectionBox()) {
-        tab_pane.setSelectedComponent(collection_pane);
+        tab_pane.setSelectedComponent(gather_pane);
         }
     }
     else if(esrc == menu_bar.file_options) {
          // Just incase the user has edited the GeneralSettings of a collection without losing focus afterwards. Well I'm forever losing foc... ooh shiney.
-         config_pane.loseFocus();
+         design_pane.loseFocus();
          // And spawn a new preferences.
         new Preferences();
@@ -292 +292 @@
     // *************
 //      else if(esrc == menu_bar.tools_size) {
-//          FileNode records[] = metaedit_pane.getSelectedNode();
+//          FileNode records[] = enrich_pane.getSelectedNode();
 //          if(records != null && records.length > 0) {
 //          ArrayList metadatum = Gatherer.c_man.getCollection().gdm.getMetadata(records[0].getFile());
@@ -369 +369 @@
         mirror_pane.afterDisplay();
     }
-    metaedit_pane.afterDisplay();
+    enrich_pane.afterDisplay();
     }
     /** Once a collection has been made available to Gatherer, either by its creation or by it being reloaded, we need to inform all the visual components to update necessary data components (such as tree models), enable certain controls that depend on a collection being accessible, and refresh themselves.
@@ -379 +379 @@
     }
     menu_bar.collectionChanged(ready); // Inform the menu bar that the collections changed.
-    collection_pane.collectionChanged(ready); // Used to update the collection workspace.
-    metaedit_pane.collectionChanged(ready); // Very important that metaedit pane shows current collection and is listening to latest msm.
-    config_pane.collectionChanged(ready); // Also important config pane is listening to latest msm.
+    gather_pane.collectionChanged(ready); // Used to update the collection workspace.
+    enrich_pane.collectionChanged(ready); // Very important that metaedit pane shows current collection and is listening to latest msm.
+    design_pane.collectionChanged(ready); // Also important config pane is listening to latest msm.
     create_pane.collectionChanged(ready); // Used to indicate a new BuildOptions model should be loaded.
     //preview_pane.collectionChanged(ready); // preview should know when teh coll has changed so it can reload the home page
@@ -468 +468 @@
         }
 
-        collection_pane = new CollectionPane(workspace_tree_sync, collection_tree_sync);
-        collection_pane.display();
+        gather_pane = new GatherPane(workspace_tree_sync, collection_tree_sync);
+        gather_pane.display();
         if(Gatherer.config.get("workflow.gather", true)) {
-        tab_pane.addTab("GUI.Gather", Utility.getImage("collection.gif"), collection_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(collection_pane), Gatherer.config.get("workflow.gather", false));
-        }
-
-        metaedit_pane = new MetaEditPane(collection_tree_sync);
-        metaedit_pane.display();
+        tab_pane.addTab("GUI.Gather", Utility.getImage("collection.gif"), gather_pane);
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(gather_pane), Gatherer.config.get("workflow.gather", false));
+        }
+
+        enrich_pane = new EnrichPane(collection_tree_sync);
+        enrich_pane.display();
         if(Gatherer.config.get("workflow.enrich", true)) {
-        tab_pane.addTab("GUI.Enrich", Utility.getImage("metaedit.gif"), metaedit_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(metaedit_pane), false);
-        }
-
-        config_pane = new GConfigPane();
-        config_pane.display();
+        tab_pane.addTab("GUI.Enrich", Utility.getImage("metaedit.gif"), enrich_pane);
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(enrich_pane), false);
+        }
+
+        design_pane = new DesignPane();
+        design_pane.display();
         if(Gatherer.config.get("workflow.design", true)) {
-        tab_pane.addTab("GUI.Design", Utility.getImage("build.gif"), config_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(config_pane), false);
+        tab_pane.addTab("GUI.Design", Utility.getImage("build.gif"), design_pane);
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(design_pane), false);
         }
 
@@ -510 +510 @@
         // Select the collect pane if it is available
         if(Gatherer.config.get("workflow.gather", false)) {
-        tab_pane.setSelectedComponent(collection_pane);
+        tab_pane.setSelectedComponent(gather_pane);
         }
         // Otherwise find the first tab that is enabled and select that.
@@ -539 +539 @@
     public void exit() {
     // Tell everyone who cares that they are losing focus
-    if(!Gatherer.c_man.ready() || config_pane.canSave()) {
+    if(!Gatherer.c_man.ready() || design_pane.canSave()) {
         boolean cont = true;
         if(Gatherer.c_man.ready() && !Gatherer.c_man.saved()) {
@@ -573 +573 @@
     locked = lock;
     if(import_stage) {
-        int collection_pos = tab_pane.indexOfComponent(collection_pane);
-        int metaedit_pos = tab_pane.indexOfComponent(metaedit_pane);
-        int config_pos = tab_pane.indexOfComponent(config_pane);
+        int collection_pos = tab_pane.indexOfComponent(gather_pane);
+        int metaedit_pos = tab_pane.indexOfComponent(enrich_pane);
+        int config_pos = tab_pane.indexOfComponent(design_pane);
         tab_pane.setEnabledAt(collection_pos, !lock);
         tab_pane.setEnabledAt(metaedit_pos, !lock);
@@ -581 +581 @@
     }
     else {
-        int config_pos = tab_pane.indexOfComponent(config_pane);
+        int config_pos = tab_pane.indexOfComponent(design_pane);
         tab_pane.setEnabledAt(config_pos, !lock);
     }
@@ -600 +600 @@
     collection_name = null;
     // Now pass on the message to anyone who cares
-    if(collection_pane != null) {
-        collection_pane.modeChanged(mode);
-    }
-    if(config_pane != null) {
-        config_pane.modeChanged(mode);
+    if(gather_pane != null) {
+        gather_pane.modeChanged(mode);
+    }
+    if(design_pane != null) {
+        design_pane.modeChanged(mode);
     }
     if(create_pane != null) {
         create_pane.modeChanged(mode);
     }
-    if(metaedit_pane != null) {
-        metaedit_pane.modeChanged(mode);
+    if(enrich_pane != null) {
+        enrich_pane.modeChanged(mode);
     }
     }
@@ -616 +616 @@
     public void refreshTrees(int refresh_reason)
     {
-    if (collection_pane != null) {
-        collection_pane.refreshWorkspaceTree(refresh_reason);
-        collection_pane.refreshCollectionTree(refresh_reason);
+    if (gather_pane != null) {
+        gather_pane.refreshWorkspaceTree(refresh_reason);
+        gather_pane.refreshCollectionTree(refresh_reason);
     }
     }
@@ -642 +642 @@
         //}
         //else 
-        if(component == metaedit_pane || component == config_pane || component == export_pane || component == create_pane) {
+        if(component == enrich_pane || component == design_pane || component == export_pane || component == create_pane) {
         tab_pane.setEnabledAt(index, state && Gatherer.c_man != null && Gatherer.c_man.ready());
         }
@@ -665 +665 @@
     // If the rawname was mirror then rebuild workspace tree to remove caches.
     if (rawname.equals("Mirror")) {
-        collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+        gather_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     }
     }
@@ -865 +865 @@
     // Close collection.
     // if(close_after) {
-    //  tab_pane.setSelectedComponent(collection_pane);
+    //  tab_pane.setSelectedComponent(gather_pane);
     //   Gatherer.c_man.closeCollection();
     //  }
@@ -884 +884 @@
         create_pane.loseFocus();
         }
-        else if(previous_pane == config_pane) {
-           config_pane.loseFocus();
+        else if(previous_pane == design_pane) {
+           design_pane.loseFocus();
         }
     }
@@ -894 +894 @@
     menu_bar.tabSelected(tab_pane.getSelectedIndex());
     int selected_index = tab_pane.getSelectedIndex();
-    if( selected_index == tab_pane.indexOfComponent(collection_pane)) {
-        collection_pane.gainFocus();
+    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(metaedit_pane)) {
-        metaedit_pane.gainFocus();
+    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(config_pane)) {
-        config_pane.gainFocus();
+    else if(selected_index == tab_pane.indexOfComponent(design_pane)) {
+        design_pane.gainFocus();
     }
     else if(selected_index == tab_pane.indexOfComponent(create_pane)) {
@@ -914 +914 @@
     }
     //else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(preview_pane)) {
-    //config_pane.saveConfiguration();
+    //design_pane.saveConfiguration();
     //preview_pane.gainFocus();
     //}
@@ -1012 +1012 @@
         //browse_pos = tab_pane.indexOfComponent(browser_pane);
         mirror_pos = tab_pane.indexOfComponent(mirror_pane);
-        metaedit_pos = tab_pane.indexOfComponent(metaedit_pane);
-        config_pos = tab_pane.indexOfComponent(config_pane);
+        metaedit_pos = tab_pane.indexOfComponent(enrich_pane);
+        config_pos = tab_pane.indexOfComponent(design_pane);
         export_pos = tab_pane.indexOfComponent(export_pane);
         create_pos = tab_pane.indexOfComponent(create_pane);

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

@@ -648 +648 @@
 
         Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
-        Gatherer.g_man.metaedit_pane.valueChanged((TreeSelectionEvent) null); // Refresh metadata table
+        Gatherer.g_man.enrich_pane.valueChanged((TreeSelectionEvent) null); // Refresh metadata table
 
         Gatherer.config.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());

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

@@ -415 +415 @@
         // Sort the metadata and update the table
         if (!killed) {
-        Gatherer.g_man.metaedit_pane.validateMetadataTable();
+        Gatherer.g_man.enrich_pane.validateMetadataTable();
         Collections.sort(current_metadata, MSMUtils.METADATA_COMPARATOR);
         fireTableDataChanged();

trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

@@ -678 +678 @@
         language_label.setPreferredSize(LABEL_SIZE);
         Dictionary.setText(language_label, "MEM.Language");
-        language_box = new JComboBox(Gatherer.g_man.config_pane.getLanguageCodes().toArray());
+        language_box = new JComboBox(Gatherer.g_man.design_pane.getLanguageCodes().toArray());
         language_box.setRenderer(new LanguageListCellRenderer());
         Dictionary.setTooltip(language_box, "MEM.Attribute_Language_Tooltip");