TAPAAL

Merge lp:~tapaal-contributor/tapaal/merge-components-changed-lens-1947689 into lp:tapaal

  1. merge-components-changed-lens-1947689
  2. Merge into trunk
Proposed by Lena Ernstsen
Status: Superseded
Proposed branch: lp:~tapaal-contributor/tapaal/merge-components-changed-lens-1947689
Merge into: lp:tapaal
Diff against target: 25 lines (+2/-2)
2 files modified
src/dk/aau/cs/gui/TabContent.java (+1/-1)
src/pipe/gui/widgets/QueryDialog.java (+1/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/merge-components-changed-lens-1947689
Reviewer Review Type Date Requested Status
Jiri Srba Needs Fixing
Review via email: mp+410761@code.launchpad.net

This proposal has been superseded by a proposal from 2021-11-05.

Commit message

Fixed wrong use of lens with merge net components

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) wrote :

The problem is not fixed. Open e.g. the intro example and change it to untimed net. Then open the query and advanced view and "merge net components". It will open a new merged net that is not both timed and it is also a game.

review: Needs Fixing
lp:~tapaal-contributor/tapaal/merge-components-changed-lens-1947689 updated
1156. By Lena Ernstsen

Lens is considered when merging components through query dialog

Unmerged revisions

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 2021-11-03 11:55:06 +0000
3+++ src/dk/aau/cs/gui/TabContent.java 2021-11-05 06:35:26 +0000
4@@ -1978,7 +1978,7 @@
5
6 network.add(transformedModel.value1());
7
8- NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), network.constants());
9+ NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), network.constants(), lens);
10
11 try {
12 ByteArrayOutputStream outputStream = tapnWriter.savePNML();
13
14=== modified file 'src/pipe/gui/widgets/QueryDialog.java'
15--- src/pipe/gui/widgets/QueryDialog.java 2021-10-16 18:20:43 +0000
16+++ src/pipe/gui/widgets/QueryDialog.java 2021-11-05 06:35:26 +0000
17@@ -3764,7 +3764,7 @@
18
19 network.add(transformedModel.value1());
20
21- NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), new ArrayList<Constant>(0));
22+ NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), new ArrayList<Constant>(0), lens);
23
24 try {
25 ByteArrayOutputStream outputStream = tapnWriter.savePNML();

Subscribers

People subscribed via source and target branches