X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fsnippets%2Fhighlevelstatehandlers%2Fstandard%2FStandardHighLevelStateHandler.java;h=58e8e64ce54dc7454dcb9f4c1b136944da35aea0;hb=c306a7b193d4191d2d531b8ed9840d79c44dcbc8;hp=490b267658c68d66199030f43acae9e757a3bfeb;hpb=5140b424c507b8f22f80b452e475d0b56a3a36ce;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java
index 490b2676..58e8e64c 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java
@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.TreeMap;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
@@ -53,16 +54,15 @@ public class StandardHighLevelStateHandler implements HighLevelStateHandler
 	}
 
 	public <P, H extends SubcomponentHighLevelStateHandler> H addSubcomponentHighLevelState(String subcomponentStateID,
-			BiFunction<HighLevelStateHandlerContext, P, H> handlerConstructor, P handlerParams)
+			BiFunction<SubmodelComponent, P, H> handlerConstructor, P handlerParams)
 	{
 		return addSubcomponentHighLevelState(subcomponentStateID, c -> handlerConstructor.apply(c, handlerParams));
 	}
 
 	public <H extends SubcomponentHighLevelStateHandler> H addSubcomponentHighLevelState(String subcomponentStateID,
-			Function<HighLevelStateHandlerContext, H> handlerConstructor)
+			Function<SubmodelComponent, H> handlerConstructor)
 	{
-		HighLevelStateHandlerContext context = new HighLevelStateHandlerContext(component, subcomponentStateID);
-		H handler = handlerConstructor.apply(context);
+		H handler = handlerConstructor.apply(component);
 		addSubcomponentHighLevelState(subcomponentStateID, handler);
 		return handler;
 	}
@@ -92,16 +92,15 @@ public class StandardHighLevelStateHandler implements HighLevelStateHandler
 	}
 
 	public <P, H extends AtomicHighLevelStateHandler> H addAtomicHighLevelState(String subcomponentStateID,
-			BiFunction<HighLevelStateHandlerContext, P, H> handlerConstructor, P handlerParams)
+			BiFunction<SubmodelComponent, P, H> handlerConstructor, P handlerParams)
 	{
 		return addAtomicHighLevelState(subcomponentStateID, c -> handlerConstructor.apply(c, handlerParams));
 	}
 
 	public <H extends AtomicHighLevelStateHandler> H addAtomicHighLevelState(String subcomponentStateID,
-			Function<HighLevelStateHandlerContext, H> handlerConstructor)
+			Function<SubmodelComponent, H> handlerConstructor)
 	{
-		HighLevelStateHandlerContext context = new HighLevelStateHandlerContext(component, subcomponentStateID);
-		H handler = handlerConstructor.apply(context);
+		H handler = handlerConstructor.apply(component);
 		addAtomicHighLevelState(subcomponentStateID, handler);
 		return handler;
 	}
@@ -178,8 +177,8 @@ public class StandardHighLevelStateHandler implements HighLevelStateHandler
 	public StandardHighLevelStateHandlerParams getParamsForSerializing(IdentifyParams idParams)
 	{
 		StandardHighLevelStateHandlerParams params = new StandardHighLevelStateHandlerParams();
-		params.subcomponentHighLevelStates = new HashMap<>();
-		params.atomicHighLevelStates = new HashMap<>();
+		params.subcomponentHighLevelStates = new TreeMap<>();
+		params.atomicHighLevelStates = new TreeMap<>();
 		for (Entry<String, SubcomponentHighLevelStateHandler> e : subcomponentHighLevelStateHandlers.entrySet())
 		{
 			String stateID = e.getKey();