All Controlblocks and Functions working

src/main/java/com/ardublock/translator/Translator.java

@@ -20,6 +20,7 @@ import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 import edu.mit.blocks.codeblocks.Block;
 import edu.mit.blocks.renderable.RenderableBlock;
 import edu.mit.blocks.workspace.Workspace;
+import tec.letsgoing.ardublock.simulator.Simulator;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 
 public class Translator
@@ -40,7 +41,6 @@ public class Translator
 	private Map<String, String> booleanVariableSet;
 	private Map<String, String> stringVariableSet;
 	private Map<String, Object> internalData;
-	
 	private Workspace workspace;
 	
 	private String rootBlockName;
@@ -136,12 +136,13 @@ public class Translator
 	//added by letsoING -> simulator
 	//TODO check if it works as expected ;-P 
 	//-> only changed rootTranslatorBlock.toCode to .toSim from translate
-	public SimCode simulate(Long blockId) throws SocketNullException, SubroutineNotDeclaredException, BlockException
+	public SimCode simulate(Long blockId,Simulator sim) throws SocketNullException, SubroutineNotDeclaredException, BlockException
 	{
 		TranslatorBlockFactory translatorBlockFactory = new TranslatorBlockFactory();
 		Block block = workspace.getEnv().getBlock(blockId);
 		TranslatorBlock rootTranslatorBlock = translatorBlockFactory.buildTranslatorBlock(this, blockId, block.getGenusName(), "", "", block.getBlockLabel());
-		return rootTranslatorBlock.toSim();
+		rootTranslatorBlock.toSim(sim);
+		return null;
 	}
 	
 	public BlockAdaptor getBlockAdaptor()

src/main/java/com/ardublock/translator/block/TranslatorBlock.java

@@ -7,8 +7,8 @@ import com.ardublock.translator.adaptor.BlockAdaptor;
 import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
-import com.ardublock.util.SimCodeObject;
 
+import tec.letsgoing.ardublock.simulator.Simulator;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 
 abstract public class TranslatorBlock
@@ -119,4 +119,14 @@ abstract public class TranslatorBlock
 		throw new BlockException(blockId, uiMessageBundle.getString("ardublock.error_msg.no_sim_for_block"));
 	}
 	//***********************************************	
+
+	/**
+	 * @param sim
+	 * @throws SocketNullException 
+	 * @throws BlockException 
+	 */
+	public void toSim(Simulator sim) throws BlockException, SocketNullException {
+		// TODO Auto-generated method stub
+		
+	}
 }

src/main/java/com/ardublock/translator/block/code/CommentBlock.java

@@ -4,7 +4,6 @@ import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
-import com.ardublock.util.SimCodeObject;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 

src/main/java/com/ardublock/translator/block/code/CommentHeadBlock.java

@@ -4,7 +4,7 @@ import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
-import com.ardublock.util.SimCodeObject;
+
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 

src/main/java/com/ardublock/translator/block/code/CommentProgramBlock.java

@@ -4,7 +4,7 @@ import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
-import com.ardublock.util.SimCodeObject;
+
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 

src/main/java/com/ardublock/translator/block/control/InterruptBlock.java

@@ -4,7 +4,6 @@ import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
-import com.ardublock.util.SimCodeObject;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 

src/main/java/com/ardublock/translator/block/control/LoopBlock.java

@@ -8,10 +8,14 @@ import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.Simulator;
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeElse;
 import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
 import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
+import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
 import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 
 
@@ -39,7 +43,7 @@ public class LoopBlock extends TranslatorBlock
 		return ret;
 	}
 	
