Merge lp:~tapaal-contributor/tapaal/query-parsing-bug-1921580 into lp:tapaal

Proposed by Lena Said
Status: Merged
Approved by: Jiri Srba
Approved revision: 1122
Merged at revision: 1122
Proposed branch: lp:~tapaal-contributor/tapaal/query-parsing-bug-1921580
Merge into: lp:tapaal
Diff against target: 24 lines (+6/-1)
1 file modified
src/pipe/gui/widgets/QueryDialog.java (+6/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/query-parsing-bug-1921580
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+400318@code.launchpad.net

Commit message

Fixed not being able to parse a correctly edited query

To post a comment you must log in.
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/pipe/gui/widgets/QueryDialog.java'
2--- src/pipe/gui/widgets/QueryDialog.java 2021-03-02 16:02:35 +0000
3+++ src/pipe/gui/widgets/QueryDialog.java 2021-03-29 10:10:55 +0000
4@@ -30,6 +30,7 @@
5 import javax.swing.undo.UndoableEditSupport;
6
7 import dk.aau.cs.TCTL.*;
8+import dk.aau.cs.TCTL.CTLParsing.TAPAALCTLQueryParser;
9 import dk.aau.cs.TCTL.visitors.*;
10 import dk.aau.cs.gui.TabContent;
11 import dk.aau.cs.model.tapn.*;
12@@ -2292,7 +2293,11 @@
13 TCTLAbstractProperty newQuery = null;
14
15 try {
16- newQuery = TAPAALQueryParser.parse(queryField.getText());
17+ if (lens.isTimed()) {
18+ newQuery = TAPAALQueryParser.parse(queryField.getText());
19+ } else {
20+ newQuery = TAPAALCTLQueryParser.parse(queryField.getText());
21+ }
22 } catch (Throwable ex) {
23 int choice = JOptionPane.showConfirmDialog(
24 CreateGui.getApp(),

Subscribers

People subscribed via source and target branches