ref #694 adapt appimport to new DescriptionElementService

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java
index 6b962ef63cd0975eaa169a1000075f5639f03b28..bc7ebdcda1d5344fa2ab055c718ee819c718192b 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java
@@ -104,7 +104,7 @@ public class DipteraPostImportUpdater {
                                }\r
                        }\r
 \r
-                       cdmApp.getDescriptionService().saveDescriptionElement(citationsToSave);\r
+                       cdmApp.getDescriptionElementService().save(citationsToSave);\r
                        //commit\r
                        cdmApp.commitTransaction(tx);\r
                        logger.warn("Citations updated!");\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
index 9ce471059b7d5b565aa56754199e262cee564ac5..d17935dd77e76757cce8339c61fec853e57f9861 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/UseImport.java
@@ -32,7 +32,7 @@ import org.apache.poi.ss.usermodel.WorkbookFactory;
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
-import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
+import eu.etaxonomy.cdm.api.service.IDescriptionElementService;\r
 import eu.etaxonomy.cdm.api.service.IReferenceService;\r
 import eu.etaxonomy.cdm.api.service.ITaxonService;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
@@ -263,8 +263,8 @@ public class UseImport {
 \r
                ITaxonService taxonService = applicationController.getTaxonService();\r
                ITermService termService = applicationController.getTermService();\r
-               IDescriptionService descService = applicationController.getDescriptionService();\r
-               IReferenceService referenceService = applicationController.getReferenceService();\r
+               IDescriptionElementService descElementService = applicationController.getDescriptionElementService();\r
+        IReferenceService referenceService = applicationController.getReferenceService();\r
 \r
 \r
                ArrayList<ArrayList<String>> lstUseSummaries = loadSpreadsheet(xslUseSummaryPathString);\r
@@ -302,7 +302,7 @@ public class UseImport {
                                        TextData useSummary = TextData.NewInstance(featureUseSummary);\r
                                        LanguageString languageString = LanguageString.NewInstance(lstUseSummary.get(1), Language.ENGLISH());\r
                                        useSummary.putText(languageString);\r
-                                       descService.saveDescriptionElement(useSummary);\r
+                                       descElementService.save(useSummary);\r
                                        newUseDescription.addElement(useSummary);\r
                                        for (ArrayList<String> lstUseRecord : lstUseRecords) {\r
                                                j++;\r
@@ -425,7 +425,7 @@ public class UseImport {
                                                                useRecord.addModifier(ethnicGroup);\r
                                                        }\r
                                                        useRecord.putModifyingText(Language.ENGLISH(), modifyingText);\r
-                                                       descService.saveDescriptionElement(useRecord);\r
+                                                       descElementService.save(useRecord);\r
                                                        newUseDescription.addElement(useRecord);\r
                                                }\r
                                        }\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
index 09c55192f34e793437bcb86d5c9ef3431210ac18..83380557c310f4c7c2a1611c4e8b424e3df92e89 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
@@ -158,7 +158,7 @@ public class BerlinModelOccurrenceSourceImport  extends BerlinModelImportBase {
 \r
             }\r
                        logger.info("Distributions to save: " + objectsToSave.size());\r
-                       getDescriptionService().saveDescriptionElement(objectsToSave);\r
+                       getDescriptionElementService().save(objectsToSave);\r
 \r
                        return success;\r
                } catch (SQLException e) {\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java
index 023378eb1a69acae90164be616b8f7baaca6b5c6..9ff02f12519119c73a31341c61856360236f595b 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/salvador/SalvadorSpecimenImport.java
@@ -155,7 +155,7 @@ public class SalvadorSpecimenImport
         Map<String, String> record = state.getCurrentRecord();
         UUID factUuid = UUID.fromString(record.get("specimenFactUuid"));
 
-        TextData textSpecimen = (TextData)getDescriptionService().getDescriptionElementByUuid(factUuid);
+        TextData textSpecimen = (TextData)getDescriptionElementService().find(factUuid);
         textSpecimen.setFeature(getTexSpecimenFeature());
 
         FieldUnit fieldUnit = FieldUnit.NewInstance();