Revert "ref #7847 Fixate deduplication icon to first column"

This reverts commit 6fde7721bdb9cca2640864544d9606f90c5064b0.

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorBodyLayerConfigLabelAccumulator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorConfigLabelAccumulator.java
similarity index 62%
rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorBodyLayerConfigLabelAccumulator.java
rename to eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorConfigLabelAccumulator.java
index ae5b645fe2f8ee75a591e8413bffd1b047db6041..a16d4ebf1f647cfb9acfa22fe0a01b3c1f592a0b 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorBodyLayerConfigLabelAccumulator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorConfigLabelAccumulator.java
@@ -9,6 +9,7 @@
 package eu.etaxonomy.taxeditor.bulkeditor.e4;
 
 import org.eclipse.nebula.widgets.nattable.data.ListDataProvider;
+import org.eclipse.nebula.widgets.nattable.grid.data.DefaultColumnHeaderDataProvider;
 import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
 import org.eclipse.nebula.widgets.nattable.layer.cell.IConfigLabelAccumulator;
 
@@ -20,15 +21,17 @@ import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
  * @since Jul 6, 2018
  *
  */
-public class BulkEditorBodyLayerConfigLabelAccumulator implements IConfigLabelAccumulator {
+public class BulkEditorConfigLabelAccumulator implements IConfigLabelAccumulator {
 
-    private AbstractBulkEditorInput<?> input;
-    private ListDataProvider<CdmBase> bodyDataProvider;
+    private ListDataProvider<CdmBase> dataProvider;
+    private AbstractBulkEditorInput input;
+    private DefaultColumnHeaderDataProvider colHeaderDataProvider;
 
-    public BulkEditorBodyLayerConfigLabelAccumulator(ListDataProvider<CdmBase> bodyDataProvider,
-            AbstractBulkEditorInput<?> input) {
+    public BulkEditorConfigLabelAccumulator(ListDataProvider<CdmBase> dataProvider,
+            DefaultColumnHeaderDataProvider colHeaderDataProvider, AbstractBulkEditorInput input) {
+        this.dataProvider = dataProvider;
+        this.colHeaderDataProvider = colHeaderDataProvider;
         this.input = input;
-        this.bodyDataProvider = bodyDataProvider;
     }
 
 
@@ -37,7 +40,10 @@ public class BulkEditorBodyLayerConfigLabelAccumulator implements IConfigLabelAc
         if(rowPosition<0){
             return;
         }
-        CdmBase rowObject = bodyDataProvider.getRowObject(rowPosition);
+        if(input.isBooleanProperty(colHeaderDataProvider.getColumnHeaderLabel(columnPosition))){
+            configLabels.addLabel(BulkEditorConfigLabelAccumulatorHeader.BOOLEAN_COLUMN);
+        }
+        CdmBase rowObject = dataProvider.getRowObject(rowPosition);
         if(input.getMergeCandidates().contains(rowObject)){
             configLabels.addLabel(BulkEditorE4Composite.LABEL_CANDIDATE);
             if(columnPosition==0){

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorDataLayerConfigLabelAccumulator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorDataLayerConfigLabelAccumulator.java
deleted file mode 100644 (file)
index 54f767d..0000000
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorDataLayerConfigLabelAccumulator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
-* Copyright (C) 2018 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.bulkeditor.e4;
-
-import org.eclipse.nebula.widgets.nattable.grid.data.DefaultColumnHeaderDataProvider;
-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
-import org.eclipse.nebula.widgets.nattable.layer.cell.IConfigLabelAccumulator;
-
-import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
-
-/**
- * @author pplitzner
- * @since Jul 6, 2018
- *
- */
-public class BulkEditorDataLayerConfigLabelAccumulator implements IConfigLabelAccumulator {
-
-    private AbstractBulkEditorInput<?> input;
-    private DefaultColumnHeaderDataProvider colHeaderDataProvider;
-
-    public BulkEditorDataLayerConfigLabelAccumulator(DefaultColumnHeaderDataProvider colHeaderDataProvider,
-            AbstractBulkEditorInput<?> input) {
-        this.colHeaderDataProvider = colHeaderDataProvider;
-        this.input = input;
-    }
-
-
-    @Override
-    public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {
-        if(rowPosition<0){
-            return;
-        }
-        if(input.isBooleanProperty(colHeaderDataProvider.getColumnHeaderLabel(columnPosition))){
-            configLabels.addLabel(BulkEditorConfigLabelAccumulatorHeader.BOOLEAN_COLUMN);
-        }
-    }
-}

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java
index 35cfdbef3878c6e3c1e52c966ed3273f94c29a23..30d1fc5acf9f20056ecc51d8026d969f1834786a 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java
@@ -144,6 +144,7 @@ public class BulkEditorE4Composite extends Composite {
         bottomComposite.setLayout(new GridLayout());
        }
 
+       @SuppressWarnings("unused")
     public void init(AbstractBulkEditorInput<?> input){
 
         input.getPropertyKeys().forEach(key->columnList.add(key));
@@ -173,8 +174,7 @@ public class BulkEditorE4Composite extends Composite {
 
        }
 
-       @SuppressWarnings({ "unused", "unchecked" })
-    private void createTable(){
+       private void createTable(){
            ConfigRegistry configRegistry = new ConfigRegistry();
            //property map
         Map<String, String> propertyToLabels = new HashMap<>();
@@ -249,10 +249,7 @@ public class BulkEditorE4Composite extends Composite {
             }
         }));
 
-        //label accumulator
-        dataLayer.setConfigLabelAccumulator(new BulkEditorDataLayerConfigLabelAccumulator(colHeaderDataProvider,
-                bulkEditor.getEditorInput()));
-        bodyLayer.setConfigLabelAccumulator(new BulkEditorBodyLayerConfigLabelAccumulator(bodyDataProvider,
+        dataLayer.setConfigLabelAccumulator(new BulkEditorConfigLabelAccumulator(bodyDataProvider, colHeaderDataProvider,
                 bulkEditor.getEditorInput()));
 
         natTable.setConfigRegistry(configRegistry);
@@ -428,7 +425,6 @@ public class BulkEditorE4Composite extends Composite {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public void copyDataToClipboard() {
         String textData = ""; //$NON-NLS-1$
         IStructuredSelection selection = getSelection();