From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 9 Apr 2014 14:23:23 +0000 (+0000)
Subject: CdmStore : no longer need to set configuration in hibernate classes here
X-Git-Tag: 3.6.0~655
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/986631757593fd8b4d9a976904290f6a378ce668

CdmStore : no longer need to set configuration in hibernate classes here
CdmStoreConnector : new method to retrieve configuration based on cdm source type
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index bb77b58be..d849c488c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -196,9 +196,7 @@ public class CdmStore {
 
 	private CdmStore(ICdmApplicationConfiguration applicationController,
 			ICdmSource cdmSource) {
-		this.applicationConfiguration = applicationController;
-		AbstractLazyInitializer.setConfiguration(applicationController);
-		AbstractPersistentCollection.setConfiguration(applicationController);
+		this.applicationConfiguration = applicationController;		
 		this.cdmSource = cdmSource;
 		isConnected = true;
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
index d1665cb8e..7fe9a0d27 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
@@ -18,6 +18,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
+import org.hibernate.collection.internal.AbstractPersistentCollection;
+import org.hibernate.proxy.AbstractLazyInitializer;
 import org.springframework.core.io.Resource;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;
@@ -149,16 +151,16 @@ class CdmStoreConnector extends Job {
 	private ICdmApplicationConfiguration getApplicationController(ICdmSource cdmSource, CdmProgressMonitorAdapter subprogressMonitor) {
 		if(cdmSource instanceof ICdmDataSource) {
 			return  CdmApplicationController.NewInstance(applicationContextBean, 
-						(ICdmDataSource)cdmSource, 
-						dbSchemaValidation,
-						false, 
-						subprogressMonitor);
+					(ICdmDataSource)cdmSource, 
+					dbSchemaValidation,
+					false, 
+					subprogressMonitor);
 		} else if(cdmSource instanceof ICdmRemoteSource) {
 			return CdmApplicationRemoteController.NewInstance(applicationContextBean, 
-					(ICdmRemoteSource)cdmSource, 					
-					false, 
-					subprogressMonitor,
-					null);
+							(ICdmRemoteSource)cdmSource, 					
+							false, 
+							subprogressMonitor,
+							null);
 		} else {
 			throw new UnsupportedOperationException("Cannot create application controller for " + cdmSource.getName());
 		}