update ReferenceFactory method
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 23 Apr 2013 14:20:04 +0000 (14:20 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 23 Apr 2013 14:20:04 +0000 (14:20 +0000)
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonImport.java

index c3df230d4d132c2fee396dc14b2042e37c48ae96..97daf8b774a47bf88aa49b26a2c302a06b06bdcd 100644 (file)
@@ -117,9 +117,8 @@ public class TcsXmlTaxonImport  extends TcsXmlImportBase implements ICdmIO<TcsXm
        }\r
        \r
        \r
-       protected static final Reference unknownSec(){\r
-               ReferenceFactory refFactory = ReferenceFactory.newInstance();\r
-               Reference result = refFactory.newGeneric();\r
+       protected static final Reference<?> unknownSec(){\r
+               Reference<?> result = ReferenceFactory.newGeneric();\r
                result.setTitleCache("UNKNOWN", true);\r
                return result;\r
        }\r
@@ -190,14 +189,14 @@ public class TcsXmlTaxonImport  extends TcsXmlImportBase implements ICdmIO<TcsXm
                                childName = "AccordingTo";\r
                                obligatory = false;\r
                                Element elAccordingTo = XmlHelp.getSingleChildElement(success, elTaxonConcept, childName, tcsNamespace, obligatory);\r
-                               Reference sec = makeAccordingTo(elAccordingTo, referenceMap, success);\r
+                               Reference<?> sec = makeAccordingTo(elAccordingTo, referenceMap, success);\r
                                elementList.add(childName.toString());\r
                                // TODO may sec be null?\r
                                if (sec == null){\r
                                        sec = unknownSec();\r
                                }\r
                                \r
-                               TaxonBase taxonBase;\r
+                               TaxonBase<?> taxonBase;\r
                                if (synonymIdSet.contains(strId)){\r
                                        taxonBase = Synonym.NewInstance(taxonName, sec);\r
                                }else{\r
@@ -344,14 +343,14 @@ public class TcsXmlTaxonImport  extends TcsXmlImportBase implements ICdmIO<TcsXm
         * @param elTaxonRelationships\r
         * @param success\r
         */\r
-       private void makeTaxonRelationships(TaxonBase name, Element elTaxonRelationships, ResultWrapper<Boolean> success){\r
+       private void makeTaxonRelationships(TaxonBase<?> name, Element elTaxonRelationships, ResultWrapper<Boolean> success){\r
                //TaxonRelationships are handled in TcsXmlTaxonRelationsImport\r
                return;\r
        }\r
        \r
 \r
        \r
-       private void makeSpecimenCircumscription(TaxonBase name, Element elSpecimenCircumscription, ResultWrapper<Boolean> success){\r
+       private void makeSpecimenCircumscription(TaxonBase<?> name, Element elSpecimenCircumscription, ResultWrapper<Boolean> success){\r
                if (elSpecimenCircumscription != null){\r
                        logger.warn("makeProviderLink not yet implemented");\r
                        success.setValue(false);\r
@@ -359,14 +358,14 @@ public class TcsXmlTaxonImport  extends TcsXmlImportBase implements ICdmIO<TcsXm
        }\r
        \r
        \r
-       private void makeCharacterCircumscription(TaxonBase name, Element elCharacterCircumscription, ResultWrapper<Boolean> success){\r
+       private void makeCharacterCircumscription(TaxonBase<?> name, Element elCharacterCircumscription, ResultWrapper<Boolean> success){\r
                if (elCharacterCircumscription != null){\r
                        logger.warn("makeProviderLink not yet implemented");\r
                        success.setValue(false);\r
                }\r
        }\r
        \r
-       private void makeProviderLink(TaxonBase name, Element elProviderLink, ResultWrapper<Boolean> success){\r
+       private void makeProviderLink(TaxonBase<?> name, Element elProviderLink, ResultWrapper<Boolean> success){\r
                if (elProviderLink != null){\r
                        logger.warn("makeProviderLink not yet implemented");\r
                        success.setValue(false);\r
@@ -374,7 +373,7 @@ public class TcsXmlTaxonImport  extends TcsXmlImportBase implements ICdmIO<TcsXm
        }\r
        \r
 \r
-       private void makeProviderSpecificData(TaxonBase name, Element elProviderSpecificData, ResultWrapper<Boolean> success){\r
+       private void makeProviderSpecificData(TaxonBase<?> name, Element elProviderSpecificData, ResultWrapper<Boolean> success){\r
                if (elProviderSpecificData != null){\r
                        logger.warn("makeProviderLink not yet implemented");\r
                        success.setValue(false);\r