Changeset 38799 for main/trunk/greenstone3/src

Timestamp:

2024-02-27T19:13:43+13:00 (3 months ago)

Author:

anupama

Message:

1. ScrollPane wasn't being used and it didn't workout with the way the code used the scrollbar to calculate positioning, so I instantiated and used a JScrollBar instead in the same manner the awt ScrollBar was being used. 2. JResultTitle bar (JResultBox's row of column headings) wasn't appearing and neither was the scrollbar, or else the centre pane (ResultCanvas with results) wasn't appearing. The layout wasn't working except on resize. The solution was that ordering of adding to the layout had an effect. (Instantiating the objects added to the layout was order dependent also, as one kept a pointer to the other.) The solution turned to setPreferredSize() on the JResultTitle in its constructor, rather than calling setSize(). This fixed the layout and now I don't want to fiddle with it any more as it works out for the JApplet just as for the Applet, and still works when the JPhind JApplet class is run as an application from the commandline as well.

Location:

main/trunk/greenstone3/src/java/org/greenstone/applet/phind

Files:

• JResultBox.java (modified) (4 diffs)
• JResultCanvas.java (modified) (1 diff)
• JResultTitle.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/applet/phind/JResultBox.java

@@ -40 +40 @@
 
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JScrollBar;
 import javax.swing.JLabel;
@@ -71 +70 @@
     JResultCanvas c;
     JResultTitle t;
-    JScrollPane scrollpane;
     JScrollBar s;
     JPanel label;
@@ -137 +135 @@
     // Porting from awt to swing
     // http://fizyka.umk.pl/~jacek/docs/javatutorial/uiswing/converting/how.html
+    
+    s = new JScrollBar(JScrollBar.VERTICAL);    
+    disableScrollbar();
+    s.addAdjustmentListener(this);
+
     this.setLayout(new BorderLayout());
-
-    scrollpane = new JScrollPane(this);//,
-    //JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-    //JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-    s = new JScrollBar(JScrollBar.VERTICAL);
-    scrollpane.setVerticalScrollBar(s);
-    
-    disableScrollbar();
-    scrollpane.getVerticalScrollBar().addAdjustmentListener(this);
-
+    
     c = new JResultCanvas(this);
-    this.add(c, BorderLayout.CENTER);
-
-
-    t = new JResultTitle(this);
+    t = new JResultTitle(this); // calls setPreferredSize() which finally made layout work
+    
     this.add(t, BorderLayout.NORTH);
-
+    
+    JPanel centrePane = new JPanel();
+    centrePane.setLayout(new BorderLayout());
+    centrePane.add(s, BorderLayout.EAST);
+    centrePane.add(c, BorderLayout.CENTER); 
+    this.add(centrePane, BorderLayout.CENTER);
+    
     buffer = "";
     finished = false;
@@ -191 +189 @@
 
     void disableScrollbar() {
-    JScrollBar s = scrollpane.getVerticalScrollBar();
     if (s.isEnabled()) {
         s.setValues(0, 1, 0, 1);

main/trunk/greenstone3/src/java/org/greenstone/applet/phind/JResultCanvas.java

@@ -57 +57 @@
 import java.awt.event.MouseAdapter;
 import java.net.URL;
-import java.applet.Applet;
 import java.util.Date;
 

main/trunk/greenstone3/src/java/org/greenstone/applet/phind/JResultTitle.java

@@ -72 +72 @@
     Dimension d = getSize();
     d.height = phind.fontSize + 10;
-    setSize(d);
-    
+    setPreferredSize(d);
     
     }