X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fdao%2FAbstractMemoryDaoSupport.java;h=f9af51bcf9a179c00c90d63f003e97b57a260fb1;hb=2e8d5eea45604d0f4686d54986be1ce6307aefdb;hp=a334a4710643495a6b80bd4ce284bc036151b4bf;hpb=490d9907457c43acfa965e7979ce5974bc1ba6ca;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 a334a4710..f9af51bcf 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.server.dao;
 
 import java.beans.PropertyEditor;
@@ -33,7 +32,6 @@ import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.io.Resource;
@@ -152,7 +150,7 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 		return res;
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <T> List<T> list(Class<T> clss, Object filter) {
 		List<T> res = new ArrayList<T>();
 
@@ -161,13 +159,12 @@ public abstract class AbstractMemoryDaoSupport implements LightDaoSupport,
 			res.addAll((Collection<T>) model.get(classToUse).values());
 
 		if (applicationContext != null)
-			res.addAll(new GenericBeanFactoryAccessor(applicationContext)
-					.getBeansOfType(clss).values());
+			res.addAll(applicationContext.getBeansOfType(clss).values());
 
 		return res;
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	protected Class findClass(Class parent) {
 		if (model.containsKey(parent))
 			return parent;