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

[cdmlib-apps.git] / cdm-eflora / src / main / java / eu / etaxonomy / cdm / io / eflora / centralAfrica / ericaceae / CentralAfricaEricaceaeTaxonImport.java

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