getMarkerType with voc and generics for getVocabulary

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java
index 8710e5263e3522a4db8e2234a485452ae3b59a75..6bd840ada029def3bb74547d4b866d57ab5c7136 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java
@@ -70,8 +70,8 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
        protected static final String REFERENCE_COLUMN = "source";\r
        \r
 \r
-       private Reference refMeikle1977 = ReferenceFactory.newGeneric();\r
-       private Reference refMeikle1985 = ReferenceFactory.newGeneric();\r
+       private Reference<?> refMeikle1977 = ReferenceFactory.newGeneric();\r
+       private Reference<?> refMeikle1985 = ReferenceFactory.newGeneric();\r
        \r
        private Map<String, Taxon> taxonWithAuthorStore = new HashMap<String, Taxon>(); \r
        private Map<String, Taxon> taxonNameOnlyStore = new HashMap<String, Taxon>();\r
@@ -117,7 +117,7 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
                        return;\r
                }\r
                Taxon taxon = getTaxon(state, taxonStr);\r
-               Reference ref = getReference(taxonLight.getReference());\r
+               Reference<?> ref = getReference(taxonLight.getReference());\r
                if (taxon != null){\r
                        makeDistribution(state, taxon, taxonLight.getDistribution(), ref);\r
                        getTaxonService().save(taxon);\r
@@ -132,7 +132,7 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
        protected static final boolean NO_IMAGE_GALLERY = false;\r
        protected static final boolean IMAGE_GALLERY = false;\r
        \r
-       private void makeDistribution(CyprusImportState state, Taxon taxon, String distributionStr, Reference ref) {\r
+       private void makeDistribution(CyprusImportState state, Taxon taxon, String distributionStr, Reference<?> ref) {\r
                \r
 //             TaxonDescription description = getTaxonDescription(taxon, NO_IMAGE_GALLERY, CREATE);\r
                TaxonDescription description = getNewDescription(state, taxon);\r
@@ -151,7 +151,7 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
        }\r
        \r
        private TaxonDescription getNewDescription(CyprusImportState state, Taxon taxon) {\r
-               Reference excelRef = state.getConfig().getSourceReference();\r
+               Reference<?> excelRef = state.getConfig().getSourceReference();\r
                TaxonDescription desc = TaxonDescription.NewInstance(taxon, false);\r
                desc.setTitleCache(excelRef.getTitleCache() + " for " + taxon.getTitleCache(), true);\r
                desc.addSource(null, null, excelRef, null);\r
@@ -226,7 +226,7 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
                        }\r
                }\r
                for (Distribution distribution : toRemove){\r
-                       DescriptionBase desc = distribution.getInDescription();\r
+                       DescriptionBase<?> desc = distribution.getInDescription();\r
                        desc.removeElement(distribution);\r
                        getDescriptionService().saveOrUpdate(desc);\r
                }\r
@@ -252,8 +252,8 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
                return result;\r
        }\r
        \r
-       private Reference getReference(String referenceStr) {\r
-               Reference result;\r
+       private Reference<?> getReference(String referenceStr) {\r
+               Reference<?> result;\r
                if ("Meikle 1977".equals(referenceStr)){\r
                        result = refMeikle1977;\r
                }else if("Meikle 1985".equals(referenceStr)){\r
@@ -294,7 +294,7 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
         * \r
         */\r
        private void loadTaxa() {\r
-               List<String> propertyPaths = new ArrayList();\r
+               List<String> propertyPaths = new ArrayList<String>();\r
                propertyPaths.add("*.name");\r
                List<Taxon> taxonList = (List)getTaxonService().list(Taxon.class, null, null, null, propertyPaths);\r
                for (Taxon taxon: taxonList){\r
@@ -360,7 +360,7 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
                        getTermService().save(areaLevel);\r
                }\r
                \r
-               TermVocabulary areaVocabulary = getVocabulary(CyprusTransformer.uuidCyprusDivisionsVocabulary, "Cyprus devisions", "Cyprus divisions", null, null, true);\r
+               TermVocabulary<NamedArea> areaVocabulary = getVocabulary(CyprusTransformer.uuidCyprusDivisionsVocabulary, "Cyprus devisions", "Cyprus divisions", null, null, true, NamedArea.NewInstance());\r
                TdwgArea tdwg4Cyprus = (TdwgArea)getTermService().find(UUID.fromString("9d447b51-e363-4dde-ae40-84c55679983c"));\r
                WaterbodyOrCountry isoCountryCyprus = (WaterbodyOrCountry)getTermService().find(UUID.fromString("4b13d6b8-7eca-4d42-8172-f2018051ca19"));\r
                \r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CommonNameExcelImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CommonNameExcelImport.java
index c12dfc932735618dbc8af75743fc7849069047ff..843ab46c384e91c33f46956d41993c5a4a28fd4a 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CommonNameExcelImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/wp6/CommonNameExcelImport.java
@@ -299,7 +299,7 @@ public class CommonNameExcelImport extends ExcelImporterBase<CichorieaeCommonNam
                                        }else if (result.getId() == 0){\r
 //                                             UUID uuidLanguageVoc = UUID.fromString("45ac7043-7f5e-4f37-92f2-3874aaaef2de"); \r
                                                UUID uuidLanguageVoc = UUID.fromString("434cea89-9052-4567-b2db-ff77f42e9084"); \r
-                                               TermVocabulary<Language> voc = getVocabulary(uuidLanguageVoc, "User Defined Languages", "User Defined Languages", null, null, false);\r
+                                               TermVocabulary<Language> voc = getVocabulary(uuidLanguageVoc, "User Defined Languages", "User Defined Languages", null, null, false, result);\r
 //                                             TermVocabulary<Language> voc = getVocabularyService().find(uuidLanguageVoc);\r
                                                voc.addTerm(result);\r
                                                getTermService().saveOrUpdate(result);\r