commit 92a795af6aa31d7e6beb26d685d9ddf26e900bea
Author: Patrick Plitzner
Date: Wed Sep 19 16:15:59 2018 +0200
ref #7502 Add id and uuid to bulk editor
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 7e37f8d44..cb2c5f156 100644
--- 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
@@ -91,10 +91,16 @@ public class BulkEditorE4Composite extends Composite {
public static final String TYPE_PROPERTY = Messages.BulkEditorE4_TYPE;
+ public static final String ID_PROPERTY = "Id";
+
+ public static final String UUID_PROPERTY = "Uuid";
+
public static final String CANDIDATE_LABEL = "candidate";
public static final String TARGET_LABEL = "target";
+ public static final List columnList = new ArrayList<>();
+
private Composite topComposite;
@Inject
@@ -137,6 +143,11 @@ public class BulkEditorE4Composite extends Composite {
@SuppressWarnings("unused")
public void init(AbstractBulkEditorInput> input){
+ columnList.add(input.getName());
+ columnList.add(TYPE_PROPERTY);
+ columnList.add(UUID_PROPERTY);
+ columnList.add(ID_PROPERTY);
+
new BulkEditorSearchE4(this, topComposite, SWT.NONE);
//layout needed because the search bar is added after @PostConstuct method
topComposite.getParent().layout();
@@ -165,9 +176,10 @@ public class BulkEditorE4Composite extends Composite {
ConfigRegistry configRegistry = new ConfigRegistry();
//property map
Map propertyToLabels = new HashMap<>();
- propertyToLabels.put(bulkEditor.getEditorInput().getName(), bulkEditor.getEditorInput().getName());
- propertyToLabels.put(TYPE_PROPERTY, TYPE_PROPERTY);
- String[] propertyNames = new String[] { bulkEditor.getEditorInput().getName(), TYPE_PROPERTY };
+ for(String columnLabel:columnList){
+ propertyToLabels.put(columnLabel, columnLabel);
+ }
+ String[] propertyNames = columnList.toArray(columnList.toArray(new String[columnList.size()]));
//sorted list
SortedList sortedList = new SortedList<>(bulkEditor.getEditorInput().getModel(), bulkEditor.getEditorInput().getTitleComparator());
//data provider
@@ -185,8 +197,10 @@ public class BulkEditorE4Composite extends Composite {
bodyLayer = new DefaultBodyLayerStack(eventLayer);
dataLayer.setColumnPercentageSizing(0, true);
- dataLayer.setColumnWidthPercentageByPosition(0, 85);
+ dataLayer.setColumnWidthPercentageByPosition(0, 65);
dataLayer.setColumnWidthByPosition(1, 100);
+ dataLayer.setColumnWidthByPosition(2, 70);
+ dataLayer.setColumnWidthByPosition(3, 50);
//column
DataLayer columnHeaderDataLayer = new DataLayer(colHeaderDataProvider);
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorPropertyAccessor.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorPropertyAccessor.java
index 4cb012d2c..228c0e0cb 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorPropertyAccessor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorPropertyAccessor.java
@@ -22,7 +22,6 @@ public class BulkEditorPropertyAccessor implements IColumnPropertyAccessor input) {
super();
this.input = input;
@@ -30,10 +29,15 @@ public class BulkEditorPropertyAccessor implements IColumnPropertyAccessor