Removed the dependency from RegestryFunctionsProvider to Activator

This commit is contained in:
Lennart Hensler committed 2014-02-19 17:48:57 +01:00
1 parent 1056624d4f
commit 53b97c3bc1
3 files changed
+11 -9

No files matched your search

@@ -37,7 +37,7 @@ public class Activator implements BundleActivator {
registerDataMiningClassesWithMarkedMethodsService();
FunctionRegistry functionRegistry = createAndBuildFunctionRegistry();
FunctionProvider functionProvider = new RegistryFunctionsProvider(functionRegistry);
FunctionProvider functionProvider = new RegistryFunctionsProvider(functionRegistry, getExecutor());
dataMiningService = new DataMiningServiceImpl(functionRegistry, functionProvider);
registerDataMiningService();
@@ -3,11 +3,11 @@ package com.sap.sailing.datamining.impl.function;
import java.util.Collection;
import java.util.HashSet;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.sap.sailing.datamining.builders.FilterByCriteriaBuilder;
import com.sap.sailing.datamining.impl.Activator;
import com.sap.sailing.datamining.impl.PartitioningParallelFilter;
import com.sap.sse.datamining.components.FilterCriteria;
import com.sap.sse.datamining.components.ParallelFilter;
@@ -23,9 +23,11 @@ public class RegistryFunctionsProvider implements FunctionProvider {
private static final Logger LOGGER = Logger.getLogger(RegistryFunctionsProvider.class.getName());
private FunctionRegistry functionRegistry;
private ThreadPoolExecutor executor;
public RegistryFunctionsProvider(FunctionRegistry functionRegistry) {
public RegistryFunctionsProvider(FunctionRegistry functionRegistry, ThreadPoolExecutor executor) {
this.functionRegistry = functionRegistry;
this.executor = executor;
}
@Override
@@ -59,7 +61,7 @@ public class RegistryFunctionsProvider implements FunctionProvider {
private ParallelFilter<Function<?>> createFilterForCriteria(FilterCriteria<Function<?>> filterCriteria) {
WorkerBuilder<FiltrationWorker<Function<?>>> workerBuilder = new FilterByCriteriaBuilder<Function<?>>(filterCriteria);
return new PartitioningParallelFilter<>(workerBuilder, Activator.getExecutor());
return new PartitioningParallelFilter<>(workerBuilder, executor);
}
@Override