X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/1439cd8a7d9928edee74c01185f2c2f5bcf6c490..f274f08344046946f5a3e691a0886cc66d363ba8:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java

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 ddf2e5e3c..8d8027a80 100644
--- 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
@@ -6,14 +6,13 @@
 * 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.io.e4.in.excel.taxa;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,7 +20,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -37,23 +36,21 @@ import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
 import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
-import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4;
+import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWithReferenceWizardPage;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 
 /**
- *
  * @author pplitzner
  * @since Oct 5, 2017
- *
  */
 public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE4<NormalExplicitImportConfigurator>{
 
     private NormalExplicitImportConfigurator configurator;
 
-	private ImportFromFileDataSourceWizardPageE4 dataSourcePage;
-	private static final Logger logger = Logger.getLogger(ExcelNormalExplicitTaxaImportWizardE4.class);
+	private ImportFromFileDataSourceWithReferenceWizardPage dataSourcePage;
+	private static final Logger logger = LogManager.getLogger(ExcelNormalExplicitTaxaImportWizardE4.class);
 
 	@Inject
 	public ExcelNormalExplicitTaxaImportWizardE4(IEclipseContext context, EPartService partService,
@@ -61,20 +58,18 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
 	    super(context, partService, selection);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public NormalExplicitImportConfigurator getConfigurator() {
 		return configurator;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public boolean performFinish() {
 		URI source = dataSourcePage.getUri();
 		configurator.setSource(source);
 		configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
 		configurator.setSourceReferenceTitle(dataSourcePage.getTextReferenceString().getText());
-		File file = new File(source);
+		File file = new File(source.getJavaUri());
 		FileInputStream fis = null;
 
 		try {
@@ -94,7 +89,6 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
 		return true;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void init() {
 		configurator =  CdmStore.getImportManager().NormalExplicitConfigurator();
@@ -105,19 +99,18 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
 		}
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void addPages() {
-	    dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
+	    dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWithReferenceWizardPage.class, context);
 		dataSourcePage.setTitle("Choose NormalExplicit");
 		dataSourcePage.setDescription("Please choose an xls file in the NormalExplicit format.");
 		dataSourcePage.setExtensions(new String[]{"*.xlsx", "*.xls", "*.*"});
 		addPage(dataSourcePage);
-		  super.addPages();
-
+		super.addPages();
 	}
-	 @Override
-     protected void addConfiguratorPage(){
+	
+	@Override
+    protected void addConfiguratorPage(){
          List<String> ignoreMethods = new ArrayList<>();
          ignoreMethods.add("setIgnoreNull");
          ignoreMethods.add("setInteractWithUser");
@@ -129,4 +122,4 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
          pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelTaxonUpdateWizard_ConfiguratorWizard_label);
          addPage(pageConfiguration);
     }
-}
+}
\ No newline at end of file