ref #10189 split CdmApplicationController into repository and application part in...

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/ConceptRelationshipPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/ConceptRelationshipPresenter.java
index 2ea5dc1a2e9cb58d67083f523193f46c80cd8d8f..37d42eb384b833fd36d76a86f2b2ba5d6077b1b6 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/ConceptRelationshipPresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/ConceptRelationshipPresenter.java
@@ -11,7 +11,7 @@ package eu.etaxonomy.cdm.vaadin.component.taxon;
 import org.json.JSONException;
 import org.springframework.transaction.TransactionStatus;
 
-import eu.etaxonomy.cdm.api.application.ICdmRepository;
+import eu.etaxonomy.cdm.api.application.ICdmApplication;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -31,7 +31,7 @@ public class ConceptRelationshipPresenter implements IConceptRelationshipCompone
     private final D3ConceptRelationshipTree crTree;
     private final ITaxonService taxonService;
 
-    private final ICdmRepository app;
+    private final ICdmApplication app;
 
 
     public ConceptRelationshipPresenter(D3ConceptRelationshipTree crTree) {

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/EditConceptRelationshipPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/EditConceptRelationshipPresenter.java
index 9d87a1aa9a553cad567cecc82c166d52a1ae2301..abe69fa595d178e9aaf525578c185b77f0912dac 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/EditConceptRelationshipPresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/EditConceptRelationshipPresenter.java
@@ -18,7 +18,7 @@ import org.springframework.transaction.TransactionStatus;
 
 import com.vaadin.data.util.filter.Compare;
 
-import eu.etaxonomy.cdm.api.application.ICdmRepository;
+import eu.etaxonomy.cdm.api.application.ICdmApplication;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
@@ -41,7 +41,7 @@ public class EditConceptRelationshipPresenter {
 
     private final ITaxonService taxonService;
     private final ITermService termService;
-    private final ICdmRepository app;
+    private final ICdmApplication app;
 
     public final static String REL_TYPE_KEY = "relTypeIun";
     public final static String TO_TAXON_KEY = "toTaxonIun";

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBasePresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBasePresenter.java
index d38e0cd1acf0734f57e748a7b3c60519aac1a752..0191c68d676a14765dd69dafe8d8d866d2b4e7d2 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBasePresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/taxon/NewTaxonBasePresenter.java
@@ -17,7 +17,7 @@ import org.springframework.transaction.TransactionStatus;
 
 import com.vaadin.data.util.sqlcontainer.RowId;
 
-import eu.etaxonomy.cdm.api.application.ICdmRepository;
+import eu.etaxonomy.cdm.api.application.ICdmApplication;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
@@ -54,7 +54,7 @@ public class NewTaxonBasePresenter implements INewTaxonBaseComponentListener {
     private final ITaxonService taxonService;
     private final IClassificationService classificationService;
     private final INameService nameService;
-    private final ICdmRepository app;
+    private final ICdmApplication app;
 
     final boolean includeUnpublished = true;
 

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelper.java b/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelper.java
index 6e949656c1edaa6e2bcead74e86d34228e017a88..aef0d18126438cbec809a6b717170eb0801c66e1 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelper.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSpringContextHelper.java
@@ -14,7 +14,7 @@ import com.vaadin.data.util.sqlcontainer.connection.J2EEConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.server.VaadinServlet;
 
-import eu.etaxonomy.cdm.api.application.ICdmRepository;
+import eu.etaxonomy.cdm.api.application.ICdmApplication;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.api.service.ICommonService;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
@@ -121,8 +121,8 @@ public class CdmSpringContextHelper {
         return databaseMetaData;
     }
 
-    public static ICdmRepository getApplicationConfiguration() {
-        return (ICdmRepository) getCurrent().getBean("cdmRepository");
+    public static ICdmApplication getApplicationConfiguration() {
+        return (ICdmApplication) getCurrent().getBean("cdmRepository");
     }
     public static ITaxonService getTaxonService() {
         return (ITaxonService)getCurrent().getBean(ITaxonService.class);