Merge lp:~tapaal-contributor/tapaal/export-import-PNML-1853823 into lp:tapaal

[Peter Haahr Taankvist]

Commented out some code which seemed to fix the problem. Also, made some better bughandling with the new way of loading nets (the worker handles exceptions instead of the functions run by the worker).

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/io/PNMLWriter.java'
--- src/dk/aau/cs/io/PNMLWriter.java	2018-10-16 19:49:39 +0000
+++ src/dk/aau/cs/io/PNMLWriter.java	2019-11-29 19:18:12 +0000
@@ -177,8 +177,9 @@
 		
 		Element initialMarking = document.createElement("initialMarking"); //Name
 		placeElement.appendChild(name);
-		Element initialMarkingGraphics = document.createElement("graphics");
-		initialMarking.appendChild(initialMarkingGraphics);
+		//Seems to break the PNML file
+		/*Element initialMarkingGraphics = document.createElement("graphics");
+		initialMarking.appendChild(initialMarkingGraphics);*/
 		Element initialMarkingText = document.createElement("text");
 		initialMarking.appendChild(initialMarkingText);
 		initialMarkingText.setTextContent(((Integer) inputPlace.getNumberOfTokens() != null ? String.valueOf((Integer) inputPlace.getNumberOfTokens()) : "0"));

