Changeset 5340 for trunk/gli

Timestamp:

2003-08-29T09:50:08+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed a bug that prevented Design view from being loaded by itself

Location:

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

Files:

• GConfigPane.java (modified) (1 diff)
• GUIManager.java (modified) (3 diffs)

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

@@ -82 +82 @@
     }
     public void gainFocus() {
-    cdm.gainFocus();
+    if(cdm == null && Gatherer.c_man.ready()) {
+        // Retrieve the new config manager.
+        cdm = Gatherer.c_man.getCollection().cdm;
+        // Display it.
+        cdm.display(this);
+    }
+    if(cdm != null) {
+        cdm.gainFocus();
+    }
     }
 

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

@@ -396 +396 @@
         this.setTitle(Utility.PROGRAM_NAME + ": " + get("Collection.No_Collection"));
         }
-                // Pretty corner icon
+        // Pretty corner icon
         this.setIconImage(Utility.getImage("gatherer_small.gif").getImage());
-                // BorderLayout for the main screen. I'll try my best to avoid t
-                // hese in subcomponents as they're space greedy.
+        // BorderLayout for the main screen. I'll try my best to avoid t
+        // hese in subcomponents as they're space greedy.
         content_pane.setLayout(new BorderLayout());
-                // Create the menu-bar and stick it up the top.
+        // Create the menu-bar and stick it up the top.
         menu_bar = new MenuBar(new MenuListenerImpl());
         content_pane.add(menu_bar, BorderLayout.NORTH);
-                // Create the tabbed pane and plop it in the center where it will
-                // expand to consume all available space like any good gas would.
+        // Create the tabbed pane and plop it in the center where it will
+        // expand to consume all available space like any good gas would.
         tab_pane = new JTabbedPane();
         tab_pane.addChangeListener(this);
         tab_pane.setFont(Gatherer.config.getFont("general.font", false));
 
-                // May have to play with the order in which tabs are added.
+        // May have to play with the order in which tabs are added.
+        browser_pane = new BrowsingPane();
         if(Gatherer.config.get("workflow.browse", true)) {
-        browser_pane = new BrowsingPane();
         tab_pane.addTab(get("Browser"), Utility.getImage("browsing.gif"), browser_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(browser_pane), Gatherer.config.get("workflow.browse", false));
         }
 
+        mirror_pane = new MirrorPane();
         if(Gatherer.config.get("workflow.mirror", true)) {
-        mirror_pane = new MirrorPane();
         tab_pane.addTab(get("Mirroring"), Utility.getImage("mirroring.gif"), mirror_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get("workflow.mirror", false));
         }
 
+        collection_pane = new CollectionPane(workspace_tree_sync, collection_tree_sync);
+        collection_pane.display();
         if(Gatherer.config.get("workflow.gather", true)) {
-        collection_pane = new CollectionPane(workspace_tree_sync, collection_tree_sync);
-        collection_pane.display();
         tab_pane.addTab(get("Collection"), 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();
         if(Gatherer.config.get("workflow.enrich", true)) {
-        metaedit_pane = new MetaEditPane(collection_tree_sync);
-        metaedit_pane.display();
         tab_pane.addTab(get("MetaEdit"), Utility.getImage("metaedit.gif"), metaedit_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(metaedit_pane), false);
         }
 
+        config_pane = new GConfigPane();
+        config_pane.display();
         if(Gatherer.config.get("workflow.design", true)) {
-        config_pane = new GConfigPane();
-        config_pane.display();
         tab_pane.addTab(get("Build"), Utility.getImage("build.gif"), config_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(config_pane), false);
@@ -449 +449 @@
         }
 
+        create_pane = new CreatePane();
+        create_pane.display();
         if(Gatherer.config.get("workflow.create", true)) {
-        create_pane = new CreatePane();
-        create_pane.display();
         tab_pane.addTab(get("Create"), Utility.getImage("build session.gif"), create_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(create_pane), false);
         }
 
+        preview_pane = new PreviewPane();
+        preview_pane.display();
         if(Gatherer.config.get("workflow.preview", true)) {
-        preview_pane = new PreviewPane();
-        preview_pane.display();
         tab_pane.addTab(get("Preview"), Utility.getImage("final.gif"), preview_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(preview_pane), false);
         }
 
-                // Find the first tab that is enabled and select that.
+        // Find the first tab that is enabled and select that.
         boolean found = false;
         for(int i = 0; !found && i < tab_pane.getTabCount(); i++) {
@@ -473 +473 @@
 
         content_pane.add(tab_pane, BorderLayout.CENTER);
-                // Drive a sessionReady event to update all controls to reflect current collection status.
+        // Drive a sessionReady event to update all controls to reflect current collection status.
         collectionChanged(Gatherer.c_man.ready());
     }
     catch (Exception e) {
         Gatherer.printStackTrace(e);
-                // The GUI failing to build is a app killer
+        // The GUI failing to build is a app killer
         e.printStackTrace();
         System.exit(1);