ref #9448: remove E4 from file names - bulkeditor continue

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditor.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditor.java
index af7cdd17110010607783c9284d8a383d6c323eb7..e35875229002ba5f65ec8293f7593fb1ca01319a 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditor.java
@@ -94,7 +94,7 @@ public class BulkEditor implements IPartContentHasDetails, IConversationEnabled,
 
     private BulkEditorQuery lastQuery = null;
 
-    private BulkEditorE4Composite bulkEditorComposite;
+    private BulkEditorComposite bulkEditorComposite;
 
     @Inject
     public BulkEditor() {
@@ -110,7 +110,7 @@ public class BulkEditor implements IPartContentHasDetails, IConversationEnabled,
 
        @PostConstruct
        public void createPartControl(Composite parent, IEclipseContext context) {
-           bulkEditorComposite = new BulkEditorE4Composite(this, parent, SWT.NONE);
+           bulkEditorComposite = new BulkEditorComposite(this, parent, SWT.NONE);
            ContextInjectionFactory.inject(bulkEditorComposite, context);
        }
 

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/BulkEditorComposite.java
similarity index 99%
rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4Composite.java
rename to eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorComposite.java
index cfa2e6bb96d773a123e72cf97e8f22f4b0039a08..861a636a6ba5bc05304a811b0402f44086187f99 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/BulkEditorComposite.java
@@ -92,7 +92,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @author pplitzner
  * @since Sep 8, 2017
  */
-public class BulkEditorE4Composite extends Composite {
+public class BulkEditorComposite extends Composite {
 
     public static final String LABEL_CANDIDATE = "LABEL_CANDIDATE"; //$NON-NLS-1$
     public static final String LABEL_CANDIDATE_ICON = "LABEL_CANDIDATE_ICON"; //$NON-NLS-1$
@@ -127,7 +127,7 @@ public class BulkEditorE4Composite extends Composite {
     private IEventBroker eventBroker;
 
 
-    public BulkEditorE4Composite(BulkEditor bulkEditor, Composite parent, int style) {
+    public BulkEditorComposite(BulkEditor bulkEditor, Composite parent, int style) {
         super(parent, style);
         parent.setLayout(new GridLayout());
         this.bulkEditor = bulkEditor;

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorConfigLabelAccumulator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorConfigLabelAccumulator.java
index a16d4ebf1f647cfb9acfa22fe0a01b3c1f592a0b..4cb94d635fa14eeddf561d17d36c19f60ce3fb8e 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorConfigLabelAccumulator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorConfigLabelAccumulator.java
@@ -45,15 +45,15 @@ public class BulkEditorConfigLabelAccumulator implements IConfigLabelAccumulator
         }
         CdmBase rowObject = dataProvider.getRowObject(rowPosition);
         if(input.getMergeCandidates().contains(rowObject)){
-            configLabels.addLabel(BulkEditorE4Composite.LABEL_CANDIDATE);
+            configLabels.addLabel(BulkEditorComposite.LABEL_CANDIDATE);
             if(columnPosition==0){
-                configLabels.addLabel(BulkEditorE4Composite.LABEL_CANDIDATE_ICON);
+                configLabels.addLabel(BulkEditorComposite.LABEL_CANDIDATE_ICON);
             }
         }
         else if(input.getMergeTarget()==rowObject){
-            configLabels.addLabel(BulkEditorE4Composite.LABEL_TARGET);
+            configLabels.addLabel(BulkEditorComposite.LABEL_TARGET);
             if(columnPosition==0){
-                configLabels.addLabel(BulkEditorE4Composite.LABEL_TARGET_ICON);
+                configLabels.addLabel(BulkEditorComposite.LABEL_TARGET_ICON);
             }
         }
     }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorLabelStyleConfiguration.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorLabelStyleConfiguration.java
index 511f1b266064c5a3cd8a9be90fb832ee7dc01866..20f27b112d97ce388eb13977950080da6d100293 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorLabelStyleConfiguration.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorLabelStyleConfiguration.java
@@ -40,7 +40,7 @@ public final class BulkEditorLabelStyleConfiguration extends AbstractRegistryCon
                 CellConfigAttributes.CELL_STYLE,
                 candidateCellStyle,
                 DisplayMode.NORMAL,
-                BulkEditorE4Composite.LABEL_CANDIDATE);
+                BulkEditorComposite.LABEL_CANDIDATE);
         configRegistry.registerConfigAttribute(
                 CellConfigAttributes.CELL_PAINTER,
                 new CellPainterDecorator(
@@ -49,7 +49,7 @@ public final class BulkEditorLabelStyleConfiguration extends AbstractRegistryCon
                         new ImagePainter(ImageResources.getImage(ImageResources.ACTIVE_DELETE_ICON)),
                         false),
                 DisplayMode.NORMAL,
-                BulkEditorE4Composite.LABEL_CANDIDATE_ICON);
+                BulkEditorComposite.LABEL_CANDIDATE_ICON);
 
         //deduplication target style
         Style targetCellStyle = new Style();
@@ -58,7 +58,7 @@ public final class BulkEditorLabelStyleConfiguration extends AbstractRegistryCon
                 ColorResources.getColor(Resources.COLOR_BULK_EDITOR_TARGET));
         configRegistry.registerConfigAttribute(
                 CellConfigAttributes.CELL_STYLE, targetCellStyle,
-                DisplayMode.NORMAL, BulkEditorE4Composite.LABEL_TARGET);
+                DisplayMode.NORMAL, BulkEditorComposite.LABEL_TARGET);
         configRegistry.registerConfigAttribute(
                 CellConfigAttributes.CELL_PAINTER,
                 new CellPainterDecorator(
@@ -67,7 +67,7 @@ public final class BulkEditorLabelStyleConfiguration extends AbstractRegistryCon
                         new ImagePainter(ImageResources.getImage(ImageResources.IMPORT)),
                         false),
                 DisplayMode.NORMAL,
-                BulkEditorE4Composite.LABEL_TARGET_ICON);
+                BulkEditorComposite.LABEL_TARGET_ICON);
 
     }
 }
