adapt BerlinModelImport to new cacheStrategy getter

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 3c13259d3dfbe6e5334c9546d397775e6a181099..97aa7c5cafec3f998ef561078c6303cb96367c5e 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
@@ -292,19 +292,19 @@ public class BerlinModelAuthorTeamImport extends BerlinModelImportBase {
     }\r
 \r
     protected void checkTeamNomenclaturalTitle(Team team, String authorTeamCache, int authorTeamId) {\r
-        if (team.getCacheStrategy().getNomenclaturalTitleCache(team).equals(authorTeamCache)){\r
+        if (team.cacheStrategy().getNomenclaturalTitleCache(team).equals(authorTeamCache)){\r
             team.setProtectedNomenclaturalTitleCache(false);\r
-        }else if(team.getCacheStrategy().getNomenclaturalTitleCache(team).replace(" ,", ",").equals(authorTeamCache)){\r
+        }else if(team.cacheStrategy().getNomenclaturalTitleCache(team).replace(" ,", ",").equals(authorTeamCache)){\r
             //also accept teams with ' , ' as separator as not protected\r
             team.setProtectedNomenclaturalTitleCache(false);\r
         }else{\r
             team.setNomenclaturalTitleCache(authorTeamCache, true);\r
-            logger.warn("Creation of nomTitle for team with members did not work: " + authorTeamCache + " <-> " + team.getCacheStrategy().getNomenclaturalTitleCache(team)+ " : " + authorTeamId);\r
+            logger.warn("Creation of nomTitle for team with members did not work: " + authorTeamCache + " <-> " + team.cacheStrategy().getNomenclaturalTitleCache(team)+ " : " + authorTeamId);\r
         }\r
     }\r
 \r
     protected void checkTeamTitleCache(Team team, String fullAuthorTeamCache, int authorTeamId) {\r
-        INomenclaturalAuthorCacheStrategy<Team> formatter = team.getCacheStrategy();\r
+        INomenclaturalAuthorCacheStrategy<Team> formatter = team.cacheStrategy();\r
         if (team.generateTitle().equals(fullAuthorTeamCache)){\r
             team.setProtectedTitleCache(false);\r
         }else if(fullAuthorTeamCache == null){\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
index 3563950d1051451fd9fc998cc3ee70a60866cb5e..be91d692b3acc18887bde45a25ed7dc1e42740d4 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
@@ -1214,7 +1214,7 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
     }
 
     private static void checkTeam(Team team, String refAuthorString, Integer refId) {
-        TeamDefaultCacheStrategy formatter = (TeamDefaultCacheStrategy) team.getCacheStrategy();
+        TeamDefaultCacheStrategy formatter = (TeamDefaultCacheStrategy) team.cacheStrategy();
 
         if (formatter.getTitleCache(team).equals(refAuthorString)){
             team.setProtectedTitleCache(false);
@@ -1234,7 +1234,7 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
     }
 
     private static void checkPerson(Person person, String refAuthorString, boolean hasDedupMember, Integer refId) {
-        PersonDefaultCacheStrategy formatter = (PersonDefaultCacheStrategy) person.getCacheStrategy();
+        PersonDefaultCacheStrategy formatter = (PersonDefaultCacheStrategy) person.cacheStrategy();
 
         String oldTitleCache = person.getTitleCache();
         boolean oldTitleCacheProtected = person.isProtectedTitleCache();