Rename NonViralName authorteams to authorship #4968

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / parser / ParseHandler.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index df90397af4c901336471623a5ae1f7ac5fc24536..48a56f518ae00f2d6e96d95e8d6cbaba7fd8a303 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -35,10 +35,10 @@ public class ParseHandler{
                List<INomenclaturalReference> duplicateReferences = new ArrayList<INomenclaturalReference>();
                List<INomenclaturalReference> duplicateInReferences = new ArrayList<INomenclaturalReference>();
 
-               List<TeamOrPersonBase> duplicateCombinationAuthorTeams = new ArrayList<TeamOrPersonBase>();
-               List<TeamOrPersonBase> duplicateExCombinationAuthorTeams = new ArrayList<TeamOrPersonBase>();
-               List<TeamOrPersonBase> duplicateBasionymAuthorTeams = new ArrayList<TeamOrPersonBase>();
-               List<TeamOrPersonBase> duplicateExBasionymAuthorTeams = new ArrayList<TeamOrPersonBase>();
+               List<TeamOrPersonBase> duplicateCombinationAuthorships = new ArrayList<TeamOrPersonBase>();
+               List<TeamOrPersonBase> duplicateExCombinationAuthorships = new ArrayList<TeamOrPersonBase>();
+               List<TeamOrPersonBase> duplicateBasionymAuthorships = new ArrayList<TeamOrPersonBase>();
+               List<TeamOrPersonBase> duplicateExBasionymAuthorships = new ArrayList<TeamOrPersonBase>();
        }
 
        private static NonViralNameParserImpl nonViralNameParser = NonViralNameParserImpl.NewInstance();
@@ -234,27 +234,27 @@ public class ParseHandler{
         */
        private void resolveAllDuplicateAuthors(NonViralName name, MatchMatrix matchMatrix) {
 
-               if(matchMatrix.duplicateCombinationAuthorTeams.size() > 0){
-                       name.setCombinationAuthorTeam(matchMatrix.duplicateCombinationAuthorTeams.iterator().next());
+               if(matchMatrix.duplicateCombinationAuthorships.size() > 0){
+                       name.setCombinationAuthorship(matchMatrix.duplicateCombinationAuthorships.iterator().next());
                        Reference reference = (Reference) name.getNomenclaturalReference();
                        if(reference != null){
-                               reference.setAuthorship(matchMatrix.duplicateCombinationAuthorTeams.iterator().next());
+                               reference.setAuthorship(matchMatrix.duplicateCombinationAuthorships.iterator().next());
                        }
                        // FIXME TODO resolve multiple duplications. We use first match for a start.
                }
 
-               if(matchMatrix.duplicateExCombinationAuthorTeams.size() > 0){
-                       name.setExCombinationAuthorTeam(matchMatrix.duplicateExCombinationAuthorTeams.iterator().next());
+               if(matchMatrix.duplicateExCombinationAuthorships.size() > 0){
+                       name.setExCombinationAuthorship(matchMatrix.duplicateExCombinationAuthorships.iterator().next());
                        // FIXME TODO resolve multiple duplications. We use first match for a start.
                }
 
-               if(matchMatrix.duplicateBasionymAuthorTeams.size() > 0){
-                       name.setBasionymAuthorTeam(matchMatrix.duplicateBasionymAuthorTeams.iterator().next());
+               if(matchMatrix.duplicateBasionymAuthorships.size() > 0){
+                       name.setBasionymAuthorship(matchMatrix.duplicateBasionymAuthorships.iterator().next());
                        // FIXME TODO resolve multiple duplications. We use first match for a start.
                }
 
-               if(matchMatrix.duplicateExBasionymAuthorTeams.size() > 0){
-                       name.setExBasionymAuthorTeam(matchMatrix.duplicateExBasionymAuthorTeams.iterator().next());
+               if(matchMatrix.duplicateExBasionymAuthorships.size() > 0){
+                       name.setExBasionymAuthorship(matchMatrix.duplicateExBasionymAuthorships.iterator().next());
                        // FIXME TODO resolve multiple duplications. We use first match for a start.
                }
        }
@@ -271,10 +271,10 @@ public class ParseHandler{
 
                matchMatrix.duplicateNames = findMatchingLatinNames(name);
 
-               matchMatrix.duplicateCombinationAuthorTeams = findMatchingAuthors(name.getCombinationAuthorTeam());
-               matchMatrix.duplicateExCombinationAuthorTeams = findMatchingAuthors(name.getExCombinationAuthorTeam());
-               matchMatrix.duplicateBasionymAuthorTeams = findMatchingAuthors(name.getBasionymAuthorTeam());
-               matchMatrix.duplicateExBasionymAuthorTeams = findMatchingAuthors(name.getExBasionymAuthorTeam());
+               matchMatrix.duplicateCombinationAuthorships = findMatchingAuthors(name.getCombinationAuthorship());
+               matchMatrix.duplicateExCombinationAuthorships = findMatchingAuthors(name.getExCombinationAuthorship());
+               matchMatrix.duplicateBasionymAuthorships = findMatchingAuthors(name.getBasionymAuthorship());
+               matchMatrix.duplicateExBasionymAuthorships = findMatchingAuthors(name.getExBasionymAuthorship());
 
                INomenclaturalReference nomenclaturalReference = name.getNomenclaturalReference();