ref #6369 adapt existing occurrences of interface to removed generics
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 26 Jan 2017 15:59:09 +0000 (16:59 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 26 Jan 2017 15:59:09 +0000 (16:59 +0100)
24 files changed:
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/demo/CsvDemoExport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/csv/redlist/out/CsvTaxExportRedlist.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/GbifReferenceCsv2CdmConverter.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaResourceRelationExport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxRecord.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTypesExport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportBase.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupKeyImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupNomenclatureImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/in/SDDImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXExtractor.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/search/NomenclaturalSortOrderBrigde.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/OaiPmhViewTest.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java

index ba383c97b475bacbbefcc5baabb7afa912e90764..1af982d45b614a3a38741d3b1195794a5f9cf18b 100644 (file)
@@ -977,8 +977,8 @@ public abstract class CdmImportBase<CONFIG extends IImportConfigurator, STATE ex
                        logger.warn("Parent taxon is null. Missing name parts can not be taken from parent");
                        return;
                }
-               INonViralName<?> parentName = parentTaxon.getName();
-               INonViralName<?> childName = childTaxon.getName();
+               INonViralName parentName = parentTaxon.getName();
+               INonViralName childName = childTaxon.getName();
                fillMissingEpithets(parentName, childName);
        }
 
index ecc37a76f9e8118e1f6bc25e89ef1a71f9013c00..41ecfe5bac2dfce1223e3510c72119f5239ea123 100644 (file)
@@ -157,7 +157,7 @@ public class CsvDemoExport extends CsvDemoBase {
         for (TaxonNode node : result){\r
             Taxon taxon = CdmBase.deproxy(node.getTaxon(), Taxon.class);\r
             CsvDemoRecord record = assembleRecord(state);\r
-            INonViralName<?> name = taxon.getName();\r
+            INonViralName name = taxon.getName();\r
             config.setClassificationTitleCache(classification.getTitleCache());\r
             if (! this.recordExists(taxon)){\r
                 handleTaxonBase(record, taxon, name, classification, null, false, false, config, node);\r
@@ -214,7 +214,7 @@ public class CsvDemoExport extends CsvDemoBase {
                        for (TaxonNode node : result){\r
                                Taxon taxon = CdmBase.deproxy(node.getTaxon(), Taxon.class);\r
                                CsvDemoRecord record = assembleRecord(state);\r
-                               INonViralName<?> name = taxon.getName();\r
+                               INonViralName name = taxon.getName();\r
                                //                      Classification classification = node.getClassification();\r
                                config.setClassificationTitleCache(classification.getTitleCache());\r
                                if (! this.recordExists(taxon)){\r
@@ -373,7 +373,7 @@ public class CsvDemoExport extends CsvDemoBase {
 //             for (Taxon misappliedName : misappliedNames ){\r
 ////                   CsvTaxRecordRedlist record = new CsvTaxRecordRedlist(metaRecord, config);\r
 //                     TaxonRelationshipType relType = TaxonRelationshipType.MISAPPLIED_NAME_FOR();\r
-//                     INonViralName<?> name = misappliedName.getName();\r
+//                     INonViralName name = misappliedName.getName();\r
 //\r
 //                     if (! this.recordExists(misappliedName)){\r
 //                             handleTaxonBase(record, misappliedName, name, taxon, classification, relType, false, false, config, node);\r
@@ -402,7 +402,7 @@ public class CsvDemoExport extends CsvDemoBase {
         * @param type\r
         */\r
        private void handleTaxonBase(CsvDemoRecord record, TaxonBase<?> taxonBase,\r
-                       INonViralName<?> name, Classification classification,\r
+                       INonViralName name, Classification classification,\r
                        RelationshipTermBase<?> relType, boolean isProParte, boolean isPartial,\r
                        CsvDemoExportConfigurator config, TaxonNode node) {\r
 \r
@@ -522,7 +522,7 @@ public class CsvDemoExport extends CsvDemoBase {
         */\r
        private void handleTaxonomicStatus(\r
                        CsvDemoRecord record,\r
-                       INonViralName<?> name,\r
+                       INonViralName name,\r
                        RelationshipTermBase<?> type,\r
                        boolean isProParte,\r
                        boolean isPartial) {\r
@@ -569,7 +569,7 @@ public class CsvDemoExport extends CsvDemoBase {
                        if (type == null){ // should not happen\r
                                type = SynonymType.SYNONYM_OF();\r
                        }\r
-                       INonViralName<?> name = synonym.getName();\r
+                       INonViralName name = synonym.getName();\r
                        synonymLabels.add(name.getTitleCache());\r
                }\r
                record.setSynonyms(synonymLabels);\r
index 04078f27c089220dd8ed7a9b91309962c7aae732..2a1f70a159df83cce8dd89348a3e40b15245f1f4 100644 (file)
@@ -108,7 +108,7 @@ public class CsvTaxExportRedlist extends CsvExportBaseRedlist {
                        for (TaxonNode node : filteredNodes){\r
                                Taxon taxon = CdmBase.deproxy(node.getTaxon(), Taxon.class);\r
                                CsvTaxRecordRedlist record = assembleRecord(state);\r
-                               INonViralName<?> name = taxon.getName();\r
+                               INonViralName name = taxon.getName();\r
                                Classification classification = node.getClassification();\r
                                config.setClassificationTitleCache(classification.getTitleCache());\r
                                if (! this.recordExists(taxon)){\r
@@ -219,7 +219,7 @@ public class CsvTaxExportRedlist extends CsvExportBaseRedlist {
                for (Taxon misappliedName : misappliedNames ){\r
 //                     CsvTaxRecordRedlist record = new CsvTaxRecordRedlist(metaRecord, config);\r
                        TaxonRelationshipType relType = TaxonRelationshipType.MISAPPLIED_NAME_FOR();\r
-                       INonViralName<?> name = misappliedName.getName();\r
+                       INonViralName name = misappliedName.getName();\r
 \r
                        if (! this.recordExists(misappliedName)){\r
                                handleTaxonBase(record, misappliedName, name, taxon, classification, relType, false, false, config);\r
@@ -244,7 +244,7 @@ public class CsvTaxExportRedlist extends CsvExportBaseRedlist {
         * @param type\r
         */\r
        private void handleTaxonBase(CsvTaxRecordRedlist record,TaxonBase<?> taxonBase,\r
-                       INonViralName<?> name, Taxon acceptedTaxon, Classification classification,\r
+                       INonViralName name, Taxon acceptedTaxon, Classification classification,\r
                        RelationshipTermBase<?> relType, boolean isProParte, boolean isPartial,\r
                        CsvTaxExportConfiguratorRedlist config) {\r
 \r
@@ -278,7 +278,7 @@ public class CsvTaxExportRedlist extends CsvExportBaseRedlist {
 \r
        private void handleTaxonomicStatus(\r
                        CsvTaxRecordRedlist record,\r
-                       INonViralName<?> name,\r
+                       INonViralName name,\r
                        RelationshipTermBase<?> type,\r
                        boolean isProParte,\r
                        boolean isPartial) {\r
@@ -314,7 +314,7 @@ public class CsvTaxExportRedlist extends CsvExportBaseRedlist {
                        if (type == null){ // should not happen\r
                                type = SynonymType.SYNONYM_OF();\r
                        }\r
-                       INonViralName<?> name = synonym.getName();\r
+                       INonViralName name = synonym.getName();\r
                        synonymLabels.add(name.getTitleCache());\r
                }\r
                record.setSynonyms(synonymLabels);\r
index da10321c20de79daeca82b45a0b9363204b5d0c4..eb381e7f56426701ccd53979df2d950c7e33055f 100644 (file)
@@ -125,7 +125,7 @@ public class GbifReferenceCsv2CdmConverter extends PartitionableConverterBase<Dw
                        if (isNotBlank(strType)){\r
                                if (strType.matches("Botanical Protologue")){\r
                                        if (taxon.getName() != null && reference != null && taxon.getName().isInstanceOf(NonViralName.class)){\r
-                                               INonViralName<?> nvn = taxon.getName();\r
+                                               INonViralName nvn = taxon.getName();\r
                                                nvn.setNomenclaturalReference(reference);\r
                                                isNomRef = true;\r
                                        }else{\r
@@ -139,7 +139,7 @@ public class GbifReferenceCsv2CdmConverter extends PartitionableConverterBase<Dw
                                //if reference equals in author and year we assume that it is the nom ref\r
                                //this information is usually only available for ICZN names\r
                                if (taxon.getName() != null && reference != null && taxon.getName().isInstanceOf(NonViralName.class)){\r
-                                       INonViralName<?> nvn = taxon.getName();\r
+                                       INonViralName nvn = taxon.getName();\r
                                        String taxonAuthor = nvn.getAuthorshipCache();\r
                                        String refAuthor = reference.getAuthorship().getNomenclaturalTitle();\r
                                        Integer combYear = null;\r
index 5ec347363a7029f9534d82389e99d783033b5b78..c9fa845d6b2da3c113174bc283f2c8d7648d1b3e 100644 (file)
@@ -121,7 +121,7 @@ public class DwcaResourceRelationExport extends DwcaExportBase {
 \r
                                //Name relationship\r
                                //TODO\r
-                               INonViralName<?> name = taxon.getName();\r
+                               INonViralName name = taxon.getName();\r
                                if (name == null){\r
                                        String message = "There is a taxon node without taxon: " + node.getId();\r
                                        logger.warn(message);\r
index 1fe90096e99c3cb5a17a8c54b18aea9047c389cc..342049803b3cc3410a6163b0b19d882ab0096f04 100644 (file)
@@ -96,7 +96,7 @@ public class DwcaTaxExport extends DwcaExportBase {
                                Taxon taxon = CdmBase.deproxy(node.getTaxon(), Taxon.class);\r
                                DwcaTaxRecord record = new DwcaTaxRecord(metaRecord, config);\r
 \r
-                               INonViralName<?> name = taxon.getName();\r
+                               INonViralName name = taxon.getName();\r
                                Taxon parent = node.getParent() == null ? null : node.getParent().getTaxon();\r
                                TaxonNameBase<?, ?> basionym = name.getBasionym();\r
                                Classification classification = node.getClassification();\r
@@ -142,7 +142,7 @@ public class DwcaTaxExport extends DwcaExportBase {
                        if (type == null){ // should not happen\r
                                type = SynonymType.SYNONYM_OF();\r
                        }\r
-                       INonViralName<?> name = synonym.getName();\r
+                       INonViralName name = synonym.getName();\r
                        //????\r
                        Taxon parent = null;\r
                        TaxonNameBase<?, ?> basionym = name.getBasionym();\r
@@ -160,7 +160,7 @@ public class DwcaTaxExport extends DwcaExportBase {
                for (Taxon misappliedName : misappliedNames ){\r
                        DwcaTaxRecord record = new DwcaTaxRecord(metaRecord, config);\r
                        TaxonRelationshipType relType = TaxonRelationshipType.MISAPPLIED_NAME_FOR();\r
-                       INonViralName<?> name = misappliedName.getName();\r
+                       INonViralName name = misappliedName.getName();\r
                        //????\r
                        Taxon parent = null;\r
                        TaxonNameBase<?, ?> basionym = name.getBasionym();\r
@@ -185,7 +185,7 @@ public class DwcaTaxExport extends DwcaExportBase {
         * @param config\r
         * @param type\r
         */\r
-       private void handleTaxonBase(DwcaTaxRecord record, TaxonBase<?> taxonBase, INonViralName<?> name,\r
+       private void handleTaxonBase(DwcaTaxRecord record, TaxonBase<?> taxonBase, INonViralName name,\r
                        Taxon acceptedTaxon, Taxon parent, TaxonNameBase<?, ?> basionym, Classification classification,\r
                        RelationshipTermBase<?> relType, boolean isProParte, boolean isPartial, DwcaTaxExportConfigurator config) {\r
                record.setId(taxonBase.getId());\r
@@ -324,7 +324,7 @@ public class DwcaTaxExport extends DwcaExportBase {
         * @param isProParte\r
         */\r
        private void handleTaxonomicStatus(DwcaTaxRecord record,\r
-                       INonViralName<?> name, RelationshipTermBase<?> type,\r
+                       INonViralName name, RelationshipTermBase<?> type,\r
                        boolean isProParte, boolean isPartial) {\r
                if (type == null){\r
                        record.setTaxonomicStatus(name.getNomenclaturalCode().acceptedTaxonStatusLabel());\r
@@ -353,7 +353,7 @@ public class DwcaTaxExport extends DwcaExportBase {
         * @param record\r
         * @param name\r
         */\r
-       private void handleUninomialOrGenus(DwcaTaxRecord record, INonViralName<?> name) {\r
+       private void handleUninomialOrGenus(DwcaTaxRecord record, INonViralName name) {\r
                //epethita\r
                String firstEpi = name.getGenusOrUninomial();\r
                if (!StringUtils.isBlank(firstEpi)){\r
@@ -391,7 +391,7 @@ public class DwcaTaxExport extends DwcaExportBase {
         * @param name\r
         */\r
        private void handleNomStatus(DwcaTaxRecord record, TaxonBase<?> taxon,\r
-                       INonViralName<?> name) {\r
+                       INonViralName name) {\r
                int nStatus = name.getStatus().size();\r
                if (nStatus > 0){\r
                        if (name.getStatus().size()> 1){\r
index 5e9686c4c57867a10487fa4d56f23b9391b751c8..6c0d346740e3b033842ec03a88ccfc2c4e108e6b 100644 (file)
@@ -409,7 +409,7 @@ public class DwcaTaxRecord extends DwcaRecordBase{
        public String getScientificNameId() {\r
                return scientificNameId.getId();\r
        }\r
-       public void setScientificNameId(ITaxonNameBase<?> scientificNameId) {\r
+       public void setScientificNameId(ITaxonNameBase scientificNameId) {\r
                this.scientificNameId.setId(scientificNameId);\r
        }\r
 \r
index 3dd124f41f7e78f1a36f422f667cde00fe654bd0..aaef8bd01520c6059fec61f0e019803f843b9576 100644 (file)
@@ -103,7 +103,7 @@ public class DwcaTypesExport extends DwcaExportBase {
                                }\r
 \r
                                //type specimen\r
-                               INonViralName<?> nvn = taxon.getName();\r
+                               INonViralName nvn = taxon.getName();\r
                                handleTypeName(writer, taxon, nvn, metaRecord, config);\r
                                for (Synonym synonym : taxon.getSynonyms()){\r
                                        handleTypeName(writer, synonym, nvn, metaRecord, config);\r
@@ -139,7 +139,7 @@ public class DwcaTypesExport extends DwcaExportBase {
         * @return\r
         */\r
        private Set<TypeDesignationBase> handleTypeName(PrintWriter writer, TaxonBase<?> taxonBase,\r
-               INonViralName<?> nvn, DwcaMetaDataRecord metaRecord, DwcaTaxExportConfigurator config) {\r
+               INonViralName nvn, DwcaMetaDataRecord metaRecord, DwcaTaxExportConfigurator config) {\r
                Set<TypeDesignationBase> designations = nvn.getTypeDesignations();\r
                for (TypeDesignationBase<?> designation:designations){\r
                        DwcaTypesRecord record = new DwcaTypesRecord(metaRecord, config);\r
index 628265f1eded75d5a0804b0cea28f7feb50f251a..8e325481a183c9cc0b29d0aa2398ecb1c8cfa20b 100644 (file)
@@ -1149,7 +1149,7 @@ public abstract class MarkupImportBase  {
        }
 
        protected void handleFullName(MarkupImportState state, XMLEventReader reader,
-                       INonViralName<?> name, XMLEvent next) throws XMLStreamException {
+                       INonViralName name, XMLEvent next) throws XMLStreamException {
                String fullNameStr;
                Map<String, Attribute> attrs = getAttributes(next);
                String rankStr = getAndRemoveRequiredAttributeValue(next,
index 44f1d9ca0150c6f7f0580f457ca662ae16fa24eb..3a22cf59d7a12ddbe0146fe6921c673d81c19bfd 100644 (file)
@@ -322,7 +322,7 @@ public class MarkupKeyImport  extends MarkupImportBase  {
                        return "";
                }
 
-               INonViralName<?> name = taxon.getName();
+               INonViralName name = taxon.getName();
                String strGenusName = name.getGenusOrUninomial();
 
                String normalized = normalizeKeyString(strGoto, location);
@@ -389,7 +389,7 @@ public class MarkupKeyImport  extends MarkupImportBase  {
                Taxon taxon = state.getCurrentTaxon();
                String num = state.getCurrentTaxonNum();
 
-               INonViralName<?> nvn = taxon.getName();
+               INonViralName nvn = taxon.getName();
                String nameString = nvn.getNameCache();
                nameString = normalizeKeyString(nameString, event.getLocation());
         nameString = removeTrailingDot(nameString);
index 47d30e103f0bb3dcf7d3df8545094c6393023157..493ec50c6ef0d8c98afa0e98ad21daf0b456e4a2 100644 (file)
@@ -105,7 +105,7 @@ public class MarkupNomenclatureImport extends MarkupImportBase {
                        } else if (isEndingElement(next, NAME_TYPE)) {
                                state.setNameType(false);
                        } else if (isStartingElement(next, NOM)) {
-                               INonViralName<?> name = handleNom(state, reader, next, homotypicalGroup);
+                               INonViralName name = handleNom(state, reader, next, homotypicalGroup);
                                homotypicalGroup = name.getHomotypicalGroup();
                                hasNom = true;
                        } else if (isStartingElement(next, NAME_TYPE)) {
@@ -407,7 +407,7 @@ public class MarkupNomenclatureImport extends MarkupImportBase {
         * @param infrankStr
         */
        private void makeRankDecision(MarkupImportState state,
-                       Map<String, String> nameMap, INonViralName<?> name, XMLEvent event,
+                       Map<String, String> nameMap, INonViralName name, XMLEvent event,
                        String infrankStr) {
                // TODO ranks
                for (String key : nameMap.keySet()) {
@@ -488,7 +488,7 @@ public class MarkupNomenclatureImport extends MarkupImportBase {
         * @param infrParAut
         * @param infrAut
         */
-       private void makeNomenclaturalAuthors(MarkupImportState state, XMLEvent event, INonViralName<?> name,
+       private void makeNomenclaturalAuthors(MarkupImportState state, XMLEvent event, INonViralName name,
                        String authorStr, String paraut, String infrParAut, String infrAut) {
                if (name.getRank() != null && name.getRank().isInfraSpecific()) {
                        if (StringUtils.isNotBlank(infrAut)) {
@@ -575,7 +575,7 @@ public class MarkupNomenclatureImport extends MarkupImportBase {
        }
 
        private void handleCitation(MarkupImportState state, XMLEventReader reader,
-                       XMLEvent parentEvent, INonViralName<?> name, Map<String, String> nameMap) throws XMLStreamException {
+                       XMLEvent parentEvent, INonViralName name, Map<String, String> nameMap) throws XMLStreamException {
                String classValue = getClassOnlyAttribute(parentEvent);
 
                state.setCitation(true);
@@ -633,7 +633,7 @@ public class MarkupNomenclatureImport extends MarkupImportBase {
 
        }
 
-       private void doCitation(MarkupImportState state, INonViralName<?> name,
+       private void doCitation(MarkupImportState state, INonViralName name,
                        String classValue, Reference reference, String microCitation,
                        XMLEvent parentEvent) {
                if (PUBLICATION.equalsIgnoreCase(classValue)) {
@@ -665,7 +665,7 @@ public class MarkupNomenclatureImport extends MarkupImportBase {
         * @param infrParAut
         * @param infrAut
         */
-       private void testRankAuthorConsistency(INonViralName<?> name, XMLEvent event,
+       private void testRankAuthorConsistency(INonViralName name, XMLEvent event,
                        String authorStr, String paraut, String infrParAut, String infrAut) {
                if (name.getRank() == null) {
                        return;
index ad5a7cfbb45c14e810bedd174967bde2f5831911..4b670d6a305e330cf4425e94b83bfc0cd7f7f080 100644 (file)
@@ -1260,7 +1260,7 @@ public class SDDImport extends XmlImportBase<SDDImportConfigurator, SDDImportSta
                Taxon taxon = null;\r
                Element elTaxonName = elScope.getChild("TaxonName", sddNamespace);\r
                String ref = elTaxonName.getAttributeValue("ref");\r
-               INonViralName<?> nonViralName = taxonNameBases.get(ref);\r
+               INonViralName nonViralName = taxonNameBases.get(ref);\r
 \r
                if(cdmState.getConfig().isReuseExistingTaxaWhenPossible()){\r
                        taxon = getTaxonService().findBestMatchingTaxon(nonViralName.getTitleCache());\r
index 8ddd73cb620d76e646407e5a0854a27ddf4998a4..b426b887bd7c175b24285c2d74700a1d65c27aae 100644 (file)
@@ -738,7 +738,7 @@ public abstract class SpecimenImportBase<CONFIG extends IImportConfigurator, STA
             * @param state: the ABCD import state
             */
            protected void addParentTaxon(Taxon taxon, STATE state, boolean preferredFlag, Classification classification){
-               INonViralName<?>  nvname = taxon.getName();
+               INonViralName  nvname = taxon.getName();
                Rank rank = nvname.getRank();
                Taxon genus =null;
                Taxon subgenus =null;
index 5b5b8ae1cd7bcb1fa97fe8ffd02a172ffa7e3e05..abef0e4909d27103912caf0878e1f082637cde6c 100644 (file)
@@ -494,7 +494,7 @@ public class SpecimenCdmExcelImport  extends ExcelTaxonOrSpecimenImportBase<Spec
                }
 
                //name
-               INonViralName<?> name;
+               INonViralName name;
                INonViralNameParser parser = NonViralNameParserImpl.NewInstance();
                NomenclaturalCode nc = state.getConfig().getNomenclaturalCode();
                if (StringUtils.isNotBlank(commonDetermination.fullName)){
@@ -565,7 +565,7 @@ public class SpecimenCdmExcelImport  extends ExcelTaxonOrSpecimenImportBase<Spec
 
 
 
-       private void setAuthorship(INonViralName<?> name, String author, INonViralNameParser<NonViralName> parser) {
+       private void setAuthorship(INonViralName name, String author, INonViralNameParser<NonViralName> parser) {
                if (name instanceof BotanicalName || name instanceof ZoologicalName){
                        try {
                                parser.parseAuthors(name, author);
index 15786209f8da62c368d296784d4dadbd2e90da87..df61ae9af00f15eb40a933fe082b816be25eefcb 100644 (file)
@@ -770,7 +770,7 @@ public class TaxonXExtractor {
      * @param similarityAuthor
      * @return
      */
-    protected boolean askIfReuseBestMatchingTaxon(INonViralName<?> taxonnamebase2, Taxon bestMatchingTaxon, Reference refMods, double similarityScore, double similarityAuthor) {
+    protected boolean askIfReuseBestMatchingTaxon(INonViralName taxonnamebase2, Taxon bestMatchingTaxon, Reference refMods, double similarityScore, double similarityAuthor) {
         Object[] options = { UIManager.getString("OptionPane.yesButtonText"),
                 UIManager.getString("OptionPane.noButtonText")};
 
index b914cd83a762b111724d072929f70e950f450bcb..ca1ab2210de597b5ad4b59e866d312d1d473aa14 100644 (file)
@@ -2441,7 +2441,7 @@ public class TaxonXTreatmentExtractor extends TaxonXExtractor{
 
         boolean parseNameManually=false;
         INonViralNameParser<?> parser = NonViralNameParserImpl.NewInstance();
-        ITaxonNameBase<?>  nameToBeFilledTest ;
+        ITaxonNameBase  nameToBeFilledTest ;
 
         //if selected the atomised version
         if(newName==atomisedNameStr){
@@ -2622,13 +2622,13 @@ public class TaxonXTreatmentExtractor extends TaxonXExtractor{
 
     }
 
-    private ITaxonNameBase<?> parseWithExtension(INonViralNameParser parser, String atomisedNameStr, Rank rank, String followingText, HashMap<String, String> atomisedMap) {
+    private ITaxonNameBase parseWithExtension(INonViralNameParser parser, String atomisedNameStr, Rank rank, String followingText, HashMap<String, String> atomisedMap) {
        Object[] nameExtensionResult = getPossibleExtension(followingText, atomisedMap, nomenclaturalCode);
 
-       ITaxonNameBase<?> name = parser.parseFullName(atomisedNameStr, nomenclaturalCode, rank);
+       ITaxonNameBase name = parser.parseFullName(atomisedNameStr, nomenclaturalCode, rank);
        if (nameExtensionResult != null && nameExtensionResult[0] != null){
                String ext = (String)nameExtensionResult[0];
-               ITaxonNameBase<?> extName =parser.parseFullName(atomisedNameStr + " " + ext, nomenclaturalCode, rank);
+               ITaxonNameBase extName =parser.parseFullName(atomisedNameStr + " " + ext, nomenclaturalCode, rank);
                if (! extName.hasProblem()){
                        name = extName;
                        this.usedFollowingTextPrefix = ext;
@@ -3520,7 +3520,7 @@ public class TaxonXTreatmentExtractor extends TaxonXExtractor{
             //logger.info("tmpList returned: "+tmpList.size());
 
 
-            INonViralName<?> identicName = null;
+            INonViralName identicName = null;
             boolean foundIdentic=false;
             TaxonBase<?> tmpTaxonBase=null;
             //            Taxon tmpPartial=null;
@@ -3559,7 +3559,7 @@ public class TaxonXTreatmentExtractor extends TaxonXExtractor{
             }
             if ((tmpTaxonBase == null || !foundIdentic) ||  (tmpTaxonBase != null && !statusMatch) ||  (tmpTaxonBase != null && !appendedMatch && !statusMatch)){
 
-               INonViralName<?> tnb;
+               INonViralName tnb;
                if (identicName == null){
                        tnb = getNonViralNameAccNomenclature();
                        tnb.setRank(rank);
@@ -4806,7 +4806,7 @@ public class TaxonXTreatmentExtractor extends TaxonXExtractor{
      * @param tnb
      * @return
      */
-    private Taxon findMatchingTaxon(INonViralName<?> tnb, Reference refMods) {
+    private Taxon findMatchingTaxon(INonViralName tnb, Reference refMods) {
         logger.info("findMatchingTaxon");
         Taxon tmp=null;
 
@@ -4888,7 +4888,7 @@ public class TaxonXTreatmentExtractor extends TaxonXExtractor{
      * @param similarityAuthor
      * @return
      */
-    private boolean compareAndCheckTaxon(INonViralName<?> tnb, Reference refMods, double similarityScore,
+    private boolean compareAndCheckTaxon(INonViralName tnb, Reference refMods, double similarityScore,
             Taxon bestMatchingTaxon, double similarityAuthor) {
         //logger.info("compareAndCheckTaxon");
         boolean insertAsExisting;
@@ -5571,7 +5571,7 @@ public class TaxonXTreatmentExtractor extends TaxonXExtractor{
      * @param insertAsExisting
      * @param refMods
      */
-    private void logDecision(INonViralName<?> tnb, Taxon bestMatchingTaxon, boolean insertAsExisting, Reference refMods) {
+    private void logDecision(INonViralName tnb, Taxon bestMatchingTaxon, boolean insertAsExisting, Reference refMods) {
         try{
             FileWriter fstream = new FileWriter(TaxonXImport.LOG_FOLDER + "Decisions_"+classification.toString()+".txt", true);
             BufferedWriter out = new BufferedWriter(fstream);
index af17e6a6982268c18d603d8ea8c7eef49e32ee7a..4ca64fea8666f926f714e7220a63cfcbed49592a 100644 (file)
@@ -369,7 +369,7 @@ public class TcsXmlTaxonNameImport extends TcsXmlImportBase implements ICdmIO<Tc
                        Namespace ns = elCanonicalAuthorship.getNamespace();
 
                        if (name instanceof NonViralName){
-                               INonViralName<?> nonViralName = name;
+                               INonViralName nonViralName = name;
 
                                String childName = "Simple";
                                boolean obligatory = true;
index 0a4db8cc1fc7fce82d16759ed31c447fdb67a3e7..927a9db812059047d9761e8e88bc135fbaa901bc 100644 (file)
@@ -56,7 +56,7 @@ public class NomenclaturalSortOrderBrigde extends AbstractClassBridge {
 
     @Override
     public void set(String name, Object value, Document document, LuceneOptions luceneOptions) {
-        INonViralName<?> n = null;
+        INonViralName n = null;
 
         if(value instanceof TaxonBase) {
             try {
@@ -70,7 +70,7 @@ public class NomenclaturalSortOrderBrigde extends AbstractClassBridge {
             }
 
         }else if(value instanceof TaxonNameBase){
-            n = (INonViralName<?>)value;
+            n = (INonViralName)value;
         }
         if(n == null) {
             logger.error("Unsupported type: " + value.getClass().getName());
index 8298f24ae0099430fbcaadc88cc140b67dff70e0..b5b91ab358ee8163c74bd2e1cef2c8c2f23f7e46 100644 (file)
@@ -152,7 +152,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
                }
        }
 
-       private String standardize(INonViralName<?> nameToBeFilled, String fullReferenceString, boolean makeEmpty){
+       private String standardize(INonViralName nameToBeFilled, String fullReferenceString, boolean makeEmpty){
                //Check null and standardize
                if (fullReferenceString == null){
                        //return null;
@@ -174,7 +174,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
         * @param nameToBeFilled
         * @return
         */
-       private String getCodeSpecificFullNameRegEx(INonViralName<?> nameToBeFilledOrig){
+       private String getCodeSpecificFullNameRegEx(INonViralName nameToBeFilledOrig){
            NonViralName<?> nameToBeFilled = HibernateProxyHelper.deproxy(nameToBeFilledOrig, NonViralName.class);
                if (nameToBeFilled instanceof ZoologicalName){
                        return anyZooFullName;
@@ -193,7 +193,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
         * @param nameToBeFilled
         * @return
         */
-       private String getCodeSpecificSimpleNameRegEx(INonViralName<?> nameToBeFilled){
+       private String getCodeSpecificSimpleNameRegEx(INonViralName nameToBeFilled){
                nameToBeFilled = HibernateProxyHelper.deproxy(nameToBeFilled, NonViralName.class);
 
                if (nameToBeFilled instanceof ZoologicalName){
@@ -273,7 +273,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
                parsable.setProblemEnds(-1);
        }
 
-       private void makeNoFullRefMatch(INonViralName<?> nameToBeFilled, String fullReferenceString, Rank rank){
+       private void makeNoFullRefMatch(INonViralName nameToBeFilled, String fullReferenceString, Rank rank){
            //try to parse first part as name, but keep in mind full string is not parsable
                int start = 0;
 
@@ -307,7 +307,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
                logger.info("no applicable parsing rule could be found for \"" + fullReferenceString + "\"");
        }
 
-       private void makeNameWithReference(INonViralName<?> nameToBeFilled,
+       private void makeNameWithReference(INonViralName nameToBeFilled,
                        String fullReferenceString,
                        Matcher nameAndRefSeparatorMatcher,
                        Rank rank,
@@ -388,7 +388,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
         * The nomenclatural status part ist deleted from the reference String.
         * @return  String the new (shortend) reference String
         */
-       public String parseNomStatus(String fullString, INonViralName<?> nameToBeFilled, boolean makeEmpty) {
+       public String parseNomStatus(String fullString, INonViralName nameToBeFilled, boolean makeEmpty) {
                Set<NomenclaturalStatusType> existingStatusTypeSet = new HashSet<NomenclaturalStatusType>();
                Set<NomenclaturalStatusType> newStatusTypeSet = new HashSet<NomenclaturalStatusType>();
                for (NomenclaturalStatus existingStatus : nameToBeFilled.getStatus()){
@@ -434,7 +434,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
        }
 
 
-       private void parseReference(INonViralName<?> nameToBeFilled, String strReference, boolean isInReference){
+       private void parseReference(INonViralName nameToBeFilled, String strReference, boolean isInReference){
 
                INomenclaturalReference ref;
                String originalStrReference = strReference;
@@ -500,7 +500,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
         * @param strReference
         * @return
         */
-       private Reference makeDetailYearUnparsable(INonViralName<?> nameToBeFilled, String strReference) {
+       private Reference makeDetailYearUnparsable(INonViralName nameToBeFilled, String strReference) {
                Reference ref;
 
                ref = ReferenceFactory.newGeneric();
@@ -751,7 +751,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
 
        @Override
        public void parseFullName(INonViralName nameToBeFilledOrig, String fullNameStringOrig, Rank rank, boolean makeEmpty) {
-           INonViralName<?> nameToBeFilled = nameToBeFilledOrig;
+           INonViralName nameToBeFilled = nameToBeFilledOrig;
 
            //TODO prol. etc.
                boolean hasCheckRankProblem = false; //was rank guessed in a previous parsing process?
@@ -1019,7 +1019,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
         notToBeDeleted.add(relToKeep);
     }
 
-    private void handleHybridBits(INonViralName<?> nameToBeFilled) {
+    private void handleHybridBits(INonViralName nameToBeFilled) {
                //uninomial
                String uninomial = CdmUtils.Nz(nameToBeFilled.getGenusOrUninomial());
                boolean isUninomialHybrid = uninomial.startsWith(hybridSign);
@@ -1074,7 +1074,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
         */
        @Override
        public void parseAuthors(INonViralName nonViralNameOrig, String authorString) throws StringNotParsableException{
-           INonViralName<?> nonViralName = nonViralNameOrig;
+           INonViralName nonViralName = nonViralNameOrig;
            TeamOrPersonBase<?>[] authors = new TeamOrPersonBase[4];
                Integer[] years = new Integer[4];
                Class clazz = nonViralName.getClass();
@@ -1095,7 +1095,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
         * @param fullNameString
         * @param authorString
         */
-       public void handleAuthors(INonViralName<?> nameToBeFilled, String fullNameString, String authorString) {
+       public void handleAuthors(INonViralName nameToBeFilled, String fullNameString, String authorString) {
            TeamOrPersonBase<?>[] authors = new TeamOrPersonBase[4];
                Integer[] years = new Integer[4];
                try {
@@ -1400,7 +1400,7 @@ public class NonViralNameParserImpl extends NonViralNameParserImplRegExBase impl
        }
 
 
-       private void makeEmpty(INonViralName<?> nameToBeFilled){
+       private void makeEmpty(INonViralName nameToBeFilled){
                nameToBeFilled.setRank(null);
                nameToBeFilled.setTitleCache(null, false);
                nameToBeFilled.setFullTitleCache(null, false);
index dc8e24216c52f5b4f7458e0cd93fb2c69213e56f..eb8e53ec90f3393f113f6ecc055cae9662e7bebf 100644 (file)
@@ -39,7 +39,7 @@ public class DatabaseInitialiser {
        public static Integer insertTaxon(String speciesname){
                logger.info("Populate database with a taxon");
                IJournal sec = ReferenceFactory.newJournal();
-               INonViralName<?> nvName = BotanicalName.NewInstance(Rank.SPECIES());
+               INonViralName nvName = BotanicalName.NewInstance(Rank.SPECIES());
                Taxon tax = Taxon.NewInstance(nvName, (Reference)sec);
                nvName.setNameCache(speciesname);
                nvName.setTitleCache(speciesname, true);
index d74744c3d97bbd731b6642a788c7c5629cc63c4b..9a8890b6f41cd94ea0fd7a3dc3bca40d3a6b4886 100644 (file)
@@ -374,7 +374,7 @@ public class NonViralNameTest extends EntityTestBase {
                nonViralName1.addHybridChild(child, HybridRelationshipType.FEMALE_PARENT(), "child rule");
 
 
-               INonViralName<?> clone = (INonViralName)nonViralName1.clone();
+               INonViralName clone = (INonViralName)nonViralName1.clone();
                Assert.assertEquals("Genus should be equal", "Aus", clone.getGenusOrUninomial());
                Assert.assertEquals("Infragenus should be equal", "Infaus", clone.getInfraGenericEpithet());
                Assert.assertEquals("Specific epithet should be equal", "bus", clone.getSpecificEpithet());
index 66aa9d1fb3d3aeb50edf4395b24b812fddd0f173..21be1dc1b3578a9d109d26c4a8f9ff0b75d0109e 100644 (file)
@@ -29,6 +29,7 @@ import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;\r
 import eu.etaxonomy.cdm.common.UriUtils;\r
 import eu.etaxonomy.cdm.model.common.LSID;\r
+import eu.etaxonomy.cdm.model.name.ITaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.view.AuditEvent;\r
@@ -147,7 +148,7 @@ public class OaiPmhViewTest extends UnitilsJUnit4 {
             return;\r
         }\r
 \r
-        Taxon taxon = Taxon.NewInstance(null, null);\r
+        Taxon taxon = Taxon.NewInstance((ITaxonNameBase)null, null);\r
         taxon.setTitleCache("TitleCache", true);\r
         taxon.setCreated(new DateTime());\r
         taxon.setLsid(new LSID("urn:lsid:example.org:taxonconcepts:1"));\r
index 022c8c94c0ad65420cd679241ddd125df04a8016..5a842eeb5905d5faf1f7a2705295e180362468ef 100644 (file)
@@ -509,7 +509,7 @@ public class ClassificationServiceImpl extends IdentifiableServiceBase<Classific
        for(TaxonNode node:allNodesOfClassification){
                final TaxonNode tn = node;
                Taxon taxon = node.getTaxon();
-               INonViralName<?> name = taxon.getName();
+               INonViralName name = taxon.getName();
                String genusOrUninomial = name.getGenusOrUninomial();
                //if rank unknown split string and take first word
                if(genusOrUninomial == null){
index 33ed33112e0b5c9a9a59975f059fa25c0ef60f60..e90449e1356ff8725b48625bcc3acb5f6cef696c 100644 (file)
@@ -361,7 +361,7 @@ public abstract class IdentifiableServiceBase<T extends IdentifiableEntity, DAO
                if (entity instanceof NonViralName ){
 
                        try{
-                               INonViralName<?> nvn = (INonViralName<?>) entity;
+                               INonViralName nvn = (INonViralName) entity;
                                if (!nvn.isProtectedNameCache()){
                                    nvn.setProtectedNameCache(true);
                                        oldNameCache = nvn.getNameCache();
@@ -386,7 +386,7 @@ public abstract class IdentifiableServiceBase<T extends IdentifiableEntity, DAO
                }
                setOtherCachesNull(entity);
                String newTitleCache= null;
-               INonViralName<?> nvn = null; //TODO find better solution
+               INonViralName nvn = null; //TODO find better solution
                try{
                        if (entity instanceof NonViralName){
                                nvn = (INonViralName) entity;