Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPPAAL server updated for queries on change #25

Merged
merged 13 commits into from
Sep 16, 2020
Merged

UPPAAL server updated for queries on change #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a9d7dd1
WIP: UPPAAL integration fix
Nielswps Jun 28, 2020
38f2ad6
Unneeded namespace extension removed
Nielswps Jun 28, 2020
e1496d1
WIP: Specific jork to subcomponent check added
Nielswps Jun 28, 2020
ba8ea8b
Loaded project has no main component error fixed
Nielswps Jul 24, 2020
ddd2a59
No main component causing issues FIXED
Nielswps Jul 24, 2020
ae683e0
UppaalDriver not retrieved for every query run FIXED
Nielswps Jul 24, 2020
3f2860b
UppaalDriverManager UPPAAL location readded
Nielswps Jul 24, 2020
80c7ba5
No main component deadlock and reachability check error fixed
Nielswps Jul 24, 2020
c0b161f
Possible check for HUPPAAL Document removed
Nielswps Jul 24, 2020
8620138
No main component fix reverted (will be handled in another way in ano…
Nielswps Jul 29, 2020
4d3e99d
Merge branch 'master' into uppaalError
Nielswps Jul 29, 2020
f022581
Inverted driver check to accommodate future driver types
Nielswps Jul 30, 2020
9a6fb41
Merge branch 'master' into uppaalError
yrke Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/dk/cs/aau/huppaal/abstractions/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ public void setIsPeriodic(final boolean isPeriodic) {
private Boolean forcedCancel = false;

private void initializeRunQuery() {
IUPPAALDriver uppaalDriver = UPPAALDriverManager.getInstance();
runQuery = (buildHUPPAALDocument) -> {
IUPPAALDriver uppaalDriver = UPPAALDriverManager.getInstance();
setQueryState(QueryState.RUNNING);

final Component mainComponent = HUPPAAL.getProject().getMainComponent();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dk/cs/aau/huppaal/backend/HUPPAALDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ private Template generateTemplate(final Component component, final SubComponent
final com.uppaal.model.core2.Location pseudoEnter = subComponentPseudoLocationMap.get(generateName(hEdge.getTargetSubComponent())).getKey();
addEdge(template, hEdge, 0, pseudoEnter);
}

// If the edge starts somewhere and ends in a fork
if (hEdge.getTargetJork() != null && hEdge.getTargetJork().getType().equals(Jork.Type.FORK)) {
// Find all outgoing edges from this fork and make sure that they are sub-components
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/dk/cs/aau/huppaal/backend/UPPAALDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public Thread runQuery(final String query,
new Timer().schedule(new TimerTask() {
@Override
public void run() {
synchronized (dk.cs.aau.huppaal.backend.IUPPAALDriver.engineLock) {
synchronized (engineLock) {
if(engine == null) return;
engine.cancel();
}
Expand Down Expand Up @@ -167,7 +167,7 @@ public void run() {
// Something went wrong
failure.accept(new BackendException.BadUPPAALQueryException("Unable to run query", e));
} finally {
synchronized (dk.cs.aau.huppaal.backend.IUPPAALDriver.engineLock) {
synchronized (engineLock) {
releaseOSDependentEngine(engine);
engine = null;
}
Expand Down Expand Up @@ -232,6 +232,7 @@ private void storeUppaalFile(final Document uppaalDocument, final String fileNam
uppaalDocument.save(file);
} catch (final IOException e) {
// TODO Handle exception
HUPPAAL.showToast(e.getMessage());
e.printStackTrace();
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/dk/cs/aau/huppaal/controllers/ComponentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,6 @@ private void initializeComponentContextMenu() {
contextMenu.addSpacerElement();

contextMenu.addClickableListElement("Contains deadlock?", event -> {
contextMenu.close();

// Generate the query
final String deadlockQuery = UPPAALDriverManager.getInstance().getExistDeadlockQuery(getComponent());

Expand All @@ -539,7 +537,6 @@ private void initializeComponentContextMenu() {
query.run();

contextMenu.close();

});

contextMenu.addSpacerElement();
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/dk/cs/aau/huppaal/presentations/HUPPAALPresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.jfoenix.controls.JFXSnackbarLayout;
import dk.cs.aau.huppaal.HUPPAAL;
import dk.cs.aau.huppaal.abstractions.Query;
import dk.cs.aau.huppaal.backend.DummyUPPAALDriver;
import dk.cs.aau.huppaal.backend.UPPAALDriver;
import dk.cs.aau.huppaal.backend.UPPAALDriverManager;
import dk.cs.aau.huppaal.code_analysis.CodeAnalysis;
Expand Down Expand Up @@ -341,12 +342,12 @@ private void initializeGenerateUppaalModelButton() {

controller.generateUppaalModel.setMaskType(JFXRippler.RipplerMask.CIRCLE);
controller.generateUppaalModel.setRipplerFill(color.getTextColor(colorIntensity));
if(UPPAALDriverManager.getInstance() instanceof UPPAALDriver){
controller.generateUppaalModel.setEnabled(true);
controller.generateUppaalModel.setOpacity(1);
} else {
if(UPPAALDriverManager.getInstance() instanceof DummyUPPAALDriver){
controller.generateUppaalModel.setEnabled(false);
controller.generateUppaalModel.setOpacity(0.3);
} else {
controller.generateUppaalModel.setEnabled(true);
controller.generateUppaalModel.setOpacity(1);
}
}

Expand Down