Changeset 5212

Timestamp:

2003-08-19T15:41:06+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B012 - consistant layout

File:

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

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

@@ -222 +222 @@
         super();
         // Creation
-        JPanel subindex_pane = new JPanel();
         JPanel subcollection_panel = new JPanel();
         JPanel subindex_name_panel = new JPanel();
@@ -273 +272 @@
         subcollectionindex_name_field.getDocument().addDocumentListener(new SubcollectionIndexListener());
         subcollection_list.addListSelectionListener(new SubcollectionIndexListener());
+        
+        JPanel temp_pane = new JPanel();
 
         // Layout
-        subindex_name_panel.setLayout(new BorderLayout());
-        subindex_name_panel.add(subindex_name_label, BorderLayout.WEST);
-        subindex_name_panel.add(subcollectionindex_name_field, BorderLayout.CENTER);
-
-        list_pane.setLayout(new BorderLayout());
-        list_pane.add(subcollection_label, BorderLayout.NORTH);
-        list_pane.add(new JScrollPane(subcollection_list), BorderLayout.CENTER);
-        
-        subcollection_panel.setLayout(new BorderLayout());
-        subcollection_panel.add(subindex_name_panel, BorderLayout.NORTH);
-        subcollection_panel.add(list_pane, BorderLayout.CENTER);
 
         default_label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
 
-        default_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createRaisedBevelBorder()), BorderFactory.createEmptyBorder(2,2,2,2)));
+        default_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createRaisedBevelBorder(), BorderFactory.createEmptyBorder(2,2,2,2)));
         default_pane.setLayout(new BorderLayout());
         default_pane.add(default_label, BorderLayout.WEST);
@@ -299 +289 @@
         subindexes_pane.add(default_pane, BorderLayout.SOUTH);
         
-        subindex_pane.setLayout(new GridLayout(1,2,5,0));
-        subindex_pane.add(subcollection_panel);
-        subindex_pane.add(subindexes_pane);
-
-        button_pane.setLayout(new GridLayout(2,2));
+        subindex_name_panel.setLayout(new BorderLayout());
+        subindex_name_panel.add(subindex_name_label, BorderLayout.WEST);
+        subindex_name_panel.add(subcollectionindex_name_field, BorderLayout.CENTER);
+
+        list_pane.setBorder(BorderFactory.createEmptyBorder(5,0,2,0));
+        list_pane.setLayout(new BorderLayout());
+        list_pane.add(subcollection_label, BorderLayout.NORTH);
+        list_pane.add(new JScrollPane(subcollection_list), BorderLayout.CENTER);
+        
+        button_pane.setLayout(new GridLayout(1,4));
         button_pane.add(add_index_button);
         button_pane.add(remove_index_button);
         button_pane.add(clear_default_button);
         button_pane.add(set_default_button);
+
+        temp_pane.setLayout(new GridLayout(2,1,0,5));
+        temp_pane.add(subindex_name_panel);
+        temp_pane.add(button_pane);
+
+        subcollection_panel.setLayout(new BorderLayout());
+        //subcollection_panel.add(subindex_name_panel, BorderLayout.NORTH);
+        subcollection_panel.add(list_pane, BorderLayout.CENTER);
+        //subcollection_panel.add(button_pane, BorderLayout.SOUTH);
+        subcollection_panel.add(temp_pane, BorderLayout.SOUTH);
         
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         setLayout(new BorderLayout());
-        add(subindex_pane, BorderLayout.CENTER);
-        add(button_pane, BorderLayout.SOUTH);
+        add(subindexes_pane, BorderLayout.CENTER);
+        add(subcollection_panel, BorderLayout.SOUTH);
     }