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

index 368e4126ce1f53ec12836abe9b091444a74c81cd..cbb94f2608156bc85e75718f54cefa67a62b23fb 100644 (file)
@@ -203,7 +203,6 @@ public class TcsRdfReferenceImport extends TcsRdfImportBase implements ICdmIO<Tc
                \r
                Namespace rdfNamespace = config.getRdfNamespace();\r
                Namespace publicationNamespace = config.getPublicationNamespace();\r
-               ReferenceFactory refFactory = ReferenceFactory.newInstance();\r
                \r
                String idNamespace = "PublicationCitation";\r
                tcsElementName = "PublicationCitation";\r
@@ -229,7 +228,7 @@ public class TcsRdfReferenceImport extends TcsRdfImportBase implements ICdmIO<Tc
                        try {\r
                                Reference<?> ref = TcsRdfTransformer.pubTypeStr2PubType(strPubType);\r
                                if (ref==null){\r
-                                       ref = refFactory.newGeneric();\r
+                                       ref = ReferenceFactory.newGeneric();\r
                                }\r
                                \r
                                Set<String> omitAttributes = null;\r
@@ -240,7 +239,7 @@ public class TcsRdfReferenceImport extends TcsRdfImportBase implements ICdmIO<Tc
                                tcsNamespace = publicationNamespace;\r
                                String strAuthorship = elPublicationCitation.getChildText(tcsElementName, tcsNamespace);\r
                                //TODO\r
-                               TeamOrPersonBase authorTeam = Team.NewInstance();\r
+                               TeamOrPersonBase<?> authorTeam = Team.NewInstance();\r
                                authorTeam.setTitleCache(strAuthorship, true);\r
                                ref.setAuthorTeam(authorTeam);\r
                                \r
@@ -255,7 +254,7 @@ public class TcsRdfReferenceImport extends TcsRdfImportBase implements ICdmIO<Tc
                                tcsElementName = "parentPublication";\r
                                tcsNamespace = publicationNamespace;\r
                                String strParent = XmlHelp.getChildAttributeValue(elPublicationCitation, tcsElementName, tcsNamespace, "resource", rdfNamespace);\r
-                               Reference parent = referenceMap.get(strParent);\r
+                               Reference<?> parent = referenceMap.get(strParent);\r
                                if (parent != null){\r
                                        if ((ref.getType().equals(ReferenceType.Article)) && (parent.getType().equals(ReferenceType.Journal))){\r
                                                ((IArticle)ref).setInJournal((IJournal)parent);\r
@@ -312,7 +311,7 @@ public class TcsRdfReferenceImport extends TcsRdfImportBase implements ICdmIO<Tc
                }\r
                \r
                //change conceptRef uuid\r
-               Reference sec = referenceMap.get(config.getSourceSecId());\r
+               Reference<?> sec = referenceMap.get(config.getSourceSecId());\r
                if (sec == null){\r
                        sec = nomRefMap.get(config.getSourceSecId());   \r
                }\r