From 5aa5e71ff36813ff4d49baf2bde744aa566f8ed0 Mon Sep 17 00:00:00 2001
From: Lucas Stratmann <lucas.stratmann@student.reutlingen-university.de>
Date: Fri, 11 Sep 2020 19:23:09 +0200
Subject: [PATCH] If-Classes modified for Ardublock usage

---
 .../simulator/simcode/control/CodeElse.java        |  6 +++++-
 .../simulator/simcode/control/CodeElseIf.java      | 14 ++++++++++----
 .../simulator/simcode/control/CodeIf.java          | 13 +++++++++----
 .../CodeTypeIf.java => datatypes/SimTypeIf.java}   |  6 ++++--
 4 files changed, 28 insertions(+), 11 deletions(-)
 rename src/tec/letsgoing/ardublock/simulator/simcode/{control/CodeTypeIf.java => datatypes/SimTypeIf.java} (71%)

diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java
index 6d711e6..128ba12 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java
@@ -7,6 +7,7 @@ import java.util.Vector;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
 import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 
 /**
@@ -14,7 +15,7 @@ import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
  * @author Lucas
  * 
  */
-public class CodeElse extends CodeTypeIf {
+public class CodeElse extends SimTypeIf {
 	private Vector<SimCode> codeBlocks;
 
 	public CodeElse(Vector<SimCode> _vec) {
@@ -35,5 +36,8 @@ public class CodeElse extends CodeTypeIf {
 	public String toString() {
 		return null;
 	}
+	public void setFollowBlock(SimTypeIf _follow) {
+		
+	}
 
 }
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java
index 4e04591..c0c62aa 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java
@@ -7,6 +7,7 @@ import java.util.Vector;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
 import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 
@@ -15,13 +16,13 @@ import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
  * @author Lucas
  * 
  */
-public class CodeElseIf extends CodeTypeIf {
-	private CodeTypeIf follow;
+public class CodeElseIf extends SimTypeIf {
+	private SimTypeIf follow;
 	private SimTypeBool condition;
 	private Vector<SimCode> codeBlocks;
 
-	public CodeElseIf(CodeTypeIf _follow, SimTypeBool _condition, Vector<SimCode> _vec) {
-		follow = _follow;
+	public CodeElseIf(SimTypeBool _condition, Vector<SimCode> _vec) {
+		
 		condition = _condition;
 		codeBlocks = _vec;
 	}
@@ -40,6 +41,11 @@ public class CodeElseIf extends CodeTypeIf {
 			return null;
 		}
 	}
+	
+public void setFollowBlock(SimTypeIf _follow) {
+	follow = _follow;
+	}
+	
 
 	@Override
 	public String toString() {
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java
index 8df8b94..bb897ef 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java
@@ -7,6 +7,7 @@ import java.util.Vector;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
 import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 
@@ -16,15 +17,15 @@ import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
  *
  * 
  */
-public class CodeIf extends CodeTypeIf {
-	private CodeTypeIf follow;
+public class CodeIf extends SimTypeIf {
+	private SimTypeIf follow;
 	private SimTypeBool condition;
 	private Vector<SimCode> codeBlocks;
 
-	public CodeIf(CodeTypeIf _follow, SimTypeBool _condition, Vector<SimCode> _vec) {
+	public CodeIf(SimTypeBool _condition, Vector<SimCode> _vec) {
 		condition = _condition;
 		codeBlocks = _vec;
-		follow = _follow;
+		
 	}
 
 	/**
@@ -42,6 +43,10 @@ public class CodeIf extends CodeTypeIf {
 		}
 
 	}
+	
+	public void setFollowBlock(SimTypeIf _follow) {
+		follow = _follow;
+		}
 
 	public String toString() {
 		return null;
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeTypeIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java
similarity index 71%
rename from src/tec/letsgoing/ardublock/simulator/simcode/control/CodeTypeIf.java
rename to src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java
index 41c5384..c82cc4c 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeTypeIf.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package tec.letsgoing.ardublock.simulator.simcode.control;
+package tec.letsgoing.ardublock.simulator.simcode.datatypes;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
@@ -14,12 +14,14 @@ import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
  * 
  *
  */
-public abstract class CodeTypeIf extends SimCode {
+public abstract class SimTypeIf extends SimCode {
 
 	@Override
 	public abstract SimCode run(Arduino _arduino, SimCodeFunction functionHead);
 
 	@Override
 	public abstract String toString();
+	
+	public abstract void setFollowBlock(SimTypeIf _follow);
 
 }
-- 
GitLab