cleanup

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/CaryoActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/CaryoActivator.java
index 726fc1779624c72f425dc753de57eef5c61127c4..dd3ef8dbac4571792b9d4f05496830b0760a29dc 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/CaryoActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/CaryoActivator.java
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
-\r
 package eu.etaxonomy.cdm.app.caryophyllales;\r
 \r
 import java.util.UUID;\r
@@ -31,16 +30,14 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
  * @since 16.10.2012\r
  */\r
 public class CaryoActivator extends SourceBase{\r
+\r
        private static final Logger logger = Logger.getLogger(CaryoActivator.class);\r
 \r
        //database validation status (create, update, validate ...)\r
        static final DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
        static final Source source = caryo_len61();\r
 \r
-\r
        static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();\r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_postgres_CdmTest();\r
 \r
        static final String classificationName = "Caryophyllales";\r
 \r
@@ -54,7 +51,6 @@ public class CaryoActivator extends SourceBase{
        static final boolean doTaxa = true;\r
        static final boolean doDeduplicate = true;\r
 \r
-\r
        private void doImport(ICdmDataSource cdmDestination){\r
 \r
                //make Source\r
@@ -66,8 +62,7 @@ public class CaryoActivator extends SourceBase{
                config.setSourceReferenceTitle("NCU - Caryophyllales, v0.4");\r
                config.setClassificationName(classificationName);\r
 \r
-               CdmDefaultImport<CaryoImportConfigurator> myImport = new CdmDefaultImport<CaryoImportConfigurator>();\r
-\r
+               CdmDefaultImport<CaryoImportConfigurator> myImport = new CdmDefaultImport<>();\r
 \r
                //...\r
                if (true){\r
@@ -77,8 +72,6 @@ public class CaryoActivator extends SourceBase{
                        System.out.println("End import from ("+ source.toString() + ")...");\r
                }\r
 \r
-\r
-\r
                //deduplicate\r
                if (doDeduplicate){\r
                        ICdmRepository app = myImport.getCdmAppController();\r
@@ -89,7 +82,6 @@ public class CaryoActivator extends SourceBase{
                        count = app.getReferenceService().deduplicate(Reference.class, null, null);\r
                        logger.warn("Deduplicated " + count + " references.");\r
                }\r
-\r
        }\r
 \r
        private Reference getSourceReference(String string) {\r
@@ -98,7 +90,6 @@ public class CaryoActivator extends SourceBase{
                return result;\r
        }\r
 \r
-\r
        public static Source caryo_len61(){\r
                //      Cyryophyllales source\r
                String dbms = Source.SQL_SERVER_2008;\r
@@ -109,14 +100,9 @@ public class CaryoActivator extends SourceBase{
                return  makeSource(dbms, strServer, strDB, port, userName, null);\r
        }\r
 \r
-\r
-\r
-       /**\r
-        * @param args\r
-        */\r
        public static void main(String[] args) {\r
                CaryoActivator me = new CaryoActivator();\r
                me.doImport(cdmDestination);\r
+           System.exit(0);\r
        }\r
-\r
-}\r
+}
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/TaxonExcelCaryophyllalesActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/TaxonExcelCaryophyllalesActivator.java
index a8dcb6fe73c3f7ee9f724c80f9cf0e90b3e1b48e..bd8de03a41e6fe0e4a9462a5a5105c05e39f9612 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/TaxonExcelCaryophyllalesActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/TaxonExcelCaryophyllalesActivator.java
@@ -1,3 +1,11 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
 package eu.etaxonomy.cdm.app.caryophyllales;\r
 \r
 import java.io.File;\r
@@ -10,7 +18,10 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;\r
 import eu.etaxonomy.cdm.io.csv.caryophyllales.out.CsvNameExportConfigurator;\r
 \r
-\r
+/**\r
+ * @author k.luther\r
+ * @since 03.07.2015\r
+ */\r
 public class TaxonExcelCaryophyllalesActivator {\r
 \r
     @SuppressWarnings("unused")\r
@@ -33,6 +44,4 @@ public class TaxonExcelCaryophyllalesActivator {
        csvExport.invoke(csvNameExportConfigurator);\r
 \r
     }\r
-}\r
-\r
-\r
+}
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeFirstImageImportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeFirstImageImportActivator.java
index d37a0f2254cc44b6f8c134995952e7de97835079..d0d672d2fc1d79f761a3d79e06095bfc067d56e6 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeFirstImageImportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeFirstImageImportActivator.java
@@ -1,15 +1,14 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * 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.cdm.app.wp6.cichorieae;
 
-import eu.etaxonomy.cdm.common.URI;
 import java.net.URISyntaxException;
 import java.util.UUID;
 
@@ -17,6 +16,7 @@ import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.app.common.CdmDestinations;
 import eu.etaxonomy.cdm.app.images.ImageImportConfigurator;
+import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
@@ -27,22 +27,22 @@ import eu.etaxonomy.cdm.io.wp6.CichorieaeImageImport;
  * @since 18.11.2008
  * @version 1.0
  */
-public class CichorieaeImageActivator  {
+public class CichorieaeFirstImageImportActivator  {
        @SuppressWarnings("unused")
-       private static final Logger logger = Logger.getLogger(CichorieaeImageActivator.class);
-       
+       private static final Logger logger = Logger.getLogger(CichorieaeFirstImageImportActivator.class);
+
        //      private static final File sourceFile = new File("src/main/resources/images/images_cich.xls");
        private static final ICdmDataSource cdmDestination = CdmDestinations.localH2Cichorieae();
 //     private static final ICdmDataSource cdmDestination = CdmDestinations.cdm_import_cichorieae();
-       
+
        static final UUID secUuid = UUID.fromString("6924c75d-e0d0-4a6d-afb7-3dd8c71195ca");
 //     static final UUID treeUuid = UUID.fromString("00db28a7-50e1-4abc-86ec-b2a8ce870de9");
        static final UUID treeUuid = UUID.fromString("534e190f-3339-49ba-95d9-fa27d5493e3e");
-       
+
        public static void main (String[] cowabunga){
-               
+
                ICdmDataSource destination = CdmDestinations.chooseDestination(cowabunga) != null ? CdmDestinations.chooseDestination(cowabunga) : cdmDestination;
-               
+
                URI imageFolderCichorieae;
                try {
                        imageFolderCichorieae = new URI (CichorieaeActivator.imageFolderString);
@@ -50,8 +50,8 @@ public class CichorieaeImageActivator  {
                                        imageFolderCichorieae, destination, CichorieaeImageImport.class);
                        imageConfigurator.setSecUuid(secUuid);
                        imageConfigurator.setClassificationUuid(treeUuid);
-                       
-                       CdmDefaultImport<IImportConfigurator> importer = new CdmDefaultImport<IImportConfigurator>();
+
+                       CdmDefaultImport<IImportConfigurator> importer = new CdmDefaultImport<>();
                        importer.invoke(imageConfigurator);
                } catch (URISyntaxException e) {
                        e.printStackTrace();

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java
index 2aa8735a859ddde230c966244ea2e5692a28d361..b5ca384f0d761dc98188d6cc790aca5c5398173f 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoBorhidiExcelImport.java
@@ -46,6 +46,7 @@ import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 @Component
 public class MexicoBorhidiExcelImport<CONFIG extends MexicoBorhidiImportConfigurator>
         extends SimpleExcelTaxonImport<CONFIG>{
+
     private static final Logger logger = Logger.getLogger(MexicoBorhidiExcelImport.class);
     private static final long serialVersionUID = -3607776356577606657L;
 

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java
index 8ff440d666087b61311bf06df3b550cc0a043287..e94854f3bef3dcdac63188e70af80cfca0420df9 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/SimpleExcelTaxonImport.java
@@ -48,7 +48,6 @@ public abstract class SimpleExcelTaxonImport<CONFIG extends ExcelImportConfigura
 
     protected static INonViralNameParser<?> nameParser = NonViralNameParserImpl.NewInstance();
 
-
     @Override
     protected void analyzeRecord(Map<String, String> record, SimpleExcelTaxonImportState<CONFIG> state) {
         //override only if needed