Author: ssmiweve Date: 2008-08-11 15:58:22 +0200 (Mon, 11 Aug 2008) New Revision: 6757
Modified: trunk/query-api/src/main/java/no/sesat/search/query/token/EvaluatorType.java trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java Log: http://sesat.no/pipermail/kernel-development/2008-August/000153.html Modified: trunk/query-api/src/main/java/no/sesat/search/query/token/EvaluatorType.java =================================================================== --- trunk/query-api/src/main/java/no/sesat/search/query/token/EvaluatorType.java 2008-08-08 07:09:25 UTC (rev 6756) +++ trunk/query-api/src/main/java/no/sesat/search/query/token/EvaluatorType.java 2008-08-11 13:58:22 UTC (rev 6757) @@ -22,12 +22,13 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import no.schibstedsok.commons.ioc.BaseContext; /** * The types of TokenPredicates that exist. * @version $Id$ */ -public final class EvaluatorType implements Serializable { +public final class EvaluatorType implements BaseContext, Serializable { private static final Map<String,EvaluatorType> INSTANCES = new HashMap<String,EvaluatorType>(); Modified: trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java =================================================================== --- trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java 2008-08-08 07:09:25 UTC (rev 6756) +++ trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java 2008-08-11 13:58:22 UTC (rev 6757) @@ -82,21 +82,15 @@ for(EvaluatorType type : EvaluatorType.getInstances()){ - final String factoryName = type.getEvaluatorFactoryClassName(); - final AbstractEvaluatorFactory factory = AbstractEvaluatorFactory.instanceOf( ContextWrapper.wrap( AbstractEvaluatorFactory.Context.class, context, - new BaseContext() { - public String getEvaluatorFactoryClassName() { - return factoryName; - } - } + type )); if(factory.isResponsibleFor(token)){ - LOG.trace("Evaluator for " + token + " found by " + factoryName); + LOG.trace("Evaluator for " + token + " found by " + type.getEvaluatorFactoryClassName()); return factory.getEvaluator(token); } } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
