X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fsnippets%2Fhighlevelstatehandlers%2Fstandard%2Fsubcomponent%2FDelegatingSubcomponentHighLevelStateHandler.java;h=6557787f84ab96e284c5222127bf7efbdfdf9822;hb=69ec19d54ceb6d5abbb8b4faa55284af22174859;hp=12a98887c54153e0196dd5580bb34135f0896407;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java
index 12a98887..6557787f 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java
@@ -1,5 +1,7 @@
 package net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent;
 
+import java.util.function.Consumer;
+
 import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.serializing.IdentifyParams;
@@ -76,17 +78,35 @@ public class DelegatingSubcomponentHighLevelStateHandler implements Subcomponent
 	@Override
 	public Object getHighLevelState(String subStateID)
 	{
-		if (delegateTarget == null)
-			throw new IllegalStateException("Delegating to a component that was destroyed");
+		checkTarget();
 		return delegateTarget.getHighLevelState(getDelegateTargetHighLevelStateID(subStateID));
 	}
 
 	@Override
 	public void setHighLevelState(String subStateID, Object newState)
+	{
+		checkTarget();
+		delegateTarget.setHighLevelState(getDelegateTargetHighLevelStateID(subStateID), newState);
+	}
+
+	@Override
+	public void addListener(String subStateID, Consumer<Object> stateChanged)
+	{
+		checkTarget();
+		delegateTarget.addHighLevelStateListener(getDelegateTargetHighLevelStateID(subStateID), stateChanged);
+	}
+
+	@Override
+	public void removeListener(String subStateID, Consumer<Object> stateChanged)
+	{
+		checkTarget();
+		delegateTarget.removeHighLevelStateListener(getDelegateTargetHighLevelStateID(subStateID), stateChanged);
+	}
+
+	private void checkTarget()
 	{
 		if (delegateTarget == null)
 			throw new IllegalStateException("Delegating to a component that was destroyed");
-		delegateTarget.setHighLevelState(getDelegateTargetHighLevelStateID(subStateID), newState);
 	}
 
 	private String getDelegateTargetHighLevelStateID(String subStateID)
@@ -103,8 +123,9 @@ public class DelegatingSubcomponentHighLevelStateHandler implements Subcomponent
 	@Override
 	public DelegatingSubcomponentHighLevelStateHandlerParams getParamsForSerializing(IdentifyParams idParams)
 	{
+		checkTarget();
 		DelegatingSubcomponentHighLevelStateHandlerParams params = new DelegatingSubcomponentHighLevelStateHandlerParams();
-		params.delegateTarget = delegateTarget.getName();
+		params.delegateTarget = delegateTarget == parentComponent ? null : delegateTarget.getName();
 		params.prefix = prefix;
 		return params;
 	}