Changeset 4495

Timestamp:

2003-06-06T09:54:24+12:00 (21 years ago)

Author:

jmt12

Message:

2030104: Bug fix for when viewing the SuperCollection pane for the view time (when selection is null).

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java

@@ -162 +162 @@
 
     private boolean init = true;
-    private JSplitPane center_pane;
+    //private JSplitPane center_pane;
 
     Control() {
         super();
         // Creation
+        JPanel header_panel = new JPanel();
+        
         JLabel title_label = new JLabel(get("Title"));
         title_label.setHorizontalAlignment(JLabel.CENTER);
         title_label.setOpaque(true);
 
-        center_pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+        //center_pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
 
         JTextArea instructions = new JTextArea(get("Instructions"));
@@ -183 +185 @@
 
         // Layout
-        center_pane.setTopComponent(new JScrollPane(instructions));
-        center_pane.setBottomComponent(new JScrollPane(collection_checklist));
-
+        //center_pane.setTopComponent(new JScrollPane(instructions));
+        //center_pane.setBottomComponent(new JScrollPane(collection_checklist));
+        header_panel.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        header_panel.setLayout(new BorderLayout());
+        header_panel.add(title_label, BorderLayout.NORTH);
+        header_panel.add(new JScrollPane(instructions), BorderLayout.CENTER);
+        
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         setLayout(new BorderLayout());
-        add(title_label, BorderLayout.NORTH);
-        add(center_pane, BorderLayout.CENTER);
+        add(header_panel, BorderLayout.NORTH);
+        add(new JScrollPane(collection_checklist), BorderLayout.CENTER);
     }
 
@@ -195 +201 @@
         super.paint(g);
         // If this is the first time we've painted this control, then set the divider 1/3:2/3
-        if(init) {
-        init = false;
-        center_pane.setDividerLocation(0.3);
-        super.paint(g);
-        }
+        //if(init) {
+        //  init = false;
+        //  center_pane.setDividerLocation(0.3);
+        //  super.paint(g);
+        //}
     }
     }