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

index 57f59e91a34ae4e601b2da50ebd35a5c22b6ea02..8e3fa704fe315cd055e5f1165cc9fc08a1f7573e 100644 (file)
@@ -42,23 +42,9 @@ import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.reference.IArticle;\r
-import eu.etaxonomy.cdm.model.reference.IBook;\r
-import eu.etaxonomy.cdm.model.reference.IBookSection;\r
-import eu.etaxonomy.cdm.model.reference.ICdDvd;\r
-import eu.etaxonomy.cdm.model.reference.IDatabase;\r
-import eu.etaxonomy.cdm.model.reference.IGeneric;\r
-import eu.etaxonomy.cdm.model.reference.IJournal;\r
-import eu.etaxonomy.cdm.model.reference.IPatent;\r
-import eu.etaxonomy.cdm.model.reference.IPersonalCommunication;\r
-import eu.etaxonomy.cdm.model.reference.IPrintSeries;\r
 import eu.etaxonomy.cdm.model.reference.IPrintedUnitBase;\r
-import eu.etaxonomy.cdm.model.reference.IProceedings;\r
 import eu.etaxonomy.cdm.model.reference.IPublicationBase;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
-import eu.etaxonomy.cdm.model.reference.IReport;\r
-import eu.etaxonomy.cdm.model.reference.IThesis;\r
-import eu.etaxonomy.cdm.model.reference.IWebPage;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
 /**\r
  * @author a.bukhman\r
@@ -69,7 +55,6 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
        private static final Logger logger = Logger.getLogger(EndnoteRecordsImport.class);\r
 \r
        private static int modCount = 1000;\r
-       ReferenceFactory refFactory = ReferenceFactory.newInstance();\r
        \r
        public EndnoteRecordsImport(){\r
                super();\r
@@ -140,20 +125,20 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                        IPublicationBase publicationBase = null;                        \r
                        CdmBase cdmBase = null;   \r
                        \r
-                       Reference article = refFactory.newArticle();                            \r
-                       Reference book = refFactory.newBook();\r
-                       Reference bookSection = refFactory.newBookSection();\r
-                       Reference thesis = refFactory.newThesis();\r
-                       Reference journal = refFactory.newJournal();\r
-                       Reference patent =  refFactory.newPatent();\r
-                       Reference generic = refFactory.newGeneric();\r
-                       Reference personalCommunication = refFactory.newPersonalCommunication();\r
-                       Reference proceedings  = refFactory.newProceedings();\r
-                       Reference printSeries = refFactory.newPrintSeries();\r
-                       Reference cdDvd = refFactory.newCdDvd();\r
-                       Reference database = refFactory.newDatabase();\r
-                       Reference report = refFactory.newReport();\r
-                       Reference webPage = refFactory.newWebPage();\r
+                       Reference<?> article = ReferenceFactory.newArticle();                           \r
+                       Reference<?> book = ReferenceFactory.newBook();\r
+                       Reference<?> bookSection = ReferenceFactory.newBookSection();\r
+                       Reference<?> thesis = ReferenceFactory.newThesis();\r
+                       Reference<?> journal = ReferenceFactory.newJournal();\r
+                       Reference<?> patent =  ReferenceFactory.newPatent();\r
+                       Reference<?> generic = ReferenceFactory.newGeneric();\r
+                       Reference<?> personalCommunication = ReferenceFactory.newPersonalCommunication();\r
+                       Reference<?> proceedings  = ReferenceFactory.newProceedings();\r
+                       Reference<?> printSeries = ReferenceFactory.newPrintSeries();\r
+                       Reference<?> cdDvd = ReferenceFactory.newCdDvd();\r
+                       Reference<?> database = ReferenceFactory.newDatabase();\r
+                       Reference<?> report = ReferenceFactory.newReport();\r
+                       Reference<?> webPage = ReferenceFactory.newWebPage();\r
                        Institution school = Institution.NewInstance();\r
                        Team authorTeam = Team.NewInstance();            \r
                        \r
@@ -258,7 +243,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                        reference = webPage;\r
                                }else {\r
                                        logger.warn("The type was not found...");\r
-                                       reference = (Reference) generic;\r
+                                       reference = generic;\r
                                        success = false;\r
                                }                                       \r
                        }\r
@@ -555,23 +540,23 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                                        title_new.toString();\r
                                                        \r
                                                        if (strName_reftype.equals("Article")) {\r
-                                                               map_article.put(title_new.toString(), (Reference) article);\r
-                                                               Reference give_article = map_article.get(title_new.toString());\r
+                                                               map_article.put(title_new.toString(), article);\r
+                                                               Reference<?> give_article = map_article.get(title_new.toString());\r
                                                                give_article.setTitle(title_new.toString());\r
                                                                reference=give_article;\r
                                                        }else if (strName_reftype.equals("Book")) {\r
                                                                map_book.put(title_new.toString(), book);\r
-                                                               Reference give_book = map_book.get(title_new.toString());\r
+                                                               Reference<?> give_book = map_book.get(title_new.toString());\r
                                                                give_book.setTitle(title_new.toString());\r
                                                                reference=give_book;\r
                                                        }else if (strName_reftype.equals("Book Section")){\r
                                                                map_book_section.put(title_new.toString(), bookSection);\r
-                                                               Reference give_book_section = map_book_section.get(title_new.toString());\r
+                                                               Reference<?> give_book_section = map_book_section.get(title_new.toString());\r
                                                                give_book_section.setTitle(title_new.toString());\r
                                                                reference=give_book_section;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Patent")) {\r
                                                                map_patent.put(title_new.toString(), patent);\r
-                                                               Reference give_patent = map_patent.get(title_new.toString());\r
+                                                               Reference<?> give_patent = map_patent.get(title_new.toString());\r
                                                                give_patent.setTitle(title_new.toString());\r
                                                                reference=give_patent;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Personal Communication")){\r
@@ -579,52 +564,52 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                                                reference=personalCommunication;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Journal")) {\r
                                                                map_journal.put(title_new.toString(), journal);\r
-                                                               Reference give_journal = map_journal.get(title_new.toString());\r
+                                                               Reference<?> give_journal = map_journal.get(title_new.toString());\r
                                                                give_journal.setTitle(title_new.toString());\r
                                                                reference=give_journal;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("CdDvd")) {\r
                                                                map_cdDvd.put(title_new.toString(), cdDvd);\r
-                                                               Reference give_cdDvd = map_cdDvd.get(title_new.toString());\r
+                                                               Reference<?> give_cdDvd = map_cdDvd.get(title_new.toString());\r
                                                                give_cdDvd.setTitle(title_new.toString());\r
                                                                reference=give_cdDvd;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Database")) {\r
                                                                map_database.put(title_new.toString(), database);\r
-                                                               Reference give_database = map_database.get(title_new.toString());\r
+                                                               Reference<?> give_database = map_database.get(title_new.toString());\r
                                                                give_database.setTitle(title_new.toString());\r
                                                                reference=give_database;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("WebPage")) {\r
                                                                map_webPage.put(title_new.toString(), webPage);\r
-                                                               Reference give_webPage = map_webPage.get(title_new.toString());\r
+                                                               Reference<?> give_webPage = map_webPage.get(title_new.toString());\r
                                                                give_webPage.setTitle(title_new.toString());\r
                                                                reference=give_webPage;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Report")) {\r
                                                                map_report.put(title_new.toString(), report);\r
-                                                               Reference give_report = map_report.get(title_new.toString());\r
+                                                               Reference<?> give_report = map_report.get(title_new.toString());\r
                                                                give_report.setTitle(title_new.toString());\r
                                                                reference=give_report;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Thesis")) {\r
                                                                map_thesis.put(title_new.toString(), thesis);\r
-                                                               Reference give_thesis = map_thesis.get(title_new.toString());\r
+                                                               Reference<?> give_thesis = map_thesis.get(title_new.toString());\r
                                                                give_thesis.setTitle(title_new.toString());\r
                                                                reference=give_thesis;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Print Series")){\r
                                                                map_printSeries.put(title_new.toString(), printSeries);\r
-                                                               Reference give_printSeries = map_printSeries.get(title_new.toString());\r
+                                                               Reference<?> give_printSeries = map_printSeries.get(title_new.toString());\r
                                                                give_printSeries.setTitle(title_new.toString());\r
                                                        }else if (strName_reftype.equals("Journal Article")){\r
                                                                map_article.put(title_new.toString(), article);\r
-                                                               Reference give_article = map_article.get(title_new.toString());\r
+                                                               Reference<?> give_article = map_article.get(title_new.toString());\r
                                                                give_article.setTitle(title_new.toString());\r
                                                                reference=give_article;\r
                                                        }else if (strName_reftype.equalsIgnoreCase("Conference Proceedings")){\r
                                                                map_proceedings.put(title_new.toString(), proceedings);\r
-                                                               Reference give_proceedings = map_proceedings.get(title_new.toString());\r
+                                                               Reference<?> give_proceedings = map_proceedings.get(title_new.toString());\r
                                                                give_proceedings.setTitle(title_new.toString());\r
                                                                reference=give_proceedings;\r
                                                        }else {\r
                                                                logger.warn("The type was not found...");\r
                                                                map_generic.put(title_new.toString(), generic);\r
-                                                               Reference give_generic = map_generic.get(title_new.toString());\r
+                                                               Reference<?> give_generic = map_generic.get(title_new.toString());\r
                                                                give_generic.setTitle(title_new.toString());\r
                                                                reference=give_generic;\r
                                                                success = false; \r
@@ -654,7 +639,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                                 \r
                                                if (strName_reftype.equals("Book Section")){\r
                                                if (secondary_title != null) {\r
-                                                       Reference give_book =map_book.get(secondary_title);\r
+                                                       Reference<?> give_book =map_book.get(secondary_title);\r
                                                        if (give_book!= null) {\r
                                                                bookSection.setInBook(give_book);\r
                                                                give_book.setTitle(secondary_title);\r
@@ -668,7 +653,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                        }else {\r
                                                        logger.warn("The type was not found...");\r
                                                        map_generic.put(secondary_title, generic);\r
-                                                       Reference give_generic = map_generic.get(secondary_title);\r
+                                                       Reference<?> give_generic = map_generic.get(secondary_title);\r
                                                        give_generic.setTitle(secondary_title);\r
                                                        reference=give_generic;\r
                                                        success = false; \r
@@ -786,7 +771,7 @@ public class EndnoteRecordsImport extends EndNoteImportBase implements ICdmIO<En
                                if (strName_reftype.equals("Journal Article")){                         \r
                                        \r
                                        if (periodical != null) {                                       \r
-                                               Reference give_journal = map_journal.get(periodical);\r
+                                               Reference<?> give_journal = map_journal.get(periodical);\r
                                                        if (give_journal!= null) {\r
                                                                article.setInJournal(give_journal);     \r
                                                                give_journal.setTitle(periodical);\r