ref #8335 Initially select default state + minor refactoring

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
index 98e1745aa4bf02cf9190f737b9f36657bbf13d4c..ccb435906161e847d2989b4183856649dfa459ac 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
@@ -32,7 +32,6 @@ import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.e4.ui.services.EMenuService;
 import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.nebula.widgets.nattable.NatTable;
@@ -560,16 +559,6 @@ public class CharacterMatrix extends Composite {
         }
     }
 
-    void selectStateItem(ComboViewer comboStates, String stateName){
-        String[] items = comboStates.getCombo().getItems();
-        for(int i=0;i<items.length;i++){
-            if(items[i].equals(stateName)){
-                comboStates.getCombo().select(i);
-                break;
-            }
-        }
-    }
-
     private void initLabels(int index, Character character) {
         indexToCharacterMap.put(index+LEADING_COLUMN_COUNT, character);
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixToolbar.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixToolbar.java
index 795475a7aac8ba6ebd9d10a2ed33678f09622085..0b43b05ee9601d8382ff6a7b30d758c24552a5b8 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixToolbar.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixToolbar.java
@@ -209,7 +209,7 @@ public class CharacterMatrixToolbar extends Composite {
         });
         comboStates.setInput(availableStates);
         if(comboStates.getCombo().getItemCount()>0){
-            comboStates.getCombo().select(0);
+           selectStateItem(comboStates, Messages.CharacterMatrix_DEFAULT);
         }
 
         displayPersistenceDialogCommandHandler = new DisplayPersistenceDialogCommandHandler(natTableState, matrix.getNatTable());
@@ -218,7 +218,7 @@ public class CharacterMatrixToolbar extends Composite {
             @Override
             public void handleStateChange(StateChangeEvent event) {
                 comboStates.setInput(PersistenceHelper.getAvailableStates(natTableState));
-                matrix.selectStateItem(comboStates, event.getViewConfigName());
+                selectStateItem(comboStates, event.getViewConfigName());
             }
         });
 
@@ -231,7 +231,7 @@ public class CharacterMatrixToolbar extends Composite {
                 matrix.getNatTable().doCommand(new DisplayPersistenceDialogCommand(matrix.getNatTable()));
                 Object activeConfig = natTableState.get(PersistenceDialog.ACTIVE_VIEW_CONFIGURATION_KEY);
                 if(activeConfig!=null){
-                    matrix.selectStateItem(comboStates, activeConfig.toString());
+                    selectStateItem(comboStates, activeConfig.toString());
                 }
             }
         });
@@ -260,6 +260,16 @@ public class CharacterMatrixToolbar extends Composite {
 
     }
 
+    private void selectStateItem(ComboViewer comboStates, String stateName){
+        String[] items = comboStates.getCombo().getItems();
+        for(int i=0;i<items.length;i++){
+            if(items[i].equals(stateName)){
+                comboStates.getCombo().select(i);
+                break;
+            }
+        }
+    }
+
     private void initButton(Button button, Image image, String tooltipText,
             String label, boolean enabled, boolean selected, Consumer<SelectionEvent> widgetSelected){
         if(image!=null){