From 723b8572e958f5f002ea14a3ad27884a510c60fa Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Thu, 20 Jun 2019 14:46:45 +0200
Subject: [PATCH] ref #8335 minor fixes for active state evaluation

---
 .../descriptiveDataSet/matrix/CharacterMatrix.java       | 9 ++++-----
 .../matrix/CharacterMatrixToolbar.java                   | 3 +++
 2 files changed, 7 insertions(+), 5 deletions(-)

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 ccb435906..6e96a0a12 100644
--- 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
@@ -22,7 +22,6 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 
 import org.apache.commons.collections4.map.LinkedMap;
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.ICoreRunnable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
@@ -54,6 +53,7 @@ import org.eclipse.nebula.widgets.nattable.freeze.CompositeFreezeLayer;
 import org.eclipse.nebula.widgets.nattable.freeze.FreezeHelper;
 import org.eclipse.nebula.widgets.nattable.freeze.FreezeLayer;
 import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
+import org.eclipse.nebula.widgets.nattable.grid.command.ClientAreaResizeCommand;
 import org.eclipse.nebula.widgets.nattable.grid.data.DefaultColumnHeaderDataProvider;
 import org.eclipse.nebula.widgets.nattable.grid.data.DefaultCornerDataProvider;
 import org.eclipse.nebula.widgets.nattable.grid.data.DefaultRowHeaderDataProvider;
@@ -270,12 +270,11 @@ public class CharacterMatrix extends Composite {
 
 
         this.layout();
-//        natTable.doCommand(new ClientAreaResizeCommand(natTable));
+        natTable.doCommand(new ClientAreaResizeCommand(natTable));
 
-//        load active table state
-        String activeState = getNatTableState().getProperty(PersistenceDialog.ACTIVE_VIEW_CONFIGURATION_KEY);
-        natTable.loadState(activeState!=null?activeState:StringUtils.EMPTY, getNatTableState());
+        // clean up table state
         getNatTableState().remove(NatTable.INITIAL_PAINT_COMPLETE_FLAG);
+        getNatTableState().remove(PersistenceDialog.ACTIVE_VIEW_CONFIGURATION_KEY);
     }
 
     private List<Character> initCharacterList(FeatureNode<Character> node){
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 c08fd7eac..19491e4bb 100644
--- 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
@@ -286,6 +286,9 @@ public class CharacterMatrixToolbar extends Composite {
     }
 
     private void selectStateItem(ComboViewer comboStates, String stateName){
+        if(stateName.equals(StringUtils.EMPTY)){
+            stateName = Messages.CharacterMatrix_DEFAULT;
+        }
         String[] items = comboStates.getCombo().getItems();
         for(int i=0;i<items.length;i++){
             if(items[i].equals(stateName)){
-- 
2.34.1