ref #7095 Fix view configuration handler

 - some code cleanup

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
index fc5b3302a6c181571680c60e0f471531d30a28b6..ee69eba117846e437c74d5b39173415b02887ac3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/CharacterMatrix.java
@@ -198,26 +198,12 @@ ICdmEntitySessionEnabled{
 
     private Label wsLabel;
 
-    private Button btnToggleTree;
-
-    private Button btnToggleFlat;
-
-    private Button btnCollapseAll;
-
-    private Button btnExpandAll;
-
-    private ComboViewer comboStates;
-
-    private Button btnManageState;
-
-    private Button btnExcelExport;
-
-    private Composite buttonPanel;
-
     private Composite parent;
 
     private List<Feature> features;
 
+    private DisplayPersistenceDialogCommandHandler displayPersistenceDialogCommandHandler;
+
     @PostConstruct
     public void create(Composite parent) {
         if(CdmStore.isActive() && conversation==null){
@@ -239,13 +225,13 @@ ICdmEntitySessionEnabled{
 
         wsLabel = new Label(toolbarComposite, SWT.NONE);
 
-        btnToggleTree = new Button(toolbarComposite, SWT.PUSH);
-        btnToggleFlat = new Button(toolbarComposite, SWT.PUSH);
-        btnCollapseAll = new Button(toolbarComposite, SWT.PUSH);
-        btnExpandAll = new Button(toolbarComposite, SWT.PUSH);
-        comboStates = new ComboViewer(toolbarComposite, SWT.DROP_DOWN);
-        btnManageState = new Button(toolbarComposite, SWT.PUSH);
-        btnExcelExport = new Button(toolbarComposite, SWT.PUSH);
+        Button btnToggleTree = new Button(toolbarComposite, SWT.PUSH);
+        Button btnToggleFlat = new Button(toolbarComposite, SWT.PUSH);
+        Button btnCollapseAll = new Button(toolbarComposite, SWT.PUSH);
+        Button btnExpandAll = new Button(toolbarComposite, SWT.PUSH);
+        ComboViewer comboStates = new ComboViewer(toolbarComposite, SWT.DROP_DOWN);
+        Button btnManageState = new Button(toolbarComposite, SWT.PUSH);
+        Button btnExcelExport = new Button(toolbarComposite, SWT.PUSH);
 
         /**
          * Toogle tree button
@@ -257,7 +243,7 @@ ICdmEntitySessionEnabled{
         btnToggleTree.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
-                toggleTreeFlat(true);
+                toggleTreeFlat(true, btnToggleFlat, btnToggleTree, btnCollapseAll, btnExpandAll);
             }
         });
 
@@ -269,7 +255,7 @@ ICdmEntitySessionEnabled{
         btnToggleFlat.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
-                toggleTreeFlat(false);
+                toggleTreeFlat(false, btnToggleFlat, btnToggleTree, btnCollapseAll, btnExpandAll);
             }
         });
 
@@ -312,9 +298,6 @@ ICdmEntitySessionEnabled{
             MessagingUtils.info("No initial state properties file found for character matrix");
         }
 
-        DisplayPersistenceDialogCommandHandler handler =
-                new DisplayPersistenceDialogCommandHandler(natTableState, natTable);
-        natTable.registerCommandHandler(handler);
         // create a combobox for showing the available view states
         Collection<String> availableStates = PersistenceHelper.getAvailableStates(natTableState);
         comboStates.setLabelProvider(new LabelProvider(){
@@ -342,8 +325,9 @@ ICdmEntitySessionEnabled{
             comboStates.getCombo().select(0);
         }
 
+        displayPersistenceDialogCommandHandler = new DisplayPersistenceDialogCommandHandler(natTableState, natTable);
         // add listener to update the combo on view state management changes
-        handler.addStateChangeListener(new IStateChangedListener() {
+        displayPersistenceDialogCommandHandler.addStateChangeListener(new IStateChangedListener() {
             @Override
             public void handleStateChange(StateChangeEvent event) {
                 comboStates.setInput(PersistenceHelper.getAvailableStates(natTableState));
@@ -377,7 +361,7 @@ ICdmEntitySessionEnabled{
             }
         });
 
-        buttonPanel = new Composite(parent, SWT.NONE);
+        Composite buttonPanel = new Composite(parent, SWT.NONE);
 
         buttonPanel.setLayout(new RowLayout());
         GridDataFactory.fillDefaults().grab(true, false).applyTo(buttonPanel);
@@ -410,7 +394,7 @@ ICdmEntitySessionEnabled{
         });
     }
 
-    private void toggleTreeFlat(boolean isTree) {
+    private void toggleTreeFlat(boolean isTree, Button btnToggleFlat, Button btnToggleTree, Button btnCollapseAll, Button btnExpandAll) {
         init(workingSet.getUuid(), isTree);
         btnToggleFlat.setEnabled(isTree);
         btnToggleTree.setEnabled(!isTree);
@@ -684,6 +668,9 @@ ICdmEntitySessionEnabled{
             }
         });
 
+        //register handler for view configuration menu
+        natTable.registerCommandHandler(displayPersistenceDialogCommandHandler);
+
         natTable.configure();
 
         GridDataFactory.fillDefaults().grab(true, true).applyTo(natTable);