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

[Lena Ernstsen]

Fixed wrong use of lens with merge net components

[Jiri Srba (srba)]

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

[Jiri Srba (srba)]

Tested and fixes the problem.

review: Approve

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2021-11-03 11:55:06 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2021-11-05 06:35:54 +0000
@@ -1978,7 +1978,7 @@
 
         network.add(transformedModel.value1());
 
-        NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), network.constants());
+        NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), network.constants(), lens);
 
         try {
             ByteArrayOutputStream outputStream = tapnWriter.savePNML();

=== modified file 'src/pipe/gui/widgets/QueryDialog.java'
--- src/pipe/gui/widgets/QueryDialog.java	2021-10-16 18:20:43 +0000
+++ src/pipe/gui/widgets/QueryDialog.java	2021-11-05 06:35:54 +0000
@@ -3764,7 +3764,7 @@
 
 					network.add(transformedModel.value1());
 
-					NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), new ArrayList<Constant>(0));
+					NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(network, templates, new ArrayList<pipe.dataLayer.TAPNQuery>(0), new ArrayList<Constant>(0), lens);
 
 					try {
 						ByteArrayOutputStream outputStream = tapnWriter.savePNML();