editor now updatable via updateSite

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / store / CdmStore.java

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index c357a8d8d7d634294e91b2860d59f1e585b59364..12863770b913a636ecdda4a86c0f61beacdf5c63 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -26,14 +26,12 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;
 import eu.etaxonomy.cdm.api.service.config.impl.TaxonServiceConfiguratorImpl;
-import eu.etaxonomy.cdm.database.DataSourceNotFoundException;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.common.init.TermNotFoundException;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
@@ -134,7 +132,7 @@ public class CdmStore{
                return conceptRelationshipTypes;
        }
 
-       public ReferenceBase getDefaultSec() {
+       public ReferenceBase<?> getDefaultSec() {
                // TODO why is this returning null? and of course, replace w the real deal
                return applicationController.getReferenceService().getReferenceByUuid(
                                UUID.fromString("f3593c18-a8d2-4e51-bdad-0befbf8fb2d1"));
@@ -281,7 +279,7 @@ public class CdmStore{
                return resultSet;
        }
        
-       private List findTaxaByName(String queryString, boolean restrictToTaxonObjs) {
+       private List<IdentifiableEntity> findTaxaByName(String queryString, boolean restrictToTaxonObjs) {
 
                ITaxonServiceConfigurator configurator = new TaxonServiceConfiguratorImpl();
                
@@ -305,11 +303,11 @@ public class CdmStore{
                return result;
        }
        
-       public static List searchTaxaByName(String queryString){
+       public static List<IdentifiableEntity> searchTaxaByName(String queryString){
                return getDefault().findTaxaByName(queryString, false);
        }
 
-       public static List searchTaxaByName(String queryString, boolean restrictToTaxonObjs){
+       public static List<IdentifiableEntity> searchTaxaByName(String queryString, boolean restrictToTaxonObjs){
                return getDefault().findTaxaByName(queryString, restrictToTaxonObjs);
        }