From 6f717d2b76148b0d49c342f9ab937ba87d81dddb Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Mon, 15 Jul 2019 19:09:59 +0200
Subject: [PATCH] Made get/setHighLevelState ordering uniform: get... comes
 before set...

---
 .../model/model/components/GUIComponent.java  | 20 +++++++++----------
 .../components/atomic/GUIManualSwitch.java    | 18 ++++++++---------
 .../DeserializedSubmodelComponent.java        |  8 ++++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
index c488de06..382d7e37 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
@@ -149,31 +149,31 @@ public abstract class GUIComponent
 	// high-level access
 
 	/**
-	 * Sets the given high-level state to the given value. <br>
+	 * Gets the current value of the given high-level state. <br>
 	 * See {@link HighLevelStateHandler} for an explanation of high-level state IDs.
 	 * 
-	 * @see #getHighLevelState(String)
-	 * @see HighLevelStateHandler#setHighLevelState(String, Object)
+	 * @see #setHighLevelState(String, Object)
+	 * @see HighLevelStateHandler#getHighLevelState(String)
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	@SuppressWarnings({ "static-method", "unused" }) // this method is intended to be overridden
-	public void setHighLevelState(String stateID, Object newState)
+	@SuppressWarnings("static-method") // this method is intended to be overridden
+	public Object getHighLevelState(String stateID)
 	{
 		throw new IllegalArgumentException("No high level state with ID " + stateID);
 	}
 
 	/**
-	 * Gets the current value of the given high-level state. <br>
+	 * Sets the given high-level state to the given value. <br>
 	 * See {@link HighLevelStateHandler} for an explanation of high-level state IDs.
 	 * 
-	 * @see #setHighLevelState(String, Object)
-	 * @see HighLevelStateHandler#getHighLevelState(String)
+	 * @see #getHighLevelState(String)
+	 * @see HighLevelStateHandler#setHighLevelState(String, Object)
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	@SuppressWarnings("static-method") // this method is intended to be overridden
-	public Object getHighLevelState(String stateID)
+	@SuppressWarnings({ "static-method", "unused" }) // this method is intended to be overridden
+	public void setHighLevelState(String stateID, Object newState)
 	{
 		throw new IllegalArgumentException("No high level state with ID " + stateID);
 	}
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
index 2fd1749d..b79ec2fd 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
@@ -82,31 +82,31 @@ public class GUIManualSwitch extends GUIComponent
 	}
 
 	@Override
-	public void setHighLevelState(String stateID, Object newState)
+	public Object getHighLevelState(String stateID)
 	{
 		switch (stateID)
 		{
 		case "out":
 			if (logicSwitch != null)
-				logicSwitch.setToValueOf((Bit) newState);
-			break;
+				return logicSwitch.getValue();
+			return null;
 		default:
-			super.setHighLevelState(stateID, newState);
-			break;
+			return super.getHighLevelState(stateID);
 		}
 	}
 
 	@Override
-	public Object getHighLevelState(String stateID)
+	public void setHighLevelState(String stateID, Object newState)
 	{
 		switch (stateID)
 		{
 		case "out":
 			if (logicSwitch != null)
-				return logicSwitch.getValue();
-			return null;
+				logicSwitch.setToValueOf((Bit) newState);
+			break;
 		default:
-			return super.getHighLevelState(stateID);
+			super.setHighLevelState(stateID, newState);
+			break;
 		}
 	}
 
diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
index 5f7b084f..0e9be475 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
@@ -43,15 +43,15 @@ public class DeserializedSubmodelComponent extends SubmodelComponent
 	}
 
 	@Override
-	public void setHighLevelState(String stateID, Object newState)
+	public Object getHighLevelState(String stateID)
 	{
-		highLevelStateHandler.setHighLevelState(stateID, newState);
+		return highLevelStateHandler.getHighLevelState(stateID);
 	}
 
 	@Override
-	public Object getHighLevelState(String stateID)
+	public void setHighLevelState(String stateID, Object newState)
 	{
-		return highLevelStateHandler.getHighLevelState(stateID);
+		highLevelStateHandler.setHighLevelState(stateID, newState);
 	}
 
 	@Override
-- 
2.17.1