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

Proposed by Lena Ernstsen
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.
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
=== modified file 'src/pipe/gui/widgets/QueryDialog.java'
--- src/pipe/gui/widgets/QueryDialog.java 2021-03-02 16:02:35 +0000
+++ src/pipe/gui/widgets/QueryDialog.java 2021-03-29 10:10:55 +0000
@@ -30,6 +30,7 @@
30import javax.swing.undo.UndoableEditSupport;30import javax.swing.undo.UndoableEditSupport;
3131
32import dk.aau.cs.TCTL.*;32import dk.aau.cs.TCTL.*;
33import dk.aau.cs.TCTL.CTLParsing.TAPAALCTLQueryParser;
33import dk.aau.cs.TCTL.visitors.*;34import dk.aau.cs.TCTL.visitors.*;
34import dk.aau.cs.gui.TabContent;35import dk.aau.cs.gui.TabContent;
35import dk.aau.cs.model.tapn.*;36import dk.aau.cs.model.tapn.*;
@@ -2292,7 +2293,11 @@
2292 TCTLAbstractProperty newQuery = null;2293 TCTLAbstractProperty newQuery = null;
22932294
2294 try {2295 try {
2295 newQuery = TAPAALQueryParser.parse(queryField.getText());2296 if (lens.isTimed()) {
2297 newQuery = TAPAALQueryParser.parse(queryField.getText());
2298 } else {
2299 newQuery = TAPAALCTLQueryParser.parse(queryField.getText());
2300 }
2296 } catch (Throwable ex) {2301 } catch (Throwable ex) {
2297 int choice = JOptionPane.showConfirmDialog(2302 int choice = JOptionPane.showConfirmDialog(
2298 CreateGui.getApp(),2303 CreateGui.getApp(),

Subscribers

People subscribed via source and target branches