Changeset 7923

Timestamp:

2004-08-10T11:24:13+12:00 (20 years ago)

Author:

davidb

Message:

GLI applet now only quits once the web page with the launch button
is replaced in the browser with a new page.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• GathererApplet.java (modified) (3 diffs)

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

@@ -113 +113 @@
     /** A public reference to the GUIManager. */
     static public GUIManager g_man;
+    static public boolean g_man_built = false;
+
     /** A static reference to ourselves. */
     static public Gatherer self;
@@ -374 +376 @@
     if (splash != null) { splash.toFront(); }
 
-    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();
+    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 (splash != null) {
@@ -431 +440 @@
     }
 
+    // Store the current position and size (if reasonable) of the Gatherer for next time
+    Rectangle bounds = g_man.getBounds();
+    config.setBounds("general.bounds", true, bounds);
+
+    // Save configuration.
+    saveConfig();
+
     // Get the gui to deallocate
     g_man.hide();
     g_man.destroy();
-
-    // Store the current position and size (if reasonable) of the Gatherer for next time
-    Rectangle bounds = g_man.getBounds();
-    config.setBounds("general.bounds", true, bounds);
-
-    // Save configuration.
-    saveConfig();
+    g_man_built = false;
+
 
     // Flush dictionary

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

@@ -94 +94 @@
     public void init()
     {
-    // Work-around to reduce number of 
-    // 'Could not lock user prefs' error messages.
-    // Thanks to Walter Schatz from the java forums.
-    System.setProperty("java.util.prefs.syncInterval","2000000");
+    try {
+        // Work-around to reduce number of 
+        // 'Could not lock user prefs' error messages.
+        // Thanks to Walter Schatz from the java forums.
+        System.setProperty("java.util.prefs.syncInterval","2000000");
+    }
+
+    catch (Exception exception) {
+        // convenient way of finding out if user has agreed to
+        // to requested security settings
+
+        JLabel lab 
+        = new JLabel("Greenstone Librarian Interface Applet deactivated",
+                 JLabel.CENTER);
+        getContentPane().add(lab);
+        return;
+    }
 
     // Ensure platform specific LAF
@@ -187 +200 @@
     bttn.addActionListener(this);
     getContentPane().add(bttn);
-
-    // getContentPane().add("Center", g_man.getRootPane());
     }
 
@@ -215 +226 @@
     public void actionPerformed(ActionEvent e)
     {
-        Object obj = e.getSource();
-
-    // Splash screen.
-    // Splash splash = new Splash();
-
     Splash splash = null;