Renaming Specimen Excel Import (state)

diff --git a/.gitattributes b/.gitattributes
index 10e7c928ff44383a473743419172b484dfdf1243..0e210865613e33dfb1b58eea7e800d17c5327364 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -306,8 +306,8 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206DataHolde
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportState.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenExcelImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/SimpleSpecimen.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java -text

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportConfigurator.java
index 64507dc632454b7105c3d23b257c47c32ff7606a..96404485996cde67b698aa3553f468dcd52aa3fb 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportConfigurator.java
@@ -26,7 +26,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
  * @created 29.10.2008\r
  * @version 1.0\r
  */\r
-public class SpecimenSynthesysExcelImportConfigurator extends ImportConfiguratorBase<SpecimenExcelImportState, URI> implements IImportConfigurator {\r
+public class SpecimenSynthesysExcelImportConfigurator extends ImportConfiguratorBase<SpecimenSynthesysExcelImportState, URI> implements IImportConfigurator {\r
        private static final Logger logger = Logger.getLogger(SpecimenSynthesysExcelImportConfigurator.class);\r
        private boolean doParsing = false;\r
        private boolean reuseMetadata = false;\r
@@ -66,8 +66,8 @@ public class SpecimenSynthesysExcelImportConfigurator extends ImportConfigurator
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.io.common.IImportConfigurator#getNewState()\r
         */\r
-       public SpecimenExcelImportState getNewState() {\r
-               return new SpecimenExcelImportState(this);\r
+       public SpecimenSynthesysExcelImportState getNewState() {\r
+               return new SpecimenSynthesysExcelImportState(this);\r
        }\r
 \r
 \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenExcelImportState.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportState.java
similarity index 69%
rename from cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenExcelImportState.java
rename to cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportState.java
index 31599b7c79e5b60eccaeecc6ef2a2284fc28c160..d770365e4bf9459e0f09f5dacc49407e4d4e51fd 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenExcelImportState.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSynthesysExcelImportState.java
@@ -20,11 +20,11 @@ import eu.etaxonomy.cdm.io.common.ImportStateBase;
  * @created 11.05.2009\r
  * @version 1.0\r
  */\r
-public class SpecimenExcelImportState extends ImportStateBase<SpecimenSynthesysExcelImportConfigurator, CdmImportBase>{\r
+public class SpecimenSynthesysExcelImportState extends ImportStateBase<SpecimenSynthesysExcelImportConfigurator, CdmImportBase>{\r
        @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(SpecimenExcelImportState.class);\r
+       private static final Logger logger = Logger.getLogger(SpecimenSynthesysExcelImportState.class);\r
 \r
-       public SpecimenExcelImportState(SpecimenSynthesysExcelImportConfigurator config) {\r
+       public SpecimenSynthesysExcelImportState(SpecimenSynthesysExcelImportConfigurator config) {\r
                super(config);\r
        }\r
        \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
index 467590f335c6b300ddd7ac790e8f0ce1920eae87..3ca20663bf7095c460d172486bf824408355de00 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenSythesysExcelImport.java
@@ -56,7 +56,7 @@ import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;
  * @version 1.0
  */
 @Component
-public class SpecimenSythesysExcelImport  extends SpecimenImportBase<SpecimenSynthesysExcelImportConfigurator, SpecimenExcelImportState>  implements ICdmIO<SpecimenExcelImportState> {
+public class SpecimenSythesysExcelImport  extends SpecimenImportBase<SpecimenSynthesysExcelImportConfigurator, SpecimenSynthesysExcelImportState>  implements ICdmIO<SpecimenSynthesysExcelImportState> {
 
        private static final Logger logger = Logger.getLogger(SpecimenSythesysExcelImport.class);
 
@@ -491,7 +491,7 @@ public class SpecimenSythesysExcelImport  extends SpecimenImportBase<SpecimenSyn
         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IoStateBase)
         */
        @Override
-       protected boolean isIgnore(SpecimenExcelImportState state) {
+       protected boolean isIgnore(SpecimenSynthesysExcelImportState state) {
                return false;
        }
 
@@ -500,7 +500,7 @@ public class SpecimenSythesysExcelImport  extends SpecimenImportBase<SpecimenSyn
         * @see eu.etaxonomy.cdm.io.specimen.SpecimenIoBase#doInvoke(eu.etaxonomy.cdm.io.specimen.abcd206.SpecimenImportState)
         */
        @Override
-       protected boolean doInvoke(SpecimenExcelImportState state) {
+       protected boolean doInvoke(SpecimenSynthesysExcelImportState state) {
                System.out.println("INVOKE Specimen Import From Excel File (Synthesys Cache format");
                SpecimenSythesysExcelImport test = new SpecimenSythesysExcelImport();
                URI source = state.getConfig().getSource();
@@ -531,7 +531,7 @@ public class SpecimenSythesysExcelImport  extends SpecimenImportBase<SpecimenSyn
         * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
         */
        @Override
-       protected boolean doCheck(SpecimenExcelImportState state) {
+       protected boolean doCheck(SpecimenSynthesysExcelImportState state) {
                logger.warn("Validation not yet implemented for " + this.getClass().getSimpleName());
                return true;
        }