ref #7005 Refactor DI annotations

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/AbstractImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/AbstractImportWizardE4.java
index 03af4b35b884eb007f3908c71b05d81667c60749..6850f9613caf2ad1eb38ef9e00d03353d3b60b43 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/AbstractImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/AbstractImportWizardE4.java
@@ -9,13 +9,8 @@
 
 package eu.etaxonomy.taxeditor.io.e4.in;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -45,14 +40,11 @@ public abstract class AbstractImportWizardE4<CONFIG extends IIoConfigurator> ext
 
     private EPartService partService;
 
-    @Inject
     public AbstractImportWizardE4(IEclipseContext context, EPartService partService) {
         this(context, partService, null);
     }
 
-       @Inject
-    public AbstractImportWizardE4(IEclipseContext context, EPartService partService,
-            @Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
+    public AbstractImportWizardE4(IEclipseContext context, EPartService partService, IStructuredSelection selection) {
            this.context = context;
            this.partService = partService;
            this.selection = selection;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
index e2aa9bbd9b37d1e54b5ceb26bdf67fa630c8fb06..8f415e2fe78392045bb80044e081920d648d0385 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
@@ -16,6 +16,7 @@ import java.io.IOException;
 import java.net.URI;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
@@ -23,6 +24,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeSelection;
@@ -50,7 +52,8 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
        private static final Logger logger = Logger.getLogger(ExcelNormalExplicitTaxaImportWizardE4.class);
 
        @Inject
-       public ExcelNormalExplicitTaxaImportWizardE4(IEclipseContext context, EPartService partService, @Optional IStructuredSelection selection) {
+       public ExcelNormalExplicitTaxaImportWizardE4(IEclipseContext context, EPartService partService,
+               @Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
            super(context, partService, selection);
        }