Changeset 13058

Timestamp:

2006-10-09T16:58:36+13:00 (18 years ago)

Author:

kjdon

Message:

uses the new IndexOptionManager instead of LevelManager, and buildtype changes handled by that object rather than by this object. stem/case/accentfold now done by IndexOptionManager not by this.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/IndexingManager.java (modified) (9 diffs)

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

@@ -46 +46 @@
 
 
-/** This class is responsible for coordinating the IndexManager and LevelManager and BuildTypeManager into one panel  
+/** This class is responsible for coordinating the IndexManager and IndexOptionManager (controls levels, stem options etc) and BuildTypeManager into one panel  
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3
@@ -52 +52 @@
 public class IndexingManager {
 
-    private LevelManager level_manager = null;
+    private IndexOptionManager option_manager = null;
     private IndexManager index_manager = null;
     private BuildTypeManager build_type_manager = null;
 
-    private JCheckBox stem_checkbox = new JCheckBox();
-    private JCheckBox casefold_checkbox = new JCheckBox();
-    private JCheckBox accent_fold_checkbox = new JCheckBox();
 
     private String build_type = null;
@@ -69 +66 @@
     build_type_manager = new BuildTypeManager();
     build_type = build_type_manager.getBuildType();
-    level_manager = new LevelManager(CollectionDesignManager.collect_config.getLevels(), build_type); 
+    option_manager = new IndexOptionManager(build_type);
     if (build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
         index_manager = new IndexManager(CollectionDesignManager.collect_config.getMGIndexes(), build_type);
@@ -90 +87 @@
 
     public int getNumLevels() {
-    return level_manager.getSize();
+    return option_manager.getNumLevels();
     }
 
@@ -101 +98 @@
     }
 
-    public String getIndexingOptionsString()
-    {
-    if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
-        return "";
-    }
-
-    String indexing_options_string = "";
-    indexing_options_string += (stem_checkbox.isSelected() ? "stem " : "");
-    indexing_options_string += (casefold_checkbox.isSelected() ? "casefold " : "");
-    indexing_options_string += (accent_fold_checkbox.isSelected() ? "accentfold " : "");
-    return indexing_options_string;
-    }
-
     public ArrayList getLevels() {
     if (!build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
-        return level_manager.getLevels();
+        return option_manager.getLevels();
     }
     return null;
@@ -144 +128 @@
     implements Control, BuildTypeManager.BuildTypeListener
     {
-    JPanel index_plus_options_panel = null;
-    JPanel indexing_options_panel = null;
-    JPanel level_panel = null;
     JPanel main_index_pane = null;
+    JPanel index_options_panel = null;
 
     public IndexingControl() {
@@ -157 +139 @@
         JPanel build_type_panel = (JPanel)build_type_manager.getControls();
         JPanel index_panel = (JPanel)index_manager.getControls();
-        level_panel = (JPanel)level_manager.getControls();
-
-        index_plus_options_panel = new JPanel();
-        index_plus_options_panel.setLayout(new BorderLayout());
-        index_plus_options_panel.add(index_panel, BorderLayout.CENTER);
-        indexing_options_panel = new IndexingOptionsControl();
-        if (!build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
-        index_plus_options_panel.add(indexing_options_panel, BorderLayout.SOUTH);
-        }
+        index_options_panel = (JPanel)option_manager.getControls();
 
         main_index_pane = new JPanel();
         main_index_pane.setLayout(new BorderLayout());
         main_index_pane.add(build_type_panel, BorderLayout.NORTH);
-        main_index_pane.add(index_plus_options_panel, BorderLayout.CENTER);
-        if (!build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
-        main_index_pane.add(level_panel, BorderLayout.SOUTH);
-        }
+        main_index_pane.add(index_panel, BorderLayout.CENTER);
+        main_index_pane.add(index_options_panel, BorderLayout.SOUTH);
         
         setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
@@ -182 +154 @@
         build_type_manager.addBuildTypeListener(this);
         build_type_manager.addBuildTypeListener(index_manager);
-        build_type_manager.addBuildTypeListener(level_manager);
+        build_type_manager.addBuildTypeListener(option_manager);
     }
 
@@ -195 +167 @@
         return;
         }
-
-        // Show/hide the indexing options panel
-        if (build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
-        // Changing to MG/MGPP
-        index_plus_options_panel.add(indexing_options_panel, BorderLayout.SOUTH);
-        }
-        else if (new_build_type.equals(BuildTypeManager.BUILD_TYPE_LUCENE)) {
-        // Changing to Lucene
-        index_plus_options_panel.remove(indexing_options_panel);
-        }
-        // Accent-folding is currently not available for MG
-        accent_fold_checkbox.setEnabled(!new_build_type.equals(BuildTypeManager.BUILD_TYPE_MG));
-
-        // Show/hide the levels panel
-        if (build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
-        // Changing to MGPP/Lucene
-        level_panel.setEnabled(true);
-        main_index_pane.add(level_panel, BorderLayout.SOUTH);
-        }
-        else if (new_build_type.equals(BuildTypeManager.BUILD_TYPE_MG)) {
-        // Changing to MG
-        level_panel.setEnabled(false);
-        main_index_pane.remove(level_panel);
-        }
-
-        build_type = new_build_type;
+        build_type = new_build_type;
     }
 
-
-    private class IndexingOptionsControl
-        extends JPanel
-    {
-        public IndexingOptionsControl()
-        {
-        setLayout(new BorderLayout(10,10));
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-
-        stem_checkbox.setText(Dictionary.get("CDM.IndexingManager.Stem"));
-        casefold_checkbox.setText(Dictionary.get("CDM.IndexingManager.Casefold"));
-        accent_fold_checkbox.setText(Dictionary.get("CDM.IndexingManager.Accent_fold"));
-
-        // Accent-folding is currently not available for MG
-        accent_fold_checkbox.setEnabled(!build_type.equals(BuildTypeManager.BUILD_TYPE_MG));
-
-        JPanel checkbox_panel = new JPanel();
-        checkbox_panel.setLayout(new GridLayout(1, 3));
-        checkbox_panel.add(stem_checkbox);
-        checkbox_panel.add(casefold_checkbox);
-        checkbox_panel.add(accent_fold_checkbox);
-
-        add(new JLabel(Dictionary.get("CDM.IndexingManager.Options")), BorderLayout.WEST);
-        add(checkbox_panel, BorderLayout.CENTER);
-        }
-    }
     }
 }