Simulator

.github/workflows/build.yml

@@ -16,8 +16,9 @@ jobs:
           submodules: recursive
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: 11
           java-package: jdk
       - name: Cache Gradle packages

.gitignore

@@ -6,6 +6,10 @@ lib/
 .idea/
 /out/
 
+#VsCode
+/bin/
+.vscode/
+
 ### Gradle ###
 .gradle
 /build/

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "src/main/proto"]
 	path = src/main/proto
-	url = https://github.com/Ecdar/Ecdar-ProtoBuf.git
+	url = https://github.com/Ecdar-SW5/Ecdar-ProtoBuf.git
+

build.gradle

@@ -11,6 +11,20 @@ javafx {
     modules = ['javafx.controls', 'javafx.fxml', 'javafx.swing']
 }
 
+run {
+    mainClassName = 'com.jfxbase/com.jfxbase.sample.Main'
+    applicationDefaultJvmArgs += [
+            "--add-opens", "javafx.graphics/javafx.css=ALL-UNNAMED",
+            "--add-opens", "javafx.base/com.sun.javafx.runtime=ALL-UNNAMED",
+            "--add-opens", "javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED",
+            "--add-opens", "javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED",
+            "--add-opens", "javafx.base/com.sun.javafx.binding=ALL-UNNAMED",
+            "--add-opens", "javafx.base/com.sun.javafx.event=ALL-UNNAMED",
+            "--add-opens", "javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED",
+            "--add-opens", "javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED",
+    ]
+}
+
 group 'ecdar'
 if (project.hasProperty('ecdarVersion')) {
     version = project.ecdarVersion
@@ -47,7 +61,6 @@ def protocVersion = protobufVersion
 
 dependencies {
     implementation fileTree(dir: 'lib', include: ['*.jar'])
-
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation group: 'de.codecentric.centerdevice', name: 'javafxsvg', version: '1.3.0'
     implementation 'org.kordamp.ikonli:ikonli-core:12.3.1'
@@ -76,14 +89,14 @@ dependencies {
     testImplementation "io.grpc:grpc-testing:${grpcVersion}"
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.0.0-M4'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
     testImplementation 'org.testfx:testfx-junit:4.0.15-alpha'
     testImplementation 'org.testfx:openjfx-monocle:jdk-12.0.1+2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
     testImplementation 'org.mockito:mockito-junit-jupiter:4.8.0'
 }
 
-
 test {
     useJUnitPlatform { includeEngines 'junit-jupiter' }
 

src/main/java/ecdar/Ecdar.java

@@ -4,7 +4,6 @@
 import ecdar.backend.BackendException;
 import ecdar.backend.BackendHelper;
 import ecdar.code_analysis.CodeAnalysis;
-import ecdar.controllers.EcdarController;
 import ecdar.issues.ExitStatusCodes;
 import ecdar.presentations.*;
 import ecdar.utility.keyboard.Keybind;
@@ -135,8 +134,8 @@ public static void showHelp() {
         presentation.showHelp();
     }
 
-    public static BooleanProperty toggleFilePane() {
-        return presentation.toggleFilePane();
+    public static BooleanProperty toggleLeftPane() {
+        return presentation.toggleLeftPane();
     }
 
     /**
@@ -163,7 +162,7 @@ public static BooleanProperty toggleRunBackgroundQueries() {
     }
 
     public static BooleanProperty toggleQueryPane() {
-        return presentation.toggleQueryPane();
+        return presentation.toggleRightPane();
     }
 
     public static BooleanProperty isSplitProperty() {
@@ -256,8 +255,6 @@ public void start(final Stage stage) {
         // We're now ready! Let the curtains fall!
         stage.show();
 
-        EcdarController.reachabilityServiceEnabled = true;
-
         // Register a key-bind for showing debug-information
         KeyboardTracker.registerKeybind("DEBUG", new Keybind(new KeyCodeCombination(KeyCode.F12), () -> {
             // Toggle the debug mode for the debug class (will update misc. debug variables which presentations bind to)
@@ -311,7 +308,7 @@ public void start(final Stage stage) {
             }
         });
 
-        project = presentation.getController().projectPane.getController().project;
+        project = presentation.getController().getEditorPresentation().getController().projectPane.getController().project;
     }
 
     private void loadFonts() {
@@ -378,22 +375,10 @@ public static void initializeProjectFolder() throws IOException {
 
         // If we found a component set that as active
         serializationDone = true;
-
-        // Update reachability check timer when components change
-        getProject().getComponents().addListener((ListChangeListener<Component>) c -> {
-            while (c.next()) {
-                c.getAddedSubList().forEach(component -> {
-                    component.getLocations().addListener((ListChangeListener<? super Location>) loc -> EcdarController.runReachabilityAnalysis());
-                    component.getDisplayableEdges().addListener((ListChangeListener<? super DisplayableEdge>) de -> EcdarController.runReachabilityAnalysis());
-                    component.declarationsTextProperty().addListener((observable, oldValue, newValue) -> EcdarController.runReachabilityAnalysis());
-                    component.includeInPeriodicCheckProperty().addListener((observable, oldValue, newValue) -> EcdarController.runReachabilityAnalysis());
-                });
-            }
-        });
     }
 
     public static ComponentPresentation getComponentPresentationOfComponent(Component component) {
-        return getPresentation().getController().projectPane.getController().getComponentPresentations().stream().filter(componentPresentation -> componentPresentation.getController().getComponent().equals(component)).findFirst().orElse(null);
+        return getPresentation().getController().getEditorPresentation().getController().projectPane.getController().getComponentPresentations().stream().filter(componentPresentation -> componentPresentation.getController().getComponent().equals(component)).findFirst().orElse(null);
     }
 
     private static String getVersion() {

src/main/java/ecdar/abstractions/ClockConstraint.java

@@ -0,0 +1,31 @@
+package ecdar.abstractions;
+
+import javafx.util.Pair;
+
+public class ClockConstraint {
+    public final Pair<String, String> clocks;
+    public final char comparator;
+    public final int constant;
+    public final boolean isStrict;
+
+    public ClockConstraint(String leftClock, String rightClock, int constant, char comparator, boolean isStrict) {
+        this.clocks = new Pair<>(leftClock, rightClock);
+        this.constant = constant;
+        this.comparator = comparator;
+        this.isStrict = isStrict;
+    }
+
+    @Override
+    public String toString() {
+        if (clocks.getValue() != null) {
+            return clocks.getKey() + " - " +
+                    clocks.getValue() + " " +
+                    comparator + (isStrict ? "= " : " ") +
+                    constant;
+        } else {
+            return clocks.getKey() + " " +
+                    comparator + (isStrict ? "= " : " ") +
+                    constant;
+        }
+    }
+}