TAPAAL

Merge lp:~tapaal-contributor/tapaal/enable-AF-game into lp:tapaal

  1. enable-AF-game
  2. Merge into trunk
Proposed by Lena Ernstsen
Status: Merged
Approved by: Jiri Srba
Approved revision: 1094
Merged at revision: 1093
Proposed branch: lp:~tapaal-contributor/tapaal/enable-AF-game
Merge into: lp:tapaal
Diff against target: 62 lines (+11/-6)
2 files modified
src/dk/aau/cs/gui/TabContent.java (+1/-1)
src/pipe/gui/widgets/QueryDialog.java (+10/-5)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/enable-AF-game
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+390082@code.launchpad.net

Commit message

Enabled AF for game nets

To post a comment you must log in.
lp:~tapaal-contributor/tapaal/enable-AF-game updated
1094. By Lena Ernstsen

Merged with trunk

Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/gui/TabContent.java'
2--- src/dk/aau/cs/gui/TabContent.java 2020-09-01 11:45:06 +0000
3+++ src/dk/aau/cs/gui/TabContent.java 2020-09-01 11:58:55 +0000
4@@ -663,7 +663,7 @@
5 queriesToRemove.add(q);
6 tab.removeQuery(q);
7 } else if (tab.lens.isGame()) {
8- if (q.getProperty() instanceof TCTLAFNode || q.getProperty() instanceof TCTLEFNode || q.getProperty() instanceof TCTLEGNode) {
9+ if (q.getProperty() instanceof TCTLEFNode || q.getProperty() instanceof TCTLEGNode) {
10 queriesToRemove.add(q);
11 tab.removeQuery(q);
12 } if (q.getSearchOption().equals(TAPNQuery.SearchOption.HEURISTIC)) {
13
14=== modified file 'src/pipe/gui/widgets/QueryDialog.java'
15--- src/pipe/gui/widgets/QueryDialog.java 2020-08-27 07:27:30 +0000
16+++ src/pipe/gui/widgets/QueryDialog.java 2020-09-01 11:58:55 +0000
17@@ -11,7 +11,10 @@
18 import java.io.ByteArrayInputStream;
19 import java.io.ByteArrayOutputStream;
20 import java.io.File;
21-import java.util.*;
22+import java.util.ArrayList;
23+import java.util.Enumeration;
24+import java.util.HashMap;
25+import java.util.Vector;
26
27 import javax.swing.*;
28 import javax.swing.event.DocumentEvent;
29@@ -1055,11 +1058,11 @@
30 setEnablednessOfAddPredicateButton();
31 }
32
33- private void enableOnlyForAllBox() {
34+ private void enableOnlyForAll() {
35 existsBox.setEnabled(false);
36 existsDiamond.setEnabled(false);
37 forAllBox.setEnabled(true);
38- forAllDiamond.setEnabled(false);
39+ forAllDiamond.setEnabled(true);
40 if (!lens.isTimed()) {
41 existsUntil.setEnabled(false);
42 existsNext.setEnabled(false);
43@@ -2779,7 +2782,9 @@
44
45 private void refreshExportButtonText() {
46 ReductionOption reduction = getReductionOption();
47- if (reduction == null) {saveUppaalXMLButton.setEnabled(false);}
48+ if (reduction == null) {
49+ saveUppaalXMLButton.setEnabled(false);
50+ }
51 else {
52 saveUppaalXMLButton.setText(reduction == ReductionOption.VerifyTAPN || reduction == ReductionOption.VerifyTAPNdiscreteVerification ? EXPORT_VERIFYTAPN_BTN_TEXT : reduction == ReductionOption.VerifyPN ? EXPORT_VERIFYPN_BTN_TEXT : EXPORT_UPPAAL_BTN_TEXT);
53 saveUppaalXMLButton.setToolTipText(reduction == ReductionOption.VerifyTAPN || reduction == ReductionOption.VerifyTAPNdiscreteVerification ? TOOL_TIP_SAVE_TAPAAL_BUTTON : reduction == ReductionOption.VerifyPN ? TOOL_TIP_SAVE_PN_BUTTON : TOOL_TIP_SAVE_UPPAAL_BUTTON);
54@@ -2792,7 +2797,7 @@
55 if (lens.isGame()) {
56 if (currentSelection.getObject() instanceof TCTLAbstractPathProperty) {
57 forAllBox.setSelected(false);
58- enableOnlyForAllBox();
59+ enableOnlyForAll();
60 } else if (currentSelection.getObject() instanceof TCTLAbstractStateProperty) {
61 enableOnlyStateButtons();
62 }

Subscribers

People subscribed via source and target branches