-	public SimCode toSim() throws BlockException, SocketNullException {
+	public void toSim(Simulator sim) throws BlockException, SocketNullException {
 		Vector<SimCode> vec =new Vector<SimCode>();
 		TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(0);
 		while (translatorBlock != null)
@@ -53,6 +57,21 @@ public class LoopBlock extends TranslatorBlock
 			
 		}
 		SimCodeFunction loop =new SimCodeFunction("loop",vec);
-		return loop;
+		
+		SimTypeBool boolTrue = new SimTypeBool(true);
+		Vector<SimCode> mainVec = new Vector<SimCode>();
+		//mainVec.add(new CodeExecuteFunction("setup"));
+		Vector<SimCode> loopVec = new Vector<SimCode>();
+		loopVec.add(new CodeExecuteFunction("loop"));
+		mainVec.add(new CodeWhile(boolTrue, loopVec));
+		SimCodeFunction main = new SimCodeFunction("main", mainVec);
+
+		//sim.addFunctionsCode(setupCode);
+		System.out.println("Add new Functions");
+		sim.stopSimu();
+		sim.resetFunctions();
+		sim.addFunctionsCode(loop);
+		sim.addFunctionsCode(main);
+		
 	}
 }

src/main/java/com/ardublock/translator/block/control/ProgramBlock.java

@@ -2,12 +2,21 @@ package com.ardublock.translator.block.control;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Vector;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
+import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.Simulator;
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
+import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
+
 
 public class ProgramBlock extends TranslatorBlock
 {
@@ -61,4 +70,6 @@ public class ProgramBlock extends TranslatorBlock
 		}
 	}
 	
+	
+	
 }

src/main/java/com/ardublock/translator/block/control/SketchBlock.java

@@ -3,6 +3,7 @@ package com.ardublock.translator.block.control;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ResourceBundle;
+import java.util.Vector;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
@@ -14,6 +15,13 @@ import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.Simulator;
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
+import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
+
 
 @SuppressWarnings("unused")
 public class SketchBlock extends TranslatorBlock
@@ -88,4 +96,63 @@ public class SketchBlock extends TranslatorBlock
 		}
 	}
 	
+	public void toSim(Simulator sim) throws BlockException, SocketNullException {
+		Vector<SimCode> mainVec =new Vector<SimCode>();
+		Vector<SimCode> setup =new Vector<SimCode>();
+		Vector<SimCode> loop =new Vector<SimCode>();
+		//MainPart
+		TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(0);
+		while (translatorBlock != null)
+		{
+			SimCode newSimCode = translatorBlock.toSim();
+			translatorBlock = translatorBlock.nextTranslatorBlock();
+			if (newSimCode != null) {
+				mainVec.add(newSimCode);
+			}		
+		}
+		//Setup
+		translatorBlock = getTranslatorBlockAtSocket(1);
+		while (translatorBlock != null)
+		{
+			SimCode newSimCode = translatorBlock.toSim();
+			translatorBlock = translatorBlock.nextTranslatorBlock();
+			if (newSimCode != null) {
+				setup.add(newSimCode);
+			}		
+		}
+		//Loop
+		translatorBlock = getTranslatorBlockAtSocket(2);
+		while (translatorBlock != null)
+		{
+			SimCode newSimCode = translatorBlock.toSim();
+			translatorBlock = translatorBlock.nextTranslatorBlock();
+			if (newSimCode != null) {
+				loop.add(newSimCode);
+			}		
+		}
+		SimCodeFunction setupFunc =new SimCodeFunction("setup",setup);
+		SimCodeFunction loopFunc =new SimCodeFunction("loop",loop);
+		sim.stopSimu();
+		sim.resetFunctions();
+		
+		
+		SimTypeBool boolTrue = new SimTypeBool(true);
+		mainVec.add(new CodeExecuteFunction("setup"));
+		
+		Vector<SimCode> whileVec = new Vector<SimCode>();
+		whileVec.add(new CodeExecuteFunction("loop"));
+		
+		mainVec.add(new CodeWhile(boolTrue, whileVec));
+		SimCodeFunction main = new SimCodeFunction("main", mainVec);
+
+		System.out.println("Add new Functions");
+		
+		sim.addFunctionsCode(setupFunc);
+		sim.addFunctionsCode(loopFunc);
+		sim.addFunctionsCode(main);
+		
+		
+		
+	}
+	
 }

src/main/java/com/ardublock/translator/block/control/SubroutineBlock.java

 package com.ardublock.translator.block.control;
 
+import java.util.Vector;
+
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
+import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.Simulator;
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeWhile;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeString;
+import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
+import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
+
 public class SubroutineBlock extends TranslatorBlock
 {
 
@@ -34,4 +45,24 @@ public class SubroutineBlock extends TranslatorBlock
 		ret += "}\n\n";
 		return ret;
 	}