\ No newline at end of file

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 08ca6bc777253993193b0042ef0564c9acf2265b..6ea0df391eb815e791213697f0b398650b1d1ea7 100644 (file)
--- 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
@@ -21,9 +21,9 @@ import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
 public class BulkEditorPropertyAccessor implements IColumnPropertyAccessor<CdmBase> {
 
         private AbstractBulkEditorInput<CdmBase> input;
-        private BulkEditorE4Composite bulkEditorComposite;
+        private BulkEditorComposite bulkEditorComposite;
 
-        public BulkEditorPropertyAccessor(BulkEditorE4Composite bulkEditorComposite, AbstractBulkEditorInput<CdmBase> input) {
+        public BulkEditorPropertyAccessor(BulkEditorComposite bulkEditorComposite, AbstractBulkEditorInput<CdmBase> input) {
             super();
             this.input = input;
             this.bulkEditorComposite = bulkEditorComposite;

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorSearch.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorSearch.java
index 993e9f815cec167c34f77cf26106a9e4a01e7896..a86fa21dfa8235148853646321b87f75c7e017c8 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorSearch.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorSearch.java
@@ -53,7 +53,7 @@ public class BulkEditorSearch {
 
        private static final String DEFAULT_TEXT = String.format(Messages.BulkEditorSearchE4_WILDCARD, SearchManager.WILDCARD);
 
-       private final BulkEditorE4Composite editor;
+       private final BulkEditorComposite editor;
 
     private DisplayPersistenceDialogCommandHandler displayPersistenceDialogCommandHandler;
 
@@ -67,7 +67,7 @@ public class BulkEditorSearch {
 
        public Object ORDER_BY = new Object();
 
-       public BulkEditorSearch(BulkEditorE4Composite editor, Composite parent, int style) {
+       public BulkEditorSearch(BulkEditorComposite editor, Composite parent, int style) {
                this.editor = editor;
 
                createControl(parent, style);

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorTooltip.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorTooltip.java
index c50362d90f959a70f5696e9230501311a50061f1..67451205ccd802ff131e9c53ca615288cc3d983b 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorTooltip.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorTooltip.java
@@ -49,10 +49,10 @@ public class BulkEditorTooltip extends DefaultToolTip {
         int row = this.natTable.getRowPositionByY(event.y);
 
         LabelStack configLabels = natTable.getConfigLabelsByPosition(col, row);
-        if(configLabels.hasLabel(BulkEditorE4Composite.LABEL_TARGET)){
+        if(configLabels.hasLabel(BulkEditorComposite.LABEL_TARGET)){
             return Messages.BulkEditorTooltip_TARGET;
         }
-        else if(configLabels.hasLabel(BulkEditorE4Composite.LABEL_CANDIDATE)){
+        else if(configLabels.hasLabel(BulkEditorComposite.LABEL_CANDIDATE)){
             return Messages.BulkEditorTooltip_CANDIDATE;
         }
         int colIndex = this.natTable.getColumnIndexByPosition(col);
@@ -75,8 +75,8 @@ public class BulkEditorTooltip extends DefaultToolTip {
         int row = this.natTable.getRowPositionByY(event.y);
 
         LabelStack configLabels = natTable.getConfigLabelsByPosition(col, row);
-        if(configLabels.hasLabel(BulkEditorE4Composite.LABEL_CANDIDATE)
-                || configLabels.hasLabel(BulkEditorE4Composite.LABEL_TARGET)){
+        if(configLabels.hasLabel(BulkEditorComposite.LABEL_CANDIDATE)
+                || configLabels.hasLabel(BulkEditorComposite.LABEL_TARGET)){
             return true;
         }
 

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/CellSelectionListener.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/CellSelectionListener.java
index 09ebbd4ec1cca0fb218de72b911249636df8ac28..743a92e196688972ff538e6d8d1bb24fd4a1a4e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/CellSelectionListener.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/CellSelectionListener.java
@@ -28,13 +28,13 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
  */
 final class CellSelectionListener extends E4SelectionListener<CdmBase> {
 
-    private BulkEditorE4Composite bulkEditor;
+    private BulkEditorComposite bulkEditor;
 
     public CellSelectionListener(
             ESelectionService service,
             SelectionLayer selectionLayer,
             IRowDataProvider<CdmBase> rowDataProvider,
-            BulkEditorE4Composite bulkEditor) {
+            BulkEditorComposite bulkEditor) {
         super(service, selectionLayer, rowDataProvider);
         this.bulkEditor = bulkEditor;
     }