Merge lp:~tapaal-contributor/tapaal/query-export-bug-1767615 into lp:tapaal

[Jiri Srba]

Fixes problem with export of XML queries.

[Mads Johannsen (mjohan12)]

Works. Tested on the attached bug report net, some handmade nets, and some of the example nets.

review: Approve

=== modified file 'src/pipe/gui/Export.java'
--- src/pipe/gui/Export.java	2018-04-11 18:05:12 +0000
+++ src/pipe/gui/Export.java	2018-05-10 09:14:51 +0000
@@ -6,6 +6,9 @@
  */
 package pipe.gui;
 
+import dk.aau.cs.TCTL.CTLParsing.TAPAALCTLQueryParser;
+import dk.aau.cs.TCTL.TCTLAbstractProperty;
+import dk.aau.cs.TCTL.TCTLPathPlaceHolder;
 import java.awt.image.BufferedImage;
 import java.awt.print.PageFormat;
 import java.awt.print.PrinterException;
@@ -96,9 +99,17 @@
                         
                         while(queryIterator.hasNext()){
                             TAPNQuery clonedQuery = queryIterator.next().copy();
-                            clonedQuery.getProperty().accept(new RenameAllPlacesVisitor(mapping), null);
-                            clonedQuery.getProperty().accept(new RenameAllTransitionsVisitor(mapping), null);
-                            XMLVisitor.buildXMLQuery(clonedQuery.getProperty(), clonedQuery.getName());
+
+                            // Attempt to parse and possibly transform the string query using the manual edit parser
+                            TCTLAbstractProperty newProperty;
+                            try {
+                                newProperty = TAPAALCTLQueryParser.parse(clonedQuery.getProperty().toString());
+                            } catch (Throwable ex) {
+                                newProperty = clonedQuery == null ? new TCTLPathPlaceHolder() : clonedQuery.getProperty();
+                            }
+                            newProperty.accept(new RenameAllPlacesVisitor(mapping), null);
+                            newProperty.accept(new RenameAllTransitionsVisitor(mapping), null);
+                            XMLVisitor.buildXMLQuery(newProperty, clonedQuery.getName());
                         }
                         queryStream.print(XMLVisitor.getFormatted());