rename config

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
index 50c5e77dc4fe4438becbefd76e8c1ee4bd71417c..5932286ef2042659c4f026cabbeb6f086de65eb1 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
@@ -90,6 +90,8 @@ public class EuroMedActivator {
        static String referenceFilter = "SELECT refId FROM v_cdm_exp_allReferences";\r
        \r
        \r
+       \r
+       \r
 \r
        \r
 // **************** ALL *********************  \r
@@ -152,55 +154,56 @@ public class EuroMedActivator {
                Source source = berlinModelSource;\r
                ICdmDataSource destination = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : cdmDestination;\r
                                \r
-               BerlinModelImportConfigurator bmImportConfigurator = BerlinModelImportConfigurator.NewInstance(source,  destination);\r
+               BerlinModelImportConfigurator config = BerlinModelImportConfigurator.NewInstance(source,  destination);\r
                \r
-               bmImportConfigurator.setClassificationUuid(classificationUuid);\r
-               bmImportConfigurator.setSourceSecId(sourceSecId);\r
+               config.setClassificationUuid(classificationUuid);\r
+               config.setSourceSecId(sourceSecId);\r
                \r
-               bmImportConfigurator.setNomenclaturalCode(nomenclaturalCode);\r
-\r
-               bmImportConfigurator.setIgnoreNull(ignoreNull);\r
-               bmImportConfigurator.setDoAuthors(doAuthors);\r
-               bmImportConfigurator.setDoReferences(doReferences);\r
-               bmImportConfigurator.setDoTaxonNames(doTaxonNames);\r
-               bmImportConfigurator.setDoRelNames(doRelNames);\r
-               bmImportConfigurator.setDoNameStatus(doNameStatus);\r
-               bmImportConfigurator.setDoTypes(doTypes);\r
-               bmImportConfigurator.setDoNameFacts(doNameFacts);\r
-               bmImportConfigurator.setUseClassification(useClassification);\r
+               config.setNomenclaturalCode(nomenclaturalCode);\r
+\r
+               config.setIgnoreNull(ignoreNull);\r
+               config.setDoAuthors(doAuthors);\r
+               config.setDoReferences(doReferences);\r
+               config.setDoTaxonNames(doTaxonNames);\r
+               config.setDoRelNames(doRelNames);\r
+               config.setDoNameStatus(doNameStatus);\r
+               config.setDoTypes(doTypes);\r
+               config.setDoNameFacts(doNameFacts);\r
+               config.setUseClassification(useClassification);\r
                \r
-               bmImportConfigurator.setDoTaxa(doTaxa);\r
-               bmImportConfigurator.setDoRelTaxa(doRelTaxa);\r
-               bmImportConfigurator.setDoFacts(doFacts);\r
-               bmImportConfigurator.setDoOccurrence(doOccurences);\r
-               bmImportConfigurator.setDoCommonNames(doCommonNames);\r
+               config.setDoTaxa(doTaxa);\r
+               config.setDoRelTaxa(doRelTaxa);\r
+               config.setDoFacts(doFacts);\r
+               config.setDoOccurrence(doOccurences);\r
+               config.setDoCommonNames(doCommonNames);\r
                \r
-               bmImportConfigurator.setDoMarker(doMarker);\r
-               bmImportConfigurator.setDoUser(doUser);\r
-               bmImportConfigurator.setEditor(editor);\r
-               bmImportConfigurator.setDbSchemaValidation(hbm2dll);\r
+               config.setDoMarker(doMarker);\r
+               config.setDoUser(doUser);\r
+               config.setEditor(editor);\r
+               config.setDbSchemaValidation(hbm2dll);\r
                \r
                // maximum number of name facts to import\r
-               bmImportConfigurator.setMaximumNumberOfNameFacts(maximumNumberOfNameFacts);\r
+               config.setMaximumNumberOfNameFacts(maximumNumberOfNameFacts);\r
                \r
 //             filter\r
-               bmImportConfigurator.setTaxonTable(taxonTable);\r
-               bmImportConfigurator.setClassificationQuery(classificationQuery);\r
-               bmImportConfigurator.setRelTaxaIdQuery(relPTaxonIdQuery);\r
+               config.setTaxonTable(taxonTable);\r
+               config.setClassificationQuery(classificationQuery);\r
+               config.setRelTaxaIdQuery(relPTaxonIdQuery);\r
+               \r
                \r
-               bmImportConfigurator.setCheck(check);\r
-               bmImportConfigurator.setEditor(editor);\r
-               bmImportConfigurator.setRecordsPerTransaction(partitionSize);\r
+               config.setCheck(check);\r
+               config.setEditor(editor);\r
+               config.setRecordsPerTransaction(partitionSize);\r
                \r
                // invoke import\r
                CdmDefaultImport<BerlinModelImportConfigurator> bmImport = new CdmDefaultImport<BerlinModelImportConfigurator>();\r
-               bmImport.invoke(bmImportConfigurator);\r
+               bmImport.invoke(config);\r
                \r
-               if (doFacts && bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
+               if (doFacts && config.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || config.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK)    ){\r
                        ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
                        \r
                        //make feature tree\r
-                       FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);\r
+                       FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, config.getFeatureMap(), featureKeyList);\r
                        FeatureNode imageNode = FeatureNode.NewInstance(Feature.IMAGE());\r
                        tree.getRoot().addChild(imageNode);\r
                        FeatureNode distributionNode = FeatureNode.NewInstance(Feature.DISTRIBUTION());\r