X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fdao%2FAbstractMemoryDaoSupport.java;h=9e0881bf0243e4a8479172f7dc6f134576f74cf2;hb=f99d677ed0ff66bf89b2662439802a240ee2e884;hp=39655d4fe04812fc9a2027cab7c4fd1723b27294;hpb=1df27c72afb2148588de3e7e82f257ad583d8bd7;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
index 39655d4fe..9e0881bf0 100644
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java
@@ -37,7 +37,7 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 
 	private List<String> scannedPackages = new ArrayList<String>();
 
-	private List<Resource> workbooks = new ArrayList<Resource>();
+	private List<Resource> resources = new ArrayList<Resource>();
 
 	private Map<Class<?>, PropertyEditor> customEditors = new HashMap<Class<?>, PropertyEditor>();;
 
@@ -50,13 +50,15 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 	}
 
 	public void init() {
-		// used to resolve inner references
-		// Map<String, List<Object>> tempRefs = new HashMap<String,
-		// List<Object>>();
+		for (PropertyEditor propertyEditor : customEditors.values())
+			if (propertyEditor instanceof LightDaoAware) {
+				((LightDaoAware) propertyEditor).setLightDaoSupport(this);
+			}
 
+		// Load data
 		List<Reference> references = new ArrayList<Reference>();
 
-		for (Resource res : workbooks) {
+		for (Resource res : resources) {
 			InputStream in = null;
 			try {
 				in = res.getInputStream();
@@ -196,12 +198,12 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 		return scannedPackages;
 	}
 
-	public void setWorkbooks(List<Resource> workbooks) {
-		this.workbooks = workbooks;
+	public void setResources(List<Resource> workbooks) {
+		this.resources = workbooks;
 	}
 
-	public List<Resource> getWorkbooks() {
-		return workbooks;
+	public List<Resource> getResources() {
+		return resources;
 	}
 
 	public void setClassLoader(ClassLoader classLoader) {