Changeset 36135

Timestamp:

2022-04-11T11:51:58+12:00 (2 years ago)

Author:

kjdon

Message:

added solr option to build types. Also setCaretPosition on the indexer description area so it always starts scrolled to the top

File:

• main/trunk/gli/src/org/greenstone/gatherer/cdm/BuildTypeManager.java (modified) (10 diffs)

main/trunk/gli/src/org/greenstone/gatherer/cdm/BuildTypeManager.java

@@ -21 +21 @@
     static final public String BUILD_TYPE_MGPP = "mgpp";
     static final public String BUILD_TYPE_LUCENE = "lucene";
+    static final public String BUILD_TYPE_SOLR = "solr";
 
     static final public String BUILD_TYPE_MG_STR = "MG";
     static final public String BUILD_TYPE_MGPP_STR = "MGPP";
     static final public String BUILD_TYPE_LUCENE_STR = "Lucene";
-    
-    static final public String[] BUILD_TYPES = {  BUILD_TYPE_MGPP, BUILD_TYPE_MG, BUILD_TYPE_LUCENE };
+    static final public String BUILD_TYPE_SOLR_STR = "SOLR";
+
+    static final public String[] BUILD_TYPES = {BUILD_TYPE_LUCENE, BUILD_TYPE_SOLR,  BUILD_TYPE_MGPP, BUILD_TYPE_MG  };
 
     private EventListenerList listeners = null;
@@ -77 +79 @@
     }
 
-    
+    public boolean isSOLR () {
+    return getBuildType().equals(BUILD_TYPE_SOLR);
+    }
     public String getBuildType() {
     return build_type_meta.getValue(CollectionMeta.TEXT);
@@ -110 +114 @@
         JPanel main_panel = new JPanel();
             main_panel.setComponentOrientation(Dictionary.getOrientation());
-        /* may be CDM.BuildTypeManager.mg, CDM.BuildTYpeManager.mgpp, CDM.BuildTypeManager.lucene */
+        /* may be CDM.BuildTypeManager.mg, CDM.BuildTYpeManager.mgpp, CDM.BuildTypeManager.lucene, CDM.BuildTypeManager.solr */
         label = new JLabel(Dictionary.get("CDM.BuildTypeManager.Current_Type", getBuildTypeString(getBuildType())));
             label.setComponentOrientation(Dictionary.getOrientation());
@@ -148 +152 @@
         return BUILD_TYPE_LUCENE_STR;
         }
+        if (build_type.equals(BUILD_TYPE_SOLR)) {
+        return BUILD_TYPE_SOLR_STR;
+        }
         return "";
     }
@@ -165 +172 @@
     private JRadioButton mgpp_button = null;
     private JRadioButton lucene_button = null;
+    private JRadioButton solr_button = null;
 
     private JTextArea description_textarea = null;
@@ -186 +194 @@
             lucene_button.setComponentOrientation(Dictionary.getOrientation());
         lucene_button.setActionCommand(BUILD_TYPE_LUCENE);
+        solr_button = new JRadioButton(BUILD_TYPE_SOLR_STR);
+            solr_button.setComponentOrientation(Dictionary.getOrientation());
+        solr_button.setActionCommand(BUILD_TYPE_SOLR);
         
         BuildTypeButtonListener btbl = new BuildTypeButtonListener();
@@ -191 +202 @@
         mgpp_button.addActionListener(btbl);
         lucene_button.addActionListener(btbl);
+        solr_button.addActionListener(btbl);
 
         ButtonGroup build_type_group = new ButtonGroup();
+        build_type_group.add(lucene_button);
+            build_type_group.add(solr_button);
         build_type_group.add(mgpp_button);
         build_type_group.add(mg_button);
-        build_type_group.add(lucene_button);
-            
+
         if (current_build_type != null) {
         if (current_build_type.equals(BUILD_TYPE_MGPP)) {
@@ -204 +217 @@
         } else if (current_build_type.equals(BUILD_TYPE_LUCENE)) {
             lucene_button.setSelected(true);
+        } else if (current_build_type.equals(BUILD_TYPE_SOLR)) {
+            solr_button.setSelected(true);
         } 
+        
         }
         
         JPanel radio_pane = new JPanel();
-        radio_pane.setLayout(new GridLayout(3,1));
+        radio_pane.setLayout(new GridLayout(4,1));
+        radio_pane.add(lucene_button);
+        radio_pane.add(solr_button);
         radio_pane.add(mgpp_button);
         radio_pane.add(mg_button);
-        radio_pane.add(lucene_button);
+
             radio_pane.setComponentOrientation(Dictionary.getOrientation());
             
         description_textarea = new JTextArea();
         description_textarea.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        /* may be CDM.BuildTypeManager.mg_Description, CDM.BuildTYpeManager.mgpp_Description, CDM.BuildTypeManager.lucene_Description */
+        /* may be CDM.BuildTypeManager.mg_Description, CDM.BuildTYpeManager.mgpp_Description, CDM.BuildTypeManager.lucene_Description, CDM.BUildTypeMamanger.solr_Description*/
         description_textarea.setText(Dictionary.get("CDM.BuildTypeManager."+current_build_type+"_Description"));
+        description_textarea.setCaretPosition(0);
         description_textarea.setLineWrap(true);
         description_textarea.setWrapStyleWord(true);
@@ -241 +260 @@
             } else if (lucene_button.isSelected()) {
                 new_build_type = BUILD_TYPE_LUCENE;
+            } else if (solr_button.isSelected()) {
+                new_build_type = BUILD_TYPE_SOLR;
             }
             if (!build_type_meta.getValue(CollectionMeta.TEXT).equals(new_build_type)) {
@@ -287 +308 @@
         public void actionPerformed(ActionEvent event) {
         description_textarea.setText(Dictionary.get("CDM.BuildTypeManager."+event.getActionCommand()+"_Description"));
+        description_textarea.setCaretPosition(0);
         }
     }