rename CdmBase.isPersited -> isPersisted in cdmlib-app

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java
index a5ecb299cf60f7fd10b68408830b9b8651b00bbf..a6c02195d6fabffe90d2ca6690251a658f821f2c 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java
@@ -197,7 +197,7 @@ public class BerlinModelAuthorTeamImport extends BerlinModelImportBase {
                            String uuid = null;\r
                            if (resultSetHasColumn(rs,"UUID")){\r
                                uuid = rs.getString("UUID");\r
                            String uuid = null;\r
                            if (resultSetHasColumn(rs,"UUID")){\r
                                uuid = rs.getString("UUID");\r

-                               if (uuid != null && !author.isPersited()){\r
+                               if (uuid != null && !author.isPersisted()){\r

                                    author.setUuid(UUID.fromString(uuid));\r
                                }\r
                            }\r
                                    author.setUuid(UUID.fromString(uuid));\r
                                }\r
                            }\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
index 6ca9aa6ee7733970097782a1cccebf69a8517433..09ef892e894806047fd0a1667d3f220d8934c9a7 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
@@ -930,7 +930,7 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
         }else if (matchingCandidates.size() == 1){\r
             ReferenceCandidate single = matchingCandidates.iterator().next().candidate;\r
             addAuthorAndDetail(state, refDetailId, taxonName, single);\r
         }else if (matchingCandidates.size() == 1){\r
             ReferenceCandidate single = matchingCandidates.iterator().next().candidate;\r
             addAuthorAndDetail(state, refDetailId, taxonName, single);\r

-            if (single.ref.isPersited()){\r
+            if (single.ref.isPersisted()){\r

                 printResult(MatchType.SINGLE_FULL_MATCH, unparsedAndName(fullNomRefCache, taxonName));\r
             }else{\r
 //                single.ref.addImportSource(String.valueOf(refDetailId), BerlinModelRefDetailImport.REFDETAIL_NAMESPACE,\r
                 printResult(MatchType.SINGLE_FULL_MATCH, unparsedAndName(fullNomRefCache, taxonName));\r
             }else{\r
 //                single.ref.addImportSource(String.valueOf(refDetailId), BerlinModelRefDetailImport.REFDETAIL_NAMESPACE,\r


@@ -1186,14 +1186,14 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
         if (refCand.ref.getSources().isEmpty()){\r
             refCand.ref.addImportSource(String.valueOf(refDetailId), BerlinModelRefDetailImport.REFDETAIL_NAMESPACE, state.getTransactionalSourceReference(), null);\r
         }\r
         if (refCand.ref.getSources().isEmpty()){\r
             refCand.ref.addImportSource(String.valueOf(refDetailId), BerlinModelRefDetailImport.REFDETAIL_NAMESPACE, state.getTransactionalSourceReference(), null);\r
         }\r

-//        if (!refCand.ref.isPersited()){\r
+//        if (!refCand.ref.isPersisted()){\r

 //            getReferenceService().save(refCand.ref);\r
 //        }\r
 \r
         Reference nomRef = state.getDeduplicationHelper().getExistingReference(refCand.ref, true);\r
         if (nomRef != refCand.ref){\r
             System.out.println("Ref deduplicated: " + nomRef.getTitleCache() + "(RefDetId: " + refDetailId + ")");\r
 //            getReferenceService().save(refCand.ref);\r
 //        }\r
 \r
         Reference nomRef = state.getDeduplicationHelper().getExistingReference(refCand.ref, true);\r
         if (nomRef != refCand.ref){\r
             System.out.println("Ref deduplicated: " + nomRef.getTitleCache() + "(RefDetId: " + refDetailId + ")");\r

-            if (nomRef.isPersited() && !getSession().contains(nomRef)){\r
+            if (nomRef.isPersisted() && !getSession().contains(nomRef)){\r

                 System.out.println("Start load with uuid: " + nomRef.getUuid() + ")");\r
                 nomRef = getReferenceService().find(nomRef.getUuid());\r
             }\r
                 System.out.println("Start load with uuid: " + nomRef.getUuid() + ")");\r
                 nomRef = getReferenceService().find(nomRef.getUuid());\r
             }\r


@@ -1403,7 +1403,7 @@ public class BerlinModelTaxonNameImport extends BerlinModelImportBase {
     private Set<FinalCandidate> findPersistentMatch(TaxonName taxonName, Set<FinalCandidate> finalCandidates) throws MatchException {\r
         Set<FinalCandidate> result = new HashSet<>();\r
         for (FinalCandidate cand : finalCandidates){\r
     private Set<FinalCandidate> findPersistentMatch(TaxonName taxonName, Set<FinalCandidate> finalCandidates) throws MatchException {\r
         Set<FinalCandidate> result = new HashSet<>();\r
         for (FinalCandidate cand : finalCandidates){\r

-            if (cand.candidate.ref.isPersited()){\r
+            if (cand.candidate.ref.isPersisted()){\r

                 result.add(cand);\r
             }\r
         }\r
                 result.add(cand);\r
             }\r
         }\r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java
index 725e670b1c1a15a5f759f1700eeb2719cc103bd7..6360cfd41f4e6cb6fe2604bf134516e17c882577 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/ErmsVernacularImport.java
@@ -170,10 +170,10 @@ public class ErmsVernacularImport  extends ErmsImportBase<CommonTaxonName> {
     }\r
 \r
     private void persistLanguage(Language language) {\r
     }\r
 \r
     private void persistLanguage(Language language) {\r

-        if(!language.isPersited()){\r
+        if(!language.isPersisted()){\r

             getTermService().saveOrUpdate(language);\r
         }\r
             getTermService().saveOrUpdate(language);\r
         }\r

-        if (!language.getVocabulary().isPersited()){\r
+        if (!language.getVocabulary().isPersisted()){\r

             getVocabularyService().saveOrUpdate(language.getVocabulary());\r
         }\r
     }\r
             getVocabularyService().saveOrUpdate(language.getVocabulary());\r
         }\r
     }\r