merge 3.0.2 to trunk

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / tcsrdf / TcsRdfTransformer.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTransformer.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTransformer.java
index 43f5a8424f622e9756e2c47169ac4654e88a43f0..a9e0c0fd7fa210758c9fbb6e02cdc17accfe3b35 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTransformer.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTransformer.java
@@ -19,15 +19,15 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;\r
-import eu.etaxonomy.cdm.model.reference.Article;\r
+/*import eu.etaxonomy.cdm.model.reference.Article;\r
 import eu.etaxonomy.cdm.model.reference.Book;\r
 import eu.etaxonomy.cdm.model.reference.BookSection;\r
 import eu.etaxonomy.cdm.model.reference.Journal;\r
 import eu.etaxonomy.cdm.model.reference.PersonalCommunication;\r
-import eu.etaxonomy.cdm.model.reference.PrintSeries;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.StrictReferenceBase;\r
-import eu.etaxonomy.cdm.model.reference.WebPage;\r
+import eu.etaxonomy.cdm.model.reference.PrintSeries;*/\r
+import eu.etaxonomy.cdm.model.reference.Reference;\r
+import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
+//import eu.etaxonomy.cdm.model.reference.WebPage;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
@@ -141,7 +141,7 @@ public final class TcsRdfTransformer {
        \r
        /** Creates an cdm-Rank by the tcs rank\r
         */\r
-       public static StrictReferenceBase pubTypeStr2PubType (String strPubType) throws UnknownCdmTypeException{\r
+       public static Reference pubTypeStr2PubType (String strPubType) throws UnknownCdmTypeException{\r
                String tcsRoot = "http://rs.tdwg.org/ontology/voc/PublicationCitation#";\r
                String tcsBook = tcsRoot + "Book";\r
                String tcsJournal = tcsRoot + "Journal";\r
@@ -171,15 +171,15 @@ public final class TcsRdfTransformer {
 //             SubReference    A Sub-Reference type publication.\r
 //             Thesis  A Thesis type publication.\r
 \r
-               \r
+               ReferenceFactory refFactory = ReferenceFactory.newInstance();\r
                if (strPubType == null){return null;\r
-               }else if (tcsBookSection.equals(strPubType)){return BookSection.NewInstance();\r
-               }else if (tcsBook.equals(strPubType)){return Book.NewInstance();\r
-               }else if (tcsArticle.equals(strPubType)){return Article.NewInstance();\r
-               }else if (tcsJournal.equals(strPubType)){return Journal.NewInstance();\r
-               }else if (tcsWebPage.equals(strPubType)){return WebPage.NewInstance();\r
-               }else if (tcsCommunication.equals(strPubType)){return PersonalCommunication.NewInstance();\r
-               }else if (tcsBookSeries.equals(strPubType)){return PrintSeries.NewInstance();\r
+               }else if (tcsBookSection.equals(strPubType)){return refFactory.newBookSection();\r
+               }else if (tcsBook.equals(strPubType)){return refFactory.newBook();\r
+               }else if (tcsArticle.equals(strPubType)){return refFactory.newArticle();\r
+               }else if (tcsJournal.equals(strPubType)){return refFactory.newJournal();\r
+               }else if (tcsWebPage.equals(strPubType)){return refFactory.newWebPage();\r
+               }else if (tcsCommunication.equals(strPubType)){return refFactory.newPersonalCommunication();\r
+               }else if (tcsBookSeries.equals(strPubType)){return refFactory.newPrintSeries();\r
                }       \r
                else {\r
                        throw new UnknownCdmTypeException("Unknown publication type " + strPubType);\r