Changeset 12127

Timestamp:

2006-07-10T15:53:48+12:00 (18 years ago)

Author:

kjdon

Message:

changed the layout of the NewIndexPrompt. also removed allfields box stuff. this needss to be a button, but I am not sure where to put it yet

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java (modified) (8 diffs)

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

@@ -641 +641 @@
         // mg uses a level box
         private JComboBox level_combobox;
-        // mgpp has a allfields selector
-        private JCheckBox allfields_box;
 
         private JButton add_button;
@@ -654 +652 @@
         private JPanel labels_pane;
         private JLabel level_label;
-        private JPanel allfields_pane;
 
         private boolean mgpp_enabled = false;
@@ -681 +678 @@
 
         JPanel details_pane = new JPanel();
-        labels_pane = new JPanel();
-        boxes_pane = new JPanel();
-
         JPanel main_index_pane = new JPanel();
-
+        
+        
         JLabel source_label = new JLabel(Dictionary.get("CDM.IndexManager.Source"));
         source_list = new CheckList(false);
@@ -735 +730 @@
         button_pane.add(cancel_button);
 
-        // Layout
-        labels_pane.setLayout(new BorderLayout());
-        labels_pane.setBorder(BorderFactory.createEmptyBorder(5, 5, 10, 5));
-        labels_pane.add(source_label, BorderLayout.CENTER);
-        
-        boxes_pane.setLayout(new BorderLayout());
-        boxes_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
-        
-        details_pane.setLayout(new BorderLayout());
-        details_pane.add(labels_pane, BorderLayout.WEST);
-        details_pane.add(boxes_pane, BorderLayout.CENTER);
+        //Layout
+        details_pane.setLayout(new BorderLayout(10,10));
+        details_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        details_pane.add(source_label, BorderLayout.NORTH);
+        details_pane.add(new JScrollPane(source_list), BorderLayout.CENTER);
 
 
@@ -759 +748 @@
             level_combobox.setEditable(false);
             level_combobox.setToolTipText(Dictionary.get("CDM.IndexManager.Level_Tooltip"));
-            labels_pane.add(level_label, BorderLayout.SOUTH);
-            boxes_pane.add(level_combobox, BorderLayout.SOUTH);
-
-        } else {
-            allfields_pane = new JPanel();
-            allfields_box = new JCheckBox();
-            JLabel allfields_label = new JLabel(Dictionary.get("CDM.IndexManager.Allfields_Index"));
-            allfields_pane.setLayout(new BorderLayout());
-            allfields_pane.add(allfields_box, BorderLayout.WEST);
-            allfields_pane.add(allfields_label, BorderLayout.CENTER);
-        
+            JPanel level_pane = new JPanel();
+            level_pane.setLayout(new BorderLayout());
+            level_pane.add(level_label, BorderLayout.WEST);
+            level_pane.add(level_combobox, BorderLayout.CENTER);
+            details_pane.add(level_pane, BorderLayout.SOUTH);
 
         }
@@ -775 +758 @@
         if (existing_index !=null) {
             ArrayList sources = existing_index.getSources();
-            if (mgpp_enabled && sources.get(0).equals(ALLFIELDS)) {
-            source_list.setEnabled(false);
-            allfields_box.setSelected(true);
-            } else {
-            source_list.setTickedObjects(sources.toArray());
-            source_list.setEnabled(true); 
-            }
+            source_list.setTickedObjects(sources.toArray());
+            source_list.setEnabled(true); 
             if (!mgpp_enabled) {
             level_combobox.setSelectedIndex(existing_index.getLevel());
             }
-        
+            
         }
         content_pane.setLayout(new BorderLayout());
@@ -817 +795 @@
         {
             Index index;
-            if (mgpp_enabled && allfields_box.isSelected()) {
-            ArrayList sources = new ArrayList();
-            sources.add(ALLFIELDS);
-            index = new Index(sources);
-            }
-            else if (!source_list.isNothingTicked()) {
+            if (!source_list.isNothingTicked()) {
             ArrayList sources = source_list.getTicked();
             if(mgpp_enabled) {
@@ -918 +891 @@
             ArrayList sources;
             Index index = null;
-            if (mgpp_enabled && allfields_box.isSelected()) {
-            sources = new ArrayList();
-            sources.add(ALLFIELDS);
-            index = new Index(sources);
-            } 
-            else if (!source_list.isNothingTicked()) {
+            if (!source_list.isNothingTicked()) {
             sources = source_list.getTicked();
             if (mgpp_enabled) {