changes 20200717

src/tec/letsgoing/ardublock/simulator/Simulator.java

@@ -36,7 +36,9 @@ public class Simulator implements Runnable, ActionListener {
 
 	private Vector<SimCodeFunction> functionsCode = new Vector<SimCodeFunction>();
 
-	private Simulator() {
+	//changed to public by Anian
+	//private Simulator() {
+	public Simulator() {
 		createSubClasses();
 	}
 

src/tec/letsgoing/ardublock/simulator/view/GUI.java

@@ -23,6 +23,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.text.DefaultCaret;
 
+//import edu.mit.blocks.workspace.Workspace;
 import tec.letsgoing.ardublock.simulator.Simulator;
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.view.modules.ArduinoUno;
@@ -77,10 +78,20 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 		JButton reloadButton = new JButton();
 		JButton measButton = new JButton();
 
-		goButton.setIcon(new ImageIcon("res/Play.png"));
-		stopButton.setIcon(new ImageIcon("res/Stop.png"));
-		reloadButton.setIcon(new ImageIcon("res/Reload.png"));
-		measButton.setIcon(new ImageIcon("res/Measure.png"));
+		//Changes by Anian: added res to build-path (subfolder img) to export images to .jar file
+		//TODO get Images (Modules and Arduino) in ArduBlock and from .jar-File
+		// e.g. by  getToolkit().getImage(GUI.class.getResource("PathToImage")) 
+		//-> compare OpenBlocks-Workspace.java line 156 
+		// creating Modules with images -> maybe pass img by parameter? -> getToolkit not available in Modules...
+		goButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/img/Play.png"))));
+		stopButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/img/Stop.png"))));
+		reloadButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/img/Reload.png"))));
+		measButton.setIcon(new ImageIcon(getToolkit().getImage(GUI.class.getResource("/img/Measure.png"))));
+		
+		//goButton.setIcon(new ImageIcon("res/Play.png"));
+		//stopButton.setIcon(new ImageIcon("res/Stop.png"));
+		//reloadButton.setIcon(new ImageIcon("res/Reload.png"));
+		//measButton.setIcon(new ImageIcon("res/Measure.png"));
 
 		goButton.addActionListener(simu);
 		stopButton.addActionListener(simu);