Changeset 38922

Timestamp:

2024-04-09T19:46:25+12:00 (8 weeks ago)

Author:

anupama

Message:

Status bar is not used and hiding it produces the strange effect where space for the bar is sometimes allocated and sometimes not. So I'm removing the statusbar again by setting it to null, not just hiding it after creating and setting it up.

File:

• main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java

@@ -144 +144 @@
     //setLayout(new BorderLayout());
     //if(!isRunAsApplet) {
-    statusBar = new JLabel();   
+    statusBar = null; //new JLabel();
+    
     //this.add(statusBar, BorderLayout.SOUTH);
-    /*
-    Window win = SwingUtilities.getWindowAncestor(this);
-    if(win instanceof JFrame) {
-        JFrame topFrame = (JFrame)win;
-        topFrame.add(statusBar, BorderLayout.SOUTH);
-    } else { //AppletViewer or browser
-        this.add(statusBar, BorderLayout.SOUTH);
-    }*/
+    
+    ///Window win = SwingUtilities.getWindowAncestor(this);
+    ///if(win instanceof JFrame) {
+    ///    JFrame topFrame = (JFrame)win;
+    ///    topFrame.add(statusBar, BorderLayout.SOUTH);
+    ///} else { //AppletViewer or browser
+    ///    this.add(statusBar, BorderLayout.SOUTH);
+    ///}
     
     //Dimension d = statusBar.getSize();
@@ -273 +274 @@
     // we'll now always show and print to our manually added statusBar now
     // not only if(!isRunAsApplet) when we needed to manually create a statusBar.
-    this.statusBar.setText(msg);
+    if(this.statusBar != null) {
+        this.statusBar.setText(msg);
+    }
     if(isRunAsApplet) {
         super.showStatus(msg);
@@ -287 +290 @@
     // gets the parameters specified
     String showStatusBar        = getParameter("statusbar");
-    if(showStatusBar == null || showStatusBar.equals("0")) {
-        System.err.println("### Hiding status bar (default)");
-        statusBar.setVisible(false);
-    }   
+    if(statusBar == null) {
+        System.err.println("### Status bar code turned off. Ignoring statusbar settings.");
+    } else {
+        if(showStatusBar == null || showStatusBar.equals("0")) {
+        System.err.println("### Hiding status bar (default)");
+        statusBar.setVisible(false);
+        }
+    }
     String verbosity_param      = getParameter("verbosity");
     String is_java2_param       = getParameter("isJava2");
@@ -708 +715 @@
         
         // status bar code. Not ideal, but had to add it here to get relative dimensions right
-        collageApp.setLayout(new BorderLayout());
         JLabel statusBar = collageApp.getStatusBar();
-        frame.add(statusBar, BorderLayout.SOUTH);
-        Dimension d = statusBar.getSize();
-        d.height = EXTRA_HEIGHT;
-        d.width = collageApp.getWidth();
-        statusBar.setPreferredSize(d);
-        //statusBar.setPreferredSize(new Dimension(collageApp.getWidth(), EXTRA_HEIGHT));    
+        if(statusBar != null) {
+        collageApp.setLayout(new BorderLayout());
+        
+        frame.add(statusBar, BorderLayout.SOUTH);
+        Dimension d = statusBar.getSize();
+        d.height = EXTRA_HEIGHT;
+        d.width = collageApp.getWidth();
+        statusBar.setPreferredSize(d);
+        //statusBar.setPreferredSize(new Dimension(collageApp.getWidth(), EXTRA_HEIGHT));    
+        }
         
         // Run it at last: manually calling (J)Applet methods init() and start()