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;
}
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;
}
}
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;
}
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();