Changeset 14228

Timestamp:

2007-07-09T10:40:52+12:00 (17 years ago)

Author:

xiao

Message:

add a method to disable the menu bar items (file and edit) while the gli is openning a collection which was left open from last time

File:

• gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/Gatherer.java

@@ -402 +402 @@
     // Create GUI Manager (last) or else suffer the death of a thousand NPE's
     g_man = new GUIManager(size);
-    }
-
-
-    public void openGUI()
-    {
-    // Size and place the frame on the screen
-    Rectangle bounds = Configuration.getBounds("general.bounds", true);
-    if (bounds == null) {
-        // Choose a sensible default value
-        bounds = new Rectangle(0, 0, 640, 480);
-    }
-    
-    // Ensure width and height are reasonable
-    size = bounds.getSize();
-    if (size.width < 640) {
-        size.width = 640;
-    }
-    else if (size.width > Configuration.screen_size.width && Configuration.screen_size.width > 0) {
-        size.width = Configuration.screen_size.width;
-    }
-    if (size.height < 480) {
-        size.height = 480;
-    }
-    else if (size.height > Configuration.screen_size.height && Configuration.screen_size.height > 0) {
-        size.height = Configuration.screen_size.height;
-    }
-
-    if (!g_man_built) {
-
-        g_man.display();
-
-        // Place the window in the desired location on the screen, if this is do-able (not under most linux window managers apparently. In fact you're lucky if they listen to any of your screen size requests).
-        g_man.setLocation(bounds.x, bounds.y);
-        g_man.setVisible(true);
-
-        // After the window has been made visible, check that it is in the correct place
-        // sometimes java places a window not in the correct place, 
-        // but with an offset. If so, we work out what the offset is
-        // and change the desired location to take that into account 
-        Point location = g_man.getLocation();
-        int x_offset = bounds.x - location.x;
-        int y_offset = bounds.y - location.y;
-        // If not, offset the window to move it into the correct location
-        if (x_offset > 0 || y_offset > 0) {
-        ///ystem.err.println("changing the location to "+(bounds.x + x_offset)+" "+ (bounds.y + y_offset));
-        g_man.setLocation(bounds.x + x_offset, bounds.y + y_offset);
-        }
-
-        // The 'after-display' triggers several events which don't occur until after the visual components are actually available on screen. Examples of these would be the various html renderings, as they can't happen offscreen.
-        g_man.afterDisplay();
-        g_man_built = true;
-    }
-    else {
-        g_man.setVisible(true);
-    }
-
-    // Get a list of the core Greenstone classifiers and plugins
-    Classifiers.loadClassifiersList(null);
-    Plugins.loadPluginsList(null);
-
-    // If using a remote Greenstone we need to download the collection configurations now
-    if (Gatherer.isGsdlRemote) {
-        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
-        // !! Something went wrong downloading the collection configurations
-        System.err.println("Error: Could not download collection configurations.");
-        System.exit(0);
-        }
-    }
-
-    // If there was a collection left open last time, reopen it
-    c_man.openCollectionFromLastTime();
-    }
-
+
+    }
+
+
+    public void openGUI() {
+      // Size and place the frame on the screen
+      Rectangle bounds = Configuration.getBounds("general.bounds", true);
+      if (bounds == null) {
+        // Choose a sensible default value
+        bounds = new Rectangle(0, 0, 640, 480);
+      }
+      
+      // Ensure width and height are reasonable
+      size = bounds.getSize();
+      if (size.width < 640) {
+        size.width = 640;
+      } else if (size.width > Configuration.screen_size.width && Configuration.screen_size.width > 0) {
+        size.width = Configuration.screen_size.width;
+      }
+      if (size.height < 480) {
+        size.height = 480;
+      } else if (size.height > Configuration.screen_size.height && Configuration.screen_size.height > 0) {
+        size.height = Configuration.screen_size.height;
+      }
+      
+      if (!g_man_built) {
+        
+        g_man.display();
+        
+        // Place the window in the desired location on the screen, if this is do-able (not under most linux window managers apparently. In fact you're lucky if they listen to any of your screen size requests).
+        g_man.setLocation(bounds.x, bounds.y);
+        g_man.setVisible(true);
+        
+        // After the window has been made visible, check that it is in the correct place
+        // sometimes java places a window not in the correct place,
+        // but with an offset. If so, we work out what the offset is
+        // and change the desired location to take that into account
+        Point location = g_man.getLocation();
+        int x_offset = bounds.x - location.x;
+        int y_offset = bounds.y - location.y;
+        // If not, offset the window to move it into the correct location
+        if (x_offset > 0 || y_offset > 0) {
+          ///ystem.err.println("changing the location to "+(bounds.x + x_offset)+" "+ (bounds.y + y_offset));
+          g_man.setLocation(bounds.x + x_offset, bounds.y + y_offset);
+        }
+        
+        // The 'after-display' triggers several events which don't occur until after the visual components are actually available on screen. Examples of these would be the various html renderings, as they can't happen offscreen.
+        g_man.afterDisplay();
+        g_man_built = true;
+      } else {
+        g_man.setVisible(true);
+      }
+  if (open_collection_file_path != null) {
+      //the menu bar stuff (file, edit) have to be disabled while a collection opened 
+      //from last session being opened in a different thread
+      setMenuBarEnabled(false);
+  }      
+      // Get a list of the core Greenstone classifiers and plugins
+      Classifiers.loadClassifiersList(null);
+      Plugins.loadPluginsList(null);
+      
+      // If using a remote Greenstone we need to download the collection configurations now
+      if (Gatherer.isGsdlRemote) {
+        if (RemoteGreenstoneServer.downloadCollectionConfigurations().equals("")) {
+          // !! Something went wrong downloading the collection configurations
+          System.err.println("Error: Could not download collection configurations.");
+          System.exit(0);
+        }
+      }
+      // If there was a collection left open last time, reopen it
+      c_man.openCollectionFromLastTime();
+
+    }
+    public static void setMenuBarEnabled(boolean enabled) {
+      g_man.menu_bar.file.setEnabled(enabled);
+      g_man.menu_bar.edit.setEnabled(enabled);
+    }
 
     /** Exits the Gatherer after ensuring that things needing saving are saved.
@@ -624 +628 @@
     {
     if (g_man != null) {
+
         g_man.refresh(refresh_reason, c_man.ready());
     }