=== modified file 'src/net/tapaal/TAPAAL.java'
--- src/net/tapaal/TAPAAL.java	2018-05-23 16:03:49 +0000
+++ src/net/tapaal/TAPAAL.java	2019-11-29 19:18:12 +0000
@@ -69,7 +69,12 @@
 
 			if (file.exists()) { // Open the file
 				if (file.canRead()) {
-					CreateGui.getAppGui().createNewTabFromFile(file);
+					try {
+						CreateGui.getAppGui().createNewTabFromFile(file);
+					} catch (Exception e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 				} else if (file.exists()) {
 					System.err.println("Can not read file " + file.toString());
 				}

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2019-11-23 11:48:43 +0000
+++ src/pipe/gui/GuiFrame.java	2019-11-29 19:18:12 +0000
@@ -12,12 +12,8 @@
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.*;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.List;
-import java.util.Timer;
-import java.util.concurrent.ExecutionException;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import javax.imageio.ImageIO;
@@ -1746,11 +1742,12 @@
 
 	/**
 	 * Creates a new tab with the selected file, or a new file if filename==null
+	 * @throws Exception 
 	 */
-	public TabContent createNewTabFromFile(InputStream file, String name) {
+	public TabContent createNewTabFromFile(InputStream file, String name) throws Exception {
 		int freeSpace = CreateGui.getFreeSpace(NetType.TAPN);
 		boolean showFileEndingChangedMessage = false;
-
+		String origName = name;
 
 		setObjects(freeSpace);
 		int currentlySelected = appTab.getSelectedIndex();
@@ -1790,11 +1787,12 @@
 			tab.setFile(null);
 		} catch (Exception e) {
 			undoAddTab(currentlySelected);
-			JOptionPane.showMessageDialog(GuiFrame.this,
-					"TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString(),
-					"Error loading file: " + name,
+			throw new Exception("TAPAAL encountered an error while loading the file: " + origName + "\n\nPossible explanations:\n  - " + e.toString());
+			/*JOptionPane.showMessageDialog(GuiFrame.this,
+					"TAPAAL encountered an error while loading the file: " + origName + "\n\nPossible explanations:\n  - " + e.toString(),
+					"Error loading file: " + origName,
 					JOptionPane.ERROR_MESSAGE);
-			return null;
+			return null;*/
 		}
 
 
@@ -1809,8 +1807,9 @@
 
 	/**
 	 * Creates a new tab with the selected file, or a new file if filename==null
+	 * @throws Exception 
 	 */
-	public void createNewTabFromPNMLFile(File file) {
+	public void createNewTabFromPNMLFile(File file) throws Exception {
 		int freeSpace = CreateGui.getFreeSpace(NetType.TAPN);
 		String name;
 
@@ -1850,11 +1849,13 @@
 
 			} catch (Exception e) {
 				undoAddTab(currentlySelected);
-				JOptionPane.showMessageDialog(GuiFrame.this,
-						"TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString(),
-						"Error loading file: " + name,
+				throw new Exception("TAPAAL encountered an error while loading the file: " + file.getName() + "\n\nPossible explanations:\n  - " + e.toString());
+				//e.printStackTrace();
+				/*JOptionPane.showMessageDialog(GuiFrame.this,
+						"TAPAAL encountered an error while loading the file: " + file.getName() + "\n\nPossible explanations:\n  - " + e.toString(),
+						"Error loading file: " + file.getName(),
 						JOptionPane.ERROR_MESSAGE);
-				return;
+				return;*/
 			}
 		}
 
@@ -1868,17 +1869,19 @@
 
 	/**
 	 * Creates a new tab with the selected file, or a new file if filename==null
+	 * @throws FileNotFoundException 
 	 */
-	public void createNewTabFromFile(File file) {
+	public void createNewTabFromFile(File file) throws Exception {
 		try {
 			InputStream stream = new FileInputStream(file);
 			TabContent tab = createNewTabFromFile(stream, file.getName());
 			if (tab != null) tab.setFile(file);
 		}catch (FileNotFoundException e) {
-			JOptionPane.showMessageDialog(GuiFrame.this,
+			throw new FileNotFoundException("TAPAAL encountered an error while loading the file: " + file.getName() + "\n\nFile not found:\n  - " + e.toString());
+			/*JOptionPane.showMessageDialog(GuiFrame.this,
 					"TAPAAL encountered an error while loading the file: " + file.getName() + "\n\nFile not found:\n  - " + e.toString(),
 					"Error loading file: " + file.getName(),
-					JOptionPane.ERROR_MESSAGE);
+					JOptionPane.ERROR_MESSAGE);*/
 		}
 	}
 
@@ -2480,7 +2483,7 @@
 				//Do loading
 			    SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 			        @Override
-			        protected Void doInBackground() throws InterruptedException {
+			        protected Void doInBackground() throws InterruptedException, Exception, FileNotFoundException {
 			        	for(File f : files){
 							if(f.exists() && f.isFile() && f.canRead()){
 								FileBrowser.userPath = f.getParent();
@@ -2491,7 +2494,16 @@
 			        }
 			        @Override
 			        protected void done() {
-					    CreateGui.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+					    try {
+			        		CreateGui.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+			        		get();
+						} catch (Exception e) {
+					    	JOptionPane.showMessageDialog(GuiFrame.this,
+									e.getMessage(),
+									"Error loading file",
+									JOptionPane.ERROR_MESSAGE);
+							return;
+						}
 			        }
 			    };
 			    worker.execute();
@@ -2554,7 +2566,7 @@
 				//Do loading of net
 			    SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 			        @Override
-			        protected Void doInBackground() throws InterruptedException {
+			        protected Void doInBackground() throws InterruptedException, Exception {
 			        	for(File f : files){
 							if(f.exists() && f.isFile() && f.canRead()){
 								FileBrowser.userPath = f.getParent();
@@ -2565,7 +2577,16 @@
 			        }
 			        @Override
 			        protected void done() {
-					    CreateGui.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+			        	try {
+					    	CreateGui.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+					    	get();
+			        	} catch (Exception e) {
+			        		JOptionPane.showMessageDialog(GuiFrame.this,
+									e.getMessage(),
+									"Error loading file",
+									JOptionPane.ERROR_MESSAGE);
+							return;
+						}
 			        }
 			    };
 			    worker.execute();
@@ -2704,7 +2725,12 @@
 					GuiAction tmp = new GuiAction(netname, "Open example file \"" + netname + "\"") {
 						public void actionPerformed(ActionEvent arg0) {
 							InputStream file = Thread.currentThread().getContextClassLoader().getResourceAsStream("resources/Example nets/" + filenameFinal);
-							createNewTabFromFile(file, netname);
+							try {
+								createNewTabFromFile(file, netname);
+							} catch (Exception e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							}
 						}
 					};
 					tmp.putValue(Action.SMALL_ICON, new ImageIcon(Thread.currentThread()