|
@@ -14,10 +14,12 @@ import javax.swing.event.CaretListener;
|
|
|
import javax.tools.JavaCompiler;
|
|
|
import javax.tools.ToolProvider;
|
|
|
|
|
|
+import classes.AbstractCpsObject;
|
|
|
import ui.controller.Control;
|
|
|
import ui.model.Model;
|
|
|
import java.util.HashMap;
|
|
|
import java.awt.GridBagLayout;
|
|
|
+import java.awt.Color;
|
|
|
import java.awt.Dimension;
|
|
|
import java.awt.GridBagConstraints;
|
|
|
import java.awt.Insets;
|
|
@@ -129,6 +131,11 @@ public class SimulationMenu extends JMenuBar {
|
|
|
@Override
|
|
|
public void actionPerformed(ActionEvent e) {
|
|
|
controller.setIsSimulation(simButton.isSelected());
|
|
|
+ if (!model.getIsSimulation()) {
|
|
|
+ for (AbstractCpsObject cps : model.getObjectsOnCanvas()) {
|
|
|
+ cps.setBorderColor(Color.WHITE);
|
|
|
+ }
|
|
|
+ }
|
|
|
controller.calculateStateForCurrentTimeStep();
|
|
|
}
|
|
|
});
|
|
@@ -194,7 +201,7 @@ public class SimulationMenu extends JMenuBar {
|
|
|
while (line != null) {
|
|
|
line = line.trim();
|
|
|
if (!line.isEmpty()) {
|
|
|
- if (line.length() >= 7 &&line.substring(0, 7).equals("package")) {
|
|
|
+ if (line.length() >= 7 && line.substring(0, 7).equals("package")) {
|
|
|
packageName = line.substring(8, line.length() - 1);
|
|
|
}
|
|
|
}
|
|
@@ -206,7 +213,6 @@ public class SimulationMenu extends JMenuBar {
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// Compile source file.
|
|
|
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
|
|
|
|
|
@@ -219,7 +225,7 @@ public class SimulationMenu extends JMenuBar {
|
|
|
if (packageName.isEmpty()) {
|
|
|
cls = Class.forName(name, true, classLoader);
|
|
|
} else {
|
|
|
- cls = Class.forName(packageName+"."+ name, true, classLoader);
|
|
|
+ cls = Class.forName(packageName + "." + name, true, classLoader);
|
|
|
}
|
|
|
|
|
|
Object t = cls.newInstance();
|
|
@@ -227,7 +233,6 @@ public class SimulationMenu extends JMenuBar {
|
|
|
controller.setAlgorithm(t);
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
- controller.addTextToConsole(e.toString());
|
|
|
}
|
|
|
}
|
|
|
}
|