Merge lp:~tapaal-contributor/tapaal/ltl-icon-selection-1997234 into lp:tapaal
Status: | Superseded |
---|---|
Proposed branch: | lp:~tapaal-contributor/tapaal/ltl-icon-selection-1997234 |
Merge into: | lp:tapaal |
Diff against target: |
493 lines (+145/-47) (has conflicts) 15 files modified
src/dk/aau/cs/model/tapn/TAPNQuery.java (+8/-8) src/dk/aau/cs/verification/QueryResult.java (+2/-0) src/dk/aau/cs/verification/QueryType.java (+3/-1) src/dk/aau/cs/verification/Stats.java (+3/-3) src/dk/aau/cs/verification/VerificationResult.java (+16/-0) src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java (+0/-1) src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java (+22/-20) src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java (+28/-8) src/net/tapaal/Preferences.java (+17/-0) src/net/tapaal/TAPAAL.java (+1/-1) src/pipe/gui/GuiFrameController.java (+4/-4) src/pipe/gui/Pipe.java (+1/-1) src/pipe/gui/RunVerification.java (+10/-0) src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java (+10/-0) src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java (+20/-0) Text conflict in src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java Text conflict in src/net/tapaal/Preferences.java Text conflict in src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java Text conflict in src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java |
To merge this branch: | bzr merge lp:~tapaal-contributor/tapaal/ltl-icon-selection-1997234 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
TAPAAL Reviewers | Pending | ||
Review via email: mp+435359@code.launchpad.net |
This proposal has been superseded by a proposal from 2023-01-09.
Commit message
Considers LTL nodes when selecting icons for verification
Unmerged revisions
- 1179. By Lena Ernstsen
-
Fixed wrong statistics for CTL queries
- 1178. By Lena Ernstsen
-
Added 'show raw query results' button for state equation results
- 1177. By Lena Ernstsen
-
Reverted change to avoid NPE
- 1176. By Lena Ernstsen
-
Icon selection now considers LTL nodes
- 1175. By <email address hidden>
-
increased version to 3.9.3 and min version of verifypn to 4.2.2
- 1174. By <email address hidden>
-
merged in lp:~tapaal-contributor/tapaal/update-ltl-support-3.9 fixing bug #1983371
- 1173. By <email address hidden>
-
merged in lp:~tapaal-contributor/tapaal/save-file-browser-location-3.9 fixing the remembering of a location when opening a file
- 1172. By Jiri Srba
-
merged in a fix for resting LTL queries
- 1171. By Jiri Srba
-
merged in a bug fix for LTL manual edit of queries ( E .. and .. and ...) did not allow manual edit and removing the last conjunct
- 1170. By Jiri Srba
-
merged in lp:~yrke/tapaal/fix1976494 fixing a problem with copying components that contain environmental transitions