Author: bpoussin Date: 2010-12-13 15:00:20 +0100 (Mon, 13 Dec 2010) New Revision: 606 Url: http://nuiton.org/repositories/revision/wikitty/606 Log: remove bad (very bad) generic Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-12-13 13:45:35 UTC (rev 605) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java 2010-12-13 14:00:20 UTC (rev 606) @@ -24,8 +24,9 @@ */ package org.nuiton.wikitty; -import java.util.*; - +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -87,14 +88,14 @@ ApplicationConfig config, String prefix) { WikittyService result = null; - List<Class<WikittyService>> layers = getComponents(config, prefix, WikittyService.class); + List<Class> layers = getComponents(config, prefix, WikittyService.class); Set comp = new HashSet(); for (Class<WikittyService> clazz : layers) { comp.clear(); comp.add(result); comp.add(config); - List<Class<WikittyService>> comps = getComponents(config, prefix, clazz); + List<Class> comps = getComponents(config, prefix, clazz); if (comps != null) { comp.addAll(comps); } @@ -117,15 +118,15 @@ * @param clazz * @return la liste de classe trouvee ou null si la cle n'existe pas */ - static protected <E> List<Class<E>> getComponents(ApplicationConfig config, - String prefix, Class<E> clazz) { + static protected List<Class> getComponents(ApplicationConfig config, + String prefix, Class clazz) { String key = prefix + clazz.getSimpleName() + ".components"; // XXX sletellier 13/12/2010 : this code don't compile, provoke an "inconvertible types", // this hack force compiler to not check cast // List<Class<E>> result = (List<Class<E>>) config.getOptionAsList(key).getOptionAsClass(); - List<Class<E>> result = (List<Class<E>>)(List<?>) config.getOptionAsList(key).getOptionAsClass(); + List<Class> result = (List<Class>)config.getOptionAsList(key).getOptionAsClass(); // String componentsString = config.getOption(key); // if (componentsString != null) {