Making SDE compile

d3scomp · Mar 8, 2013 · 6e9d600 · 6e9d600
1 parent 89bb9b9
commit 6e9d600
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/Runtime.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/Runtime.java
@@ -136,7 +136,7 @@ public void registerComponentsAndEnsembles(AbstractDEECoObjectProvider provider)
 	 * @param km					knowledge manager
 	 * @param contextClassLoader	classloader for the process
 	 */
-	private void setUpProcesses(
+	public static void setUpProcesses(
 			List<? extends SchedulableProcess> processes, 
 			KnowledgeManager km,
 			ClassLoader  contextClassLoader

diff --git a/jdeeco-sde/src/cz/cuni/mff/d3s/deeco/sde/utils/AbstractProvidersHolder.java b/jdeeco-sde/src/cz/cuni/mff/d3s/deeco/sde/utils/AbstractProvidersHolder.java
@@ -5,10 +5,10 @@
 
 import cz.cuni.mff.d3s.deeco.invokable.SchedulableComponentProcess;
 import cz.cuni.mff.d3s.deeco.invokable.SchedulableEnsembleProcess;
+import cz.cuni.mff.d3s.deeco.invokable.SchedulableProcess;
 import cz.cuni.mff.d3s.deeco.knowledge.ComponentKnowledge;
 import cz.cuni.mff.d3s.deeco.provider.AbstractDEECoObjectProvider;
 import cz.cuni.mff.d3s.deeco.provider.ParsedComponent;
-import cz.cuni.mff.d3s.deeco.provider.ProcessInstantiator;
 import cz.cuni.mff.d3s.deeco.runtime.IEnsembleComponentInformer;
 
 /**
@@ -72,13 +72,17 @@ public List<SchedulableComponentProcess> getComponentProcesses(
 		for (AbstractDEECoObjectProvider adop : providers) {
 			for (ParsedComponent pc : adop.getComponents()) {
 				ck = pc.getInitialKnowledge();
-				if (ck.id.equals(componentId))
-					return ProcessInstantiator.createComponentProcesses(
-							pc.getProcesses(), null, adop.getContextClassLoader());
+				if (ck.id.equals(componentId)) {
+					List<SchedulableComponentProcess> componentProcesses = pc.getProcesses();
+					cz.cuni.mff.d3s.deeco.runtime.Runtime.setUpProcesses(componentProcesses, null, adop.getContextClassLoader());		
+					return componentProcesses;					
+				}
 			}
 		}
 		return null;
 	}
+
+
 
 	/*
 	 * (non-Javadoc)
@@ -90,8 +94,10 @@ public List<SchedulableComponentProcess> getComponentProcesses(
 	public List<SchedulableEnsembleProcess> getEnsembleProcesses() {
 		List<SchedulableEnsembleProcess> result = new LinkedList<SchedulableEnsembleProcess>();
 		for (AbstractDEECoObjectProvider adop : providers) {
-			result.addAll(ProcessInstantiator.createEnsembleProcesses(
-					adop.getEnsembles(), null, adop.getContextClassLoader()));
+
+			List<SchedulableEnsembleProcess> ensembleProcesses = adop.getEnsembles();
+			cz.cuni.mff.d3s.deeco.runtime.Runtime.setUpProcesses(ensembleProcesses, null, adop.getContextClassLoader());		
+			result.addAll(ensembleProcesses);
 		}
 		return result;
 	}