+	
+	public void toSim(Simulator sim) throws BlockException, SocketNullException {
+		String funcName= label.trim();
+		Vector<SimCode> vec =new Vector<SimCode>();
+		TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(1);
+		while (translatorBlock != null)
+		{
+			SimCode newSimCode = translatorBlock.toSim();
+			translatorBlock = translatorBlock.nextTranslatorBlock();
+			if (newSimCode != null) {
+				vec.add(newSimCode);
+			}
+			
+			
+		}
+		SimCodeFunction func =new SimCodeFunction(funcName,vec);
+		System.out.println("Add new Function");
+		sim.addFunctionsCode(func);
+		
+	}
 }

src/main/java/com/ardublock/translator/block/control/SubroutineRefBlock.java

@@ -5,6 +5,9 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.functions.CodeExecuteFunction;
+
 public class SubroutineRefBlock extends TranslatorBlock
 {
 
@@ -24,4 +27,8 @@ public class SubroutineRefBlock extends TranslatorBlock
 		return "\t"+subroutineName + "();\n";
 	}
 	
+	public SimCode toSim() {
+		return new CodeExecuteFunction(label.trim());
+	}
+
 }

src/main/java/com/ardublock/ui/listener/SimulateCodeButtonListener.java

@@ -13,6 +13,8 @@ import javax.swing.JOptionPane;
 import com.ardublock.core.Context;
 import com.ardublock.translator.AutoFormat;
 import com.ardublock.translator.Translator;
+import com.ardublock.translator.block.control.LoopBlock;
+import com.ardublock.translator.block.control.ProgramBlock;
 import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNameDuplicatedException;
@@ -201,7 +203,7 @@ public class SimulateCodeButtonListener implements ActionListener
 			return ;
 		}
 		
-		SimCodeFunction loop=new SimCodeFunction("loop",null);
+		
 		try
 		{
 			for (RenderableBlock renderableBlock : commentBlockSet)
@@ -217,7 +219,10 @@ public class SimulateCodeButtonListener implements ActionListener
 				translator.setRootBlockName("loop");
 				Block loopBlock = renderableBlock.getBlock();
 				code.append(translator.translate(loopBlock.getBlockID()));
-				loop=(SimCodeFunction) translator.simulate(loopBlock.getBlockID());
+				//FIXME Wie Loop von Programm Block unterscheiden?
+				
+				
+				translator.simulate(loopBlock.getBlockID(),sim);
 				//collect simcode objects here -> all SimCodeObjects inside main loop
 				//eg. simList.append(translator.simulate(loopBlock.getBlockID())); -> simList = simCodeObject-List
 			}
@@ -227,6 +232,7 @@ public class SimulateCodeButtonListener implements ActionListener
 				translator.setRootBlockName("subroutine");
 				Block subroutineBlock = renderableBlock.getBlock();
 				code.append(translator.translate(subroutineBlock.getBlockID()));
+				translator.simulate(subroutineBlock.getBlockID(),sim);
 				//collect simcode objects here -> all SimCodeObjects inside main subroutines
 				//eg. simList.append(translator.simulate(subroutineBlock.getBlockID())); -> simList = simCodeObject-List
 			}
@@ -312,20 +318,7 @@ public class SimulateCodeButtonListener implements ActionListener
 			
 	
 			
-			SimTypeBool boolTrue = new SimTypeBool(true);
-			Vector<SimCode> mainVec = new Vector<SimCode>();
-			//mainVec.add(new CodeExecuteFunction("setup"));
-			Vector<SimCode> loopVec = new Vector<SimCode>();
-			loopVec.add(new CodeExecuteFunction("loop"));
-			mainVec.add(new CodeWhile(boolTrue, loopVec));
-			SimCodeFunction main = new SimCodeFunction("main", mainVec);
 			
-			//sim.addFunctionsCode(setupCode);
-			System.out.println("Add new Functions");
-			sim.stopSimu();
-			sim.resetFunctions();
-			sim.addFunctionsCode(loop);
-			sim.addFunctionsCode(main);
 			//TODO Autostart?
 			//TODO ! start simulator here
 			//sim.run();