Custom backends

src/main/java/ecdar/Ecdar.java

@@ -47,7 +47,7 @@ public class Ecdar extends Application {
     public static SimpleStringProperty projectDirectory = new SimpleStringProperty();
     private static BooleanProperty isUICached = new SimpleBooleanProperty();
     private static final BooleanProperty isSplit = new SimpleBooleanProperty(true); //Set to true to ensure correct behaviour at first toggle.
-    private static BackendDriver backendDriver;
+    private static final BackendDriver backendDriver = new BackendDriver();
     private Stage debugStage;
 
     /**
@@ -190,7 +190,6 @@ public void start(final Stage stage) {
         // Load the fonts required for the project
         IconFontFX.register(GoogleMaterialDesignIcons.getIconFont());
         loadFonts();
-        loadPreferences();
 
         // Remove the classic decoration
         // kyrke - 2020-04-17: Disabled due to bug https://bugs.openjdk.java.net/browse/JDK-8154847
@@ -212,6 +211,8 @@ public void start(final Stage stage) {
         scene.getStylesheets().add("ecdar/main.css");
         scene.getStylesheets().add("ecdar/colors.css");
         scene.getStylesheets().add("ecdar/model_canvas.css");
+        scene.getStylesheets().add("ecdar/query_pane.css");
+        scene.getStylesheets().add("ecdar/scroll_pane.css");
 
         // Handle a mouse click as a deselection of all elements
         scene.setOnMousePressed(event -> {
@@ -289,16 +290,6 @@ public void start(final Stage stage) {
         });
     }
 
-    private void loadPreferences() {
-        BackendHelper.defaultBackend = preferences.getInt("default_backend", BackendHelper.BackendNames.jEcdar.ordinal())
-                == BackendHelper.BackendNames.jEcdar.ordinal()
-                ? BackendHelper.BackendNames.jEcdar
-                : BackendHelper.BackendNames.Reveaal;
-
-        backendDriver = new BackendDriver(preferences.get("backend_host_address", "127.0.0.1"));
-        getBackendDriver().setMaxNumberOfConnections(preferences.getInt("number_of_backend_sockets", 5));
-    }
-
     /**
      * Initializes and resets the project.
      * This can be used as a test setup.
@@ -381,6 +372,5 @@ private void loadFonts() {
         Font.loadFont(getClass().getResourceAsStream("fonts/roboto_mono/RobotoMono-Regular.ttf"), 14);
         Font.loadFont(getClass().getResourceAsStream("fonts/roboto_mono/RobotoMono-Thin.ttf"), 14);
         Font.loadFont(getClass().getResourceAsStream("fonts/roboto_mono/RobotoMono-ThinItalic.ttf"), 14);
-
     }
 }

src/main/java/ecdar/abstractions/BackendInstance.java

@@ -0,0 +1,119 @@
+package ecdar.abstractions;
+
+import com.google.gson.JsonObject;
+import ecdar.utility.serialize.Serializable;
+import javafx.beans.property.SimpleBooleanProperty;
+
+public class BackendInstance implements Serializable {
+    private static final String NAME = "name";
+    private static final String IS_LOCAL = "isLocal";
+    private static final String IS_DEFAULT = "isDefault";
+    private static final String LOCATION = "location";
+    private static final String PORT_RANGE_START = "portRangeStart";
+    private static final String PORT_RANGE_END = "portRangeEnd";
+    private static final String LOCKED = "locked";
+
+    private String name;
+    private boolean isLocal;
+    private boolean isDefault;
+    private String backendLocation;
+    private int portStart;
+    private int portEnd;
+    private SimpleBooleanProperty locked = new SimpleBooleanProperty(false);
+
+    public BackendInstance() {};
+
+    public BackendInstance(final JsonObject jsonObject) {
+        deserialize(jsonObject);
+    };
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isLocal() {
+        return isLocal;
+    }
+
+    public void setLocal(boolean local) {
+        isLocal = local;
+    }
+
+    public boolean isDefault() {
+        return isDefault;
+    }
+
+    public void setDefault(boolean aDefault) {
+        isDefault = aDefault;
+    }
+
+    public String getBackendLocation() {
+        return backendLocation;
+    }
+
+    public void setBackendLocation(String backendLocation) {
+        this.backendLocation = backendLocation;
+    }
+
+    public int getPortStart() {
+        return portStart;
+    }
+
+    public void setPortStart(int portStart) {
+        this.portStart = portStart;
+    }
+
+    public int getPortEnd() {
+        return portEnd;
+    }
+
+    public void setPortEnd(int portEnd) {
+        this.portEnd = portEnd;
+    }
+
+    public int getNumberOfInstances() {
+        return this.portEnd - this.portStart;
+    }
+
+    public void lockInstance() {
+        locked.set(true);
+    }
+
+    public SimpleBooleanProperty getLockedProperty() {
+        return locked;
+    }
+
+    @Override
+    public JsonObject serialize() {
+        final JsonObject result = new JsonObject();
+        result.addProperty(NAME, getName());
+        result.addProperty(IS_LOCAL, isLocal());
+        result.addProperty(IS_DEFAULT, isDefault());
+        result.addProperty(LOCATION, getBackendLocation());
+        result.addProperty(PORT_RANGE_START, getPortStart());
+        result.addProperty(PORT_RANGE_END, getPortEnd());
+        result.addProperty(LOCKED, getLockedProperty().get());
+
+        return result;
+    }
+
+    @Override
+    public void deserialize(final JsonObject json) {
+        setName(json.getAsJsonPrimitive(NAME).getAsString());
+        setLocal(json.getAsJsonPrimitive(IS_LOCAL).getAsBoolean());
+        setDefault(json.getAsJsonPrimitive(IS_DEFAULT).getAsBoolean());
+        setBackendLocation(json.getAsJsonPrimitive(LOCATION).getAsString());
+        setPortStart(json.getAsJsonPrimitive(PORT_RANGE_START).getAsInt());
+        setPortEnd(json.getAsJsonPrimitive(PORT_RANGE_END).getAsInt());
+        if (json.getAsJsonPrimitive(LOCKED).getAsBoolean()) lockInstance();
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/main/java/ecdar/abstractions/Project.java

@@ -169,7 +169,7 @@ public void deserialize(final File projectFolder) throws IOException {
                 deserializeFileHelper(file);
             }
         }
-        // Now we have gone though all the files in the directory we can now deserialize folders
+        // Now we have gone through all the files in the directory we can now deserialize folders
         if(componentFolder != null || systemFolder != null) {
             deserializeComponents(componentFolder);
             deserializeSystems(systemFolder);

src/main/java/ecdar/abstractions/Query.java

@@ -30,14 +30,14 @@ public class Query implements Serializable {
     private final SimpleBooleanProperty isPeriodic = new SimpleBooleanProperty(false);
     private final StringProperty errors = new SimpleStringProperty("");
     private final ObjectProperty<QueryType> type = new SimpleObjectProperty<>();
-    private BackendHelper.BackendNames backend;
+    private BackendInstance backend;
     private Consumer<Boolean> runQuery;
 
     public Query(final String query, final String comment, final QueryState queryState) {
         this.query.set(query);
         this.comment.set(comment);
         this.queryState.set(queryState);
-        setBackend(BackendHelper.defaultBackend);
+        setBackend(BackendHelper.getDefaultBackendInstance());
 
         initializeRunQuery();
     }
@@ -98,11 +98,11 @@ public void setIsPeriodic(final boolean isPeriodic) {
         this.isPeriodic.set(isPeriodic);
     }
 
-    public BackendHelper.BackendNames getBackend() {
+    public BackendInstance getBackend() {
         return backend;
     }
 
-    public void setBackend(BackendHelper.BackendNames backend) {
+    public void setBackend(BackendInstance backend) {
         this.backend = backend;
     }
 
@@ -179,7 +179,7 @@ public JsonObject serialize() {
         result.add(IGNORED_INPUTS, getHashMapAsJsonObject(ignoredInputs));
         result.add(IGNORED_OUTPUTS, getHashMapAsJsonObject(ignoredOutputs));
 
-        result.addProperty(BACKEND, backend.ordinal());
+        result.addProperty(BACKEND, backend.getName());
 
         return result;
     }
@@ -219,11 +219,9 @@ public void deserialize(final JsonObject json) {
         }
 
         if(json.has(BACKEND)) {
-            setBackend(json.getAsJsonPrimitive(BACKEND).getAsInt() == BackendHelper.BackendNames.jEcdar.ordinal()
-                    ? BackendHelper.BackendNames.jEcdar
-                    : BackendHelper.BackendNames.Reveaal);
+            setBackend(BackendHelper.getBackendInstanceByName(json.getAsJsonPrimitive(BACKEND).getAsString()));
         } else {
-            setBackend(BackendHelper.defaultBackend);
+            setBackend(BackendHelper.getDefaultBackendInstance());
         }
     }
 

src/main/java/ecdar/abstractions/QueryType.java

@@ -5,7 +5,7 @@ public enum QueryType {
     QUOTIENT("quotient", "\\"),
     SPECIFICATION("specification", "Spec"),
     IMPLEMENTATION("implementation", "Imp"),
-    LOCAL_CONSISTENCY("local-consistency", "lCon"),
+    LOCAL_CONSISTENCY("consistency", "lCon"), // ToDo NIELS: Will become local-consistency
     GLOBAL_CONSISTENCY("global-consistency", "gCon"),
     BISIM_MIN("bisim", "bsim"),
     GET_COMPONENT("get-component", "get"),