ref #6369 adapt existing occurrences of interface to removed generics in cdmlib-app

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
index fc0d62d640c965efb541c8aae56063c732bebc07..ac46f71bf68c64fd02c5cd7fd98cb59fbb48f4fa 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
@@ -32,9 +32,8 @@ import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
@@ -517,15 +516,14 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
        private TaxonBase createTaxon(CyprusImportState state, Rank rank, String taxonNameStr,
                        Class statusClass, NomenclaturalCode nc) {
                TaxonBase taxonBase;
-               NonViralName taxonNameBase = null;
+               INonViralName taxonNameBase = null;
                if (nc == NomenclaturalCode.ICVCN){
                        logger.warn("ICVCN not yet supported");
 
                }else{
-                       taxonNameBase =(NonViralName) nc.getNewTaxonNameInstance(rank);
-                       //NonViralName nonViralName = (NonViralName)taxonNameBase;
-                       INonViralNameParser parser = nameParser;//NonViralNameParserImpl.NewInstance();
-                       taxonNameBase = (NonViralName<BotanicalName>)parser.parseFullName(taxonNameStr, nc, rank);
+                       taxonNameBase = nc.getNewTaxonNameInstance(rank);
+                       INonViralNameParser<INonViralName> parser = nameParser;//NonViralNameParserImpl.NewInstance();
+                       taxonNameBase = parser.parseFullName(taxonNameStr, nc, rank);
 
                        //taxonNameBase.setNameCache(taxonNameStr);
 

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
index a6d1cd35c6c2ba5e0271603fb474a11718142ce8..7a1e24ed63d5f10d07eff38d41dd6576734260e0 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/EfloraTaxonImport.java
@@ -58,10 +58,10 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
+import eu.etaxonomy.cdm.model.name.INonViralName;\r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
@@ -610,7 +610,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                if (strGoto == null){\r
                        return "";\r
                }\r
-               String strGenusName = CdmBase.deproxy(taxon.getName(), NonViralName.class).getGenusOrUninomial();\r
+               String strGenusName = taxon.getName().getGenusOrUninomial();\r
                strGoto = strGoto.replaceAll("\\([^\\(\\)]*\\)", "");  //replace all brackets\r
                strGoto = strGoto.replaceAll("\\s+", " "); //replace multiple whitespaces by exactly one whitespace\r
 \r
@@ -622,7 +622,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                                split[i] = strGenusName;\r
                        }\r
 //                     if (isInfraSpecificMarker(single)){\r
-//                             String strSpeciesName = CdmBase.deproxy(taxon.getName(), NonViralName.class).getSpecificEpithet();\r
+//                             String strSpeciesName = taxon.getName().getSpecificEpithet();\r
 //                             split[i] = strGenusName + " " + strSpeciesName + " ";\r
 //                     }\r
                        result = (result + " " + split[i]).trim();\r
@@ -1152,11 +1152,12 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         */\r
        //body/taxon/\r
        private HomotypicalGroup handleNomTaxon(EfloraImportState state, Element elNom, Taxon taxon, HomotypicalGroup homotypicalGroup, boolean isSynonym) {\r
-               NonViralName name = makeName(taxon, homotypicalGroup, isSynonym);\r
-               String num = null;\r
+           INonViralName nvn = makeName(taxon, homotypicalGroup, isSynonym);\r
+           TaxonNameBase<?,?> name = TaxonNameBase.castAndDeproxy(nvn);\r
+           String num = null;\r
 \r
                boolean hasGenusInfo = false;\r
-               TeamOrPersonBase lastTeam = null;\r
+               TeamOrPersonBase<?> lastTeam = null;\r
 \r
                //genus\r
                List<Element> elGenus = XmlHelp.getAttributedChildListWithValue(elNom, "name", "class", "genus");\r
@@ -1262,19 +1263,19 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
        }\r
 \r
 \r
-       private void handleQuestionMark(NonViralName name, Taxon taxon) {\r
+       private void handleQuestionMark(INonViralName name, Taxon taxon) {\r
                int count = name.getTaxonBases().size();\r
                if (count != 1){\r
                        logger.warn("Name has " + count + " taxa. This is not handled for question mark");\r
                }else{\r
-                       TaxonBase taxonBase = (TaxonBase)name.getTaxonBases().iterator().next();\r
+                       TaxonBase taxonBase = name.getTaxonBases().iterator().next();\r
                        taxonBase.setDoubtful(true);\r
                }\r
        }\r
 \r
 \r
        //merge with handleNomTaxon\r
-       private void handleHomonym(EfloraImportState state, Element elHomonym, NonViralName upperName) {\r
+       private void handleHomonym(EfloraImportState state, Element elHomonym, TaxonNameBase upperName) {\r
                verifyNoAttribute(elHomonym);\r
 \r
                //hommonym name\r
@@ -1326,7 +1327,6 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                }else{\r
                        upperName.addRelationshipToName(homonymName, relType, null);\r
                }\r
-\r
        }\r
 \r
 \r
@@ -1347,7 +1347,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
        }\r
 \r
 \r
-       private void handleNameNote(NonViralName name, String value) {\r
+       private void handleNameNote(INonViralName name, String value) {\r
                logger.warn("Name note: " + value + ". Available in portal?");\r
                Annotation annotation = Annotation.NewInstance(value, AnnotationType.EDITORIAL(), Language.DEFAULT());\r
                name.addAnnotation(annotation);\r
@@ -1359,7 +1359,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param name\r
         * @param value\r
         */\r
-       protected TeamOrPersonBase handleNameUsage(Taxon taxon, NonViralName<?> name, String referenceTitle, TeamOrPersonBase lastTeam) {\r
+       protected TeamOrPersonBase handleNameUsage(Taxon taxon, INonViralName name, String referenceTitle, TeamOrPersonBase lastTeam) {\r
                Reference ref = ReferenceFactory.newGeneric();\r
                referenceTitle = removeStartingSymbols(referenceTitle, ref);\r
 \r
@@ -1374,7 +1374,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
 \r
                TaxonDescription description = getDescription(taxon);\r
                TextData textData = TextData.NewInstance(Feature.CITATION());\r
-               textData.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, ref, microReference, name, null);\r
+               textData.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, ref, microReference, (TaxonNameBase)name, null);\r
                description.addElement(textData);\r
                return team;\r
        }\r
@@ -1489,7 +1489,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param name\r
         * @return\r
         */\r
-       protected String parseHomonym(String detail, NonViralName name) {\r
+       protected String parseHomonym(String detail, TaxonNameBase name) {\r
                String result;\r
                if (detail == null){\r
                        return detail;\r
@@ -1521,7 +1521,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                        homonymName.setSpecificEpithet(name.getSpecificEpithet());\r
                        homonymName.setInfraSpecificEpithet(name.getInfraSpecificEpithet());\r
                        Reference homonymNomRef = ReferenceFactory.newGeneric();\r
-                       homonymNomRef.setTitleCache(homonymString);\r
+                       homonymNomRef.setTitleCache(homonymString, true);\r
                        String homonymNomRefDetail = parseReferenceYearAndDetail(homonymNomRef);\r
                        homonymName.setNomenclaturalMicroReference(homonymNomRefDetail);\r
                        String authorTitle = homonymNomRef.getTitleCache();\r
@@ -1558,7 +1558,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param name\r
         * @param value\r
         */\r
-       protected TeamOrPersonBase handleNomenclaturalReference(NonViralName name, String value) {\r
+       protected TeamOrPersonBase handleNomenclaturalReference(TaxonNameBase name, String value) {\r
                Reference nomRef = ReferenceFactory.newGeneric();\r
                nomRef.setTitleCache(value, true);\r
                parseNomStatus(nomRef, name);\r
@@ -1566,7 +1566,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                name.setNomenclaturalReference(nomRef);\r
                microReference = parseHomonym(microReference, name);\r
                name.setNomenclaturalMicroReference(microReference);\r
-               TeamOrPersonBase  team = name.getCombinationAuthorship();\r
+               TeamOrPersonBase<?> team = name.getCombinationAuthorship();\r
                if (team == null){\r
                        logger.warn("Name has nom. ref. but no author team. Name: " + name.getTitleCache() + ", Nom.Ref.: " + value);\r
                }else{\r
@@ -1575,7 +1575,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                return team;\r
        }\r
 \r
-       private void handleInfrAuthor(EfloraImportState state, Element elAuthor, NonViralName name, boolean overwrite) {\r
+       private void handleInfrAuthor(EfloraImportState state, Element elAuthor, INonViralName name, boolean overwrite) {\r
                String strAuthor = elAuthor.getValue().trim();\r
                if (strAuthor.endsWith(",")){\r
                        strAuthor = strAuthor.substring(0, strAuthor.length() -1);\r
@@ -1600,7 +1600,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param infraRank\r
         * @return\r
         */\r
-       private Rank handleInfRank(NonViralName name, List<Element> elInfraRank, Rank infraRank) {\r
+       private Rank handleInfRank(INonViralName name, List<Element> elInfraRank, Rank infraRank) {\r
                if (elInfraRank.size() == 1){\r
                        String strRank = elInfraRank.get(0).getTextNormalize();\r
                        try {\r
@@ -1622,7 +1622,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
        }\r
 \r
 \r
-       private void handleInfrEpi(NonViralName<?> name, Rank infraRank, String value) {\r
+       private void handleInfrEpi(INonViralName name, Rank infraRank, String value) {\r
                if (infraRank != null && infraRank.isInfraSpecific()){\r
                        name.setInfraSpecificEpithet(value);\r
                        if (CdmUtils.isCapital(value)){\r
@@ -1647,8 +1647,8 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param isSynonym\r
         * @return\r
         */\r
-       private NonViralName makeName(Taxon taxon,HomotypicalGroup homotypicalGroup, boolean isSynonym) {\r
-               NonViralName name;\r
+       private TaxonNameBase makeName(Taxon taxon,HomotypicalGroup homotypicalGroup, boolean isSynonym) {\r
+               TaxonNameBase<?,?> name;\r
                if (isSynonym){\r
                        name = BotanicalName.NewInstance(Rank.SPECIES(), homotypicalGroup);\r
                        SynonymType synonymType = SynonymType.HETEROTYPIC_SYNONYM_OF();\r
@@ -1657,7 +1657,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                        }\r
                        taxon.addSynonymName(name, synonymType);\r
                }else{\r
-                       name = (NonViralName)taxon.getName();\r
+                       name = taxon.getName();\r
                }\r
                return name;\r
        }\r
@@ -1667,7 +1667,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param element\r
         * @param taxon\r
         */\r
-       private void handleInfraspecificEpithet(Element element, String attrValue, NonViralName<?> name) {\r
+       private void handleInfraspecificEpithet(Element element, String attrValue, INonViralName name) {\r
                String value = element.getTextNormalize();\r
                if (value.indexOf("subsp.") != -1){\r
                        //TODO genus and species epi\r
@@ -1690,7 +1690,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param element\r
         * @param name\r
         */\r
-       private void handleBasionymAuthor(EfloraImportState state, Element elBasionymAuthor, NonViralName name, boolean overwrite) {\r
+       private void handleBasionymAuthor(EfloraImportState state, Element elBasionymAuthor, INonViralName name, boolean overwrite) {\r
                String strAuthor = elBasionymAuthor.getValue().trim();\r
                Pattern reBasionymAuthor = Pattern.compile("^\\(.*\\)$");\r
                if (reBasionymAuthor.matcher(strAuthor).matches()){\r
@@ -1714,7 +1714,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param name\r
         * @param elNom\r
         */\r
-       private void handleNameAuthors(Element elAuthor, NonViralName name) {\r
+       private void handleNameAuthors(Element elAuthor, INonViralName name) {\r
                if (name.getCombinationAuthorship() != null){\r
                        logger.warn("Name already has a combination author. Name: " +  name.getTitleCache() + ", Author: " + elAuthor.getTextNormalize());\r
                }\r
@@ -1955,18 +1955,18 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param value\r
         * @param taxonNameBase\r
         */\r
-       private void handleSubGenus(String value, TaxonNameBase taxonNameBase) {\r
+       private void handleSubGenus(String value, INonViralName taxonNameBase) {\r
                String name = value.replace("Subgenus", "").trim();\r
-               ((NonViralName)taxonNameBase).setInfraGenericEpithet(name);\r
+               taxonNameBase.setInfraGenericEpithet(name);\r
        }\r
 \r
        /**\r
         * @param value\r
         * @param taxonNameBase\r
         */\r
-       private void handleSection(String value, TaxonNameBase taxonNameBase) {\r
+       private void handleSection(String value, INonViralName taxonNameBase) {\r
                String name = value.replace("Section", "").trim();\r
-               ((NonViralName)taxonNameBase).setInfraGenericEpithet(name);\r
+               taxonNameBase.setInfraGenericEpithet(name);\r
        }\r
 \r
        /**\r
@@ -2000,7 +2000,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param value\r
         * @param taxonNameBase\r
         */\r
-       protected void handleGenus(String value, TaxonNameBase taxonName) {\r
+       protected void handleGenus(String value, INonViralName taxonName) {\r
                Matcher matcher = rexGenusAuthor.matcher(value);\r
                if (matcher.find()){\r
                        String author = matcher.group();\r
@@ -2010,9 +2010,8 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
                        team.setTitleCache(author, true);\r
                        Credit credit = Credit.NewInstance(team, null);\r
                        taxonName.addCredit(credit);\r
-//                     NonViralName nvn = (NonViralName)taxonName;\r
-//                     nvn.setCombinationAuthorship(team);\r
-//                     nvn.setGenusOrUninomial(genus);\r
+//                     taxonName.setCombinationAuthorship(team);\r
+//                     taxonName.setGenusOrUninomial(genus);\r
                }else{\r
                        logger.info("No Author match for " + value);\r
                }\r
@@ -2170,7 +2169,7 @@ public class EfloraTaxonImport  extends EfloraImportBase implements ICdmIO<Eflor
         * @param ref\r
         * @param nonViralName\r
         */\r
-       protected void parseNomStatus(Reference ref, NonViralName nonViralName) {\r
+       protected void parseNomStatus(Reference ref, TaxonNameBase nonViralName) {\r
                String titleToParse = ref.getTitleCache();\r
 \r
                String noStatusTitle = parser.parseNomStatus(titleToParse, nonViralName, true);\r

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ericaceae/CentralAfricaEricaceaeTaxonImport.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ericaceae/CentralAfricaEricaceaeTaxonImport.java
index 90ed87bea114a42181e0a70d3a674deb6030846d..54e81956f4ec3e62b7ddebc67df4ac908f9dae89 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ericaceae/CentralAfricaEricaceaeTaxonImport.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ericaceae/CentralAfricaEricaceaeTaxonImport.java
@@ -31,7 +31,7 @@ import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
+import eu.etaxonomy.cdm.model.name.INonViralName;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;\r
@@ -47,16 +47,12 @@ import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
  */\r
 @Component\r
 public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {\r
-       private static final Logger logger = Logger.getLogger(CentralAfricaEricaceaeTaxonImport.class);\r
+    private static final long serialVersionUID = 6442665916458420942L;\r
+    private static final Logger logger = Logger.getLogger(CentralAfricaEricaceaeTaxonImport.class);\r
 \r
 \r
-\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.eflora.EfloraTaxonImport#handleNomenclaturalReference(eu.etaxonomy.cdm.model.name.NonViralName, java.lang.String)\r
-        */\r
        @Override\r
-       protected TeamOrPersonBase handleNomenclaturalReference(NonViralName name, String value) {\r
+       protected TeamOrPersonBase handleNomenclaturalReference(TaxonNameBase name, String value) {\r
                Reference nomRef = ReferenceFactory.newGeneric();\r
                nomRef.setTitleCache(value, true);\r
                parseNomStatus(nomRef, name);\r
@@ -68,8 +64,8 @@ public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {
                microReference = parseHomonym(microReference, name);\r
                name.setNomenclaturalMicroReference(microReference);\r
 \r
-               TeamOrPersonBase  nameTeam = CdmBase.deproxy(name.getCombinationAuthorship(), TeamOrPersonBase.class);\r
-               TeamOrPersonBase  refTeam = nomRef.getAuthorship();\r
+               TeamOrPersonBase<?>  nameTeam = CdmBase.deproxy(name.getCombinationAuthorship(), TeamOrPersonBase.class);\r
+               TeamOrPersonBase<?>  refTeam = nomRef.getAuthorship();\r
                if (nameTeam == null ){\r
                        logger.warn("Name has nom. ref. but no author team. Name: " + name.getTitleCache() + ", Nom.Ref.: " + value);\r
                }else if (refTeam == null ){\r
@@ -167,7 +163,9 @@ public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {
         * @param value\r
         */\r
        @Override\r
-       protected TeamOrPersonBase<?> handleNameUsage(Taxon taxon, NonViralName<?> name, String referenceTitle, TeamOrPersonBase lastTeam) {\r
+       protected TeamOrPersonBase<?> handleNameUsage(Taxon taxon, INonViralName name,\r
+               String referenceTitle, TeamOrPersonBase lastTeam) {\r
+\r
                Reference ref = ReferenceFactory.newGeneric();\r
 \r
                ref.setTitleCache(referenceTitle, true);\r
@@ -190,7 +188,7 @@ public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {
        //              parseReferenceType(ref);\r
 \r
                        TextData textData = TextData.NewInstance(Feature.CITATION());\r
-                       textData.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, singleRef, microReference, name, null);\r
+                       textData.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, singleRef, microReference, (TaxonNameBase) name, null);\r
                        description.addElement(textData);\r
                }\r
                return team;\r
@@ -229,7 +227,7 @@ public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {
 \r
        }\r
 \r
-       protected TeamOrPersonBase getReferenceAuthor (Reference ref, NonViralName name) {\r
+       protected TeamOrPersonBase getReferenceAuthor (Reference ref, INonViralName name) {\r
                String titleString = ref.getTitleCache();\r
                String re = "\\(.*\\)";\r
                Pattern pattern = Pattern.compile(re);\r
@@ -248,7 +246,7 @@ public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {
 \r
        }\r
 \r
-       private TeamOrPersonBase getAuthorTeam(String authorString, NonViralName name) {\r
+       private TeamOrPersonBase getAuthorTeam(String authorString, INonViralName name) {\r
                //TODO atomize\r
 //             TeamOrPersonBase nameTeam = CdmBase.deproxy(name.getCombinationAuthorship(), TeamOrPersonBase.class);\r
 //             String nameTeamTitle = nameTeam == null ? "" : nameTeam.getNomenclaturalTitle();\r
@@ -367,7 +365,7 @@ public class CentralAfricaEricaceaeTaxonImport  extends EfloraTaxonImport  {
        }\r
 \r
        @Override\r
-    protected void handleGenus(String value, TaxonNameBase taxonName) {\r
+    protected void handleGenus(String value, INonViralName taxonName) {\r
                // do nothing\r
        }\r
 \r

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonImport.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonImport.java
index 16b10970ff7714fac9fe5cd2b26a4a04a98472cf..c8954ba2249f498c2d1721cb93461fb0fa4f6cf3 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonImport.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonImport.java
@@ -45,12 +45,12 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
+import eu.etaxonomy.cdm.model.name.INonViralName;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
@@ -647,13 +647,13 @@ public class CentralAfricaFernsTaxonImport  extends CentralAfricaFernsImportBase
                if (StringUtils.isNotBlank(referenceString) || StringUtils.isNotBlank(volume) ||\r
                                        StringUtils.isNotBlank(pages) || StringUtils.isNotBlank(illustrations) ||\r
                                        StringUtils.isNotBlank(datePublishedString) || StringUtils.isNotBlank(paperTitle)){\r
-                       NonViralName<?> name = CdmBase.deproxy(taxonBase.getName(), NonViralName.class);\r
+                       INonViralName name = taxonBase.getName();\r
                        Reference reference = ReferenceFactory.newGeneric();\r
                        reference.setAuthorship(name.getCombinationAuthorship());\r
                        reference.setTitle(referenceString);\r
                        reference.setVolume(volume);\r
                        reference.setEdition(part);\r
-                       Reference inrefernce = null;\r
+                       Reference inreference = null;\r
                        //TODO parser\r
                        TimePeriod datePublished = TimePeriodParser.parseString(datePublishedString);\r
                        reference.setDatePublished(datePublished);\r
@@ -697,7 +697,7 @@ public class CentralAfricaFernsTaxonImport  extends CentralAfricaFernsImportBase
 \r
                        TaxonBase<?> taxonBase = state.getRelatedObject(state.CURRENT_OBJECT_NAMESPACE, state.CURRENT_OBJECT_ID, TaxonBase.class);\r
                        if (StringUtils.isNotBlank(nomRemarksString)){\r
-                               NonViralName name = CdmBase.deproxy(taxonBase.getName(), NonViralName.class);\r
+                               INonViralName name = taxonBase.getName();\r
                                parseNomRemark(state, name, nomRemarksString.trim(),taxonStatus, taxonNumber);\r
                        }\r
                        return taxonBase;\r
@@ -707,7 +707,7 @@ public class CentralAfricaFernsTaxonImport  extends CentralAfricaFernsImportBase
        }\r
 \r
 \r
-       private void parseNomRemark(CentralAfricaFernsImportState state, NonViralName name, String nomRemarksString, String taxonStatus, String taxonNumber) {\r
+       private void parseNomRemark(CentralAfricaFernsImportState state, INonViralName name, String nomRemarksString, String taxonStatus, String taxonNumber) {\r
 \r
                if (nomRemarksString.equalsIgnoreCase("comb. illeg.")){\r
                        name.addStatus(NomenclaturalStatus.NewInstance(NomenclaturalStatusType.COMBINATION_ILLEGITIMATE()));\r

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java
index 3ba95072277b6440db8138e46821bf20fed53cbb..c2b6f168cf835e742d79a72eaa1cf84746f0f2d6 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/io/eflora/centralAfrica/ferns/CentralAfricaFernsTaxonRelationImport.java
@@ -48,7 +48,7 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;\r
 import eu.etaxonomy.cdm.model.location.NamedAreaType;\r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
+import eu.etaxonomy.cdm.model.name.INonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
@@ -142,7 +142,7 @@ public class CentralAfricaFernsTaxonRelationImport  extends CentralAfricaFernsIm
 \r
                List<Taxon> taxonList = getTaxonService().list(Taxon.class, null, null, null, propPath );\r
                for (Taxon taxon : taxonList){\r
-                       NonViralName<?> nvn = CdmBase.deproxy(taxon.getName(), NonViralName.class);\r
+                       INonViralName nvn = taxon.getName();\r
                        UUID uuid = taxon.getUuid();\r
                        String nameCache = nvn.getNameCache();\r
                        String titleCache = nvn.getTitleCache();\r
@@ -401,8 +401,8 @@ public class CentralAfricaFernsTaxonRelationImport  extends CentralAfricaFernsIm
         * @param constructedHigherTaxon\r
         */\r
        private Taxon mergeExistingAndConstructedTaxon(CentralAfricaFernsImportState state, Taxon existingTaxon, Taxon constructedTaxon) {\r
-               NonViralName<?> constructedName = CdmBase.deproxy(constructedTaxon.getName(), NonViralName.class);\r
-               NonViralName<?> existingName = CdmBase.deproxy(existingTaxon.getName(), NonViralName.class);\r
+               INonViralName constructedName = constructedTaxon.getName();\r
+               INonViralName existingName = existingTaxon.getName();\r
                if (constructedName.hasAuthors()){\r
                        if (! existingName.hasAuthors()){\r
                                logger.warn(state.getTaxonNumber() + " - Constrcucted name ("+constructedName.getTitleCache()+") has authors but existing name ("+existingName.getTitleCache()+") has no authors");\r
@@ -574,7 +574,7 @@ public class CentralAfricaFernsTaxonRelationImport  extends CentralAfricaFernsIm
         * @param name2\r
         * @return\r
         */\r
-       private boolean authorsMatch(NonViralName<?> name1, NonViralName<?> name2) {\r
+       private boolean authorsMatch(INonViralName name1, INonViralName name2) {\r
                String combinationAuthor1 = name1.computeCombinationAuthorNomenclaturalTitle();\r
                String combinationAuthor2 = name2.computeCombinationAuthorNomenclaturalTitle();\r
                String basionymAuthor1 = name1.computeBasionymAuthorNomenclaturalTitle();\r
@@ -1187,8 +1187,8 @@ public class CentralAfricaFernsTaxonRelationImport  extends CentralAfricaFernsIm
         * @param existingHigherTaxon\r
         */\r
        private boolean mergeAuthors_old(Taxon higherTaxon, Taxon existingHigherTaxon) {\r
-               NonViralName<?> existingName = CdmBase.deproxy(higherTaxon.getName(), NonViralName.class);\r
-               NonViralName<?> newName = CdmBase.deproxy(existingHigherTaxon.getName(), NonViralName.class);\r
+               INonViralName existingName = higherTaxon.getName();\r
+               INonViralName newName = existingHigherTaxon.getName();\r
                if (existingName == newName){\r
                        return true;\r
                }\r