Revision 025d7862
Added by Patrick Plitzner over 6 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/AbstractImportWizardE4.java | ||
|---|---|---|
| 9 | 9 |
|
| 10 | 10 |
package eu.etaxonomy.taxeditor.io.e4.in; |
| 11 | 11 |
|
| 12 |
import javax.inject.Inject; |
|
| 13 |
import javax.inject.Named; |
|
| 14 |
|
|
| 15 | 12 |
import org.eclipse.e4.core.contexts.ContextInjectionFactory; |
| 16 | 13 |
import org.eclipse.e4.core.contexts.IEclipseContext; |
| 17 |
import org.eclipse.e4.core.di.annotations.Optional; |
|
| 18 |
import org.eclipse.e4.ui.services.IServiceConstants; |
|
| 19 | 14 |
import org.eclipse.e4.ui.workbench.modeling.EPartService; |
| 20 | 15 |
import org.eclipse.jface.dialogs.MessageDialog; |
| 21 | 16 |
import org.eclipse.jface.viewers.IStructuredSelection; |
| ... | ... | |
| 45 | 40 |
|
| 46 | 41 |
private EPartService partService; |
| 47 | 42 |
|
| 48 |
@Inject |
|
| 49 | 43 |
public AbstractImportWizardE4(IEclipseContext context, EPartService partService) {
|
| 50 | 44 |
this(context, partService, null); |
| 51 | 45 |
} |
| 52 | 46 |
|
| 53 |
@Inject |
|
| 54 |
public AbstractImportWizardE4(IEclipseContext context, EPartService partService, |
|
| 55 |
@Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
|
|
| 47 |
public AbstractImportWizardE4(IEclipseContext context, EPartService partService, IStructuredSelection selection) {
|
|
| 56 | 48 |
this.context = context; |
| 57 | 49 |
this.partService = partService; |
| 58 | 50 |
this.selection = selection; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java | ||
|---|---|---|
| 16 | 16 |
import java.net.URI; |
| 17 | 17 |
|
| 18 | 18 |
import javax.inject.Inject; |
| 19 |
import javax.inject.Named; |
|
| 19 | 20 |
|
| 20 | 21 |
import org.apache.commons.io.IOUtils; |
| 21 | 22 |
import org.apache.log4j.Logger; |
| ... | ... | |
| 23 | 24 |
import org.eclipse.e4.core.contexts.ContextInjectionFactory; |
| 24 | 25 |
import org.eclipse.e4.core.contexts.IEclipseContext; |
| 25 | 26 |
import org.eclipse.e4.core.di.annotations.Optional; |
| 27 |
import org.eclipse.e4.ui.services.IServiceConstants; |
|
| 26 | 28 |
import org.eclipse.e4.ui.workbench.modeling.EPartService; |
| 27 | 29 |
import org.eclipse.jface.viewers.IStructuredSelection; |
| 28 | 30 |
import org.eclipse.jface.viewers.TreeSelection; |
| ... | ... | |
| 50 | 52 |
private static final Logger logger = Logger.getLogger(ExcelNormalExplicitTaxaImportWizardE4.class); |
| 51 | 53 |
|
| 52 | 54 |
@Inject |
| 53 |
public ExcelNormalExplicitTaxaImportWizardE4(IEclipseContext context, EPartService partService, @Optional IStructuredSelection selection) {
|
|
| 55 |
public ExcelNormalExplicitTaxaImportWizardE4(IEclipseContext context, EPartService partService, |
|
| 56 |
@Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
|
|
| 54 | 57 |
super(context, partService, selection); |
| 55 | 58 |
} |
| 56 | 59 |
|
Also available in: Unified diff
ref #7005 Refactor DI annotations