Merge lp:~tapaal-contributor/tapaal/open-incorrectly-formatted-file into lp:tapaal

[Lena Ernstsen]

Incorrectly formatted file will throw an exception when opened

[Jiri Srba (srba)]

It shows the message now but still throws the expection and does not display where ithe problem

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/open-incorrectly-formatted-file]

1141. By Lena Ernstsen on 2021-09-30

Removed print to terminal when exception occurs

[Jiri Srba (srba)]

Tested and works.

review: Approve

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2021-08-08 17:15:45 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2021-09-30 14:12:43 +0000
@@ -14,6 +14,7 @@
 import javax.swing.border.BevelBorder;
 
 import dk.aau.cs.TCTL.*;
+import dk.aau.cs.TCTL.Parsing.ParseException;
 import dk.aau.cs.debug.Logger;
 import dk.aau.cs.gui.components.BugHandledJXMultisplitPane;
 import dk.aau.cs.gui.components.NameVisibilityPanel;
@@ -589,6 +590,10 @@
 			ModelLoader loader = new ModelLoader();
 			LoadedModel loadedModel = loader.load(file);
 
+			if (loadedModel == null) {
+                throw new Exception("Could not open the selected file, as it does not have the correct format.");
+			}
+
 			if (loadedModel.getMessages().size() != 0) {
                 new Thread(new Runnable() {
                     @Override
@@ -615,8 +620,9 @@
 			tab.setFile(null);
 
             return tab;
-		} catch (Exception e) {
-			//throw new Exception("TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString());
+		} catch (ParseException e) {
+            throw new ParseException("TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.getMessage());
+        } catch (Exception e) {
             throw e;
 		}
 

=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
--- src/dk/aau/cs/io/TapnXmlLoader.java	2020-10-09 07:59:49 +0000
+++ src/dk/aau/cs/io/TapnXmlLoader.java	2021-09-30 14:12:43 +0000
@@ -78,20 +78,32 @@
 
 	}
 
-	public LoadedModel load(InputStream file) throws FormatException {
+	public LoadedModel load(InputStream file) throws Exception {
 		Require.that(file != null, "file must be non-null and exist");
 
 		Document doc = loadDocument(file);
 		if(doc == null) return null;
-		return parse(doc);
+		try {
+            return parse(doc);
+        } catch (FormatException | NullPointerException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new Exception("One or more necessary attributes were not found\n  - One or more attribute values have an incorrect type");
+        }
 	}
 	
-	public LoadedModel load(File file) throws FormatException {
+	public LoadedModel load(File file) throws Exception {
 		Require.that(file != null && file.exists(), "file must be non-null and exist");
 
 		Document doc = loadDocument(file);
 		if(doc == null) return null;
-		return parse(doc);
+        try {
+            return parse(doc);
+        } catch (FormatException | NullPointerException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new Exception("One or more necessary attributes were not found\n  - One or more attribute values have an incorrect type");
+        }
 	}
 	
 	
@@ -427,7 +439,7 @@
 		int initialMarkingInput = Integer.parseInt(place.getAttribute("initialMarking"));
 		String invariant = place.getAttribute("invariant");
 		boolean displayName = place.getAttribute("displayName").equals("false") ? false : true;
-		
+
 
 		if (idInput.length() == 0 && nameInput.length() > 0) {
 			idInput = nameInput;
@@ -436,7 +448,7 @@
 		if (nameInput.length() == 0 && idInput.length() > 0) {
 			nameInput = idInput;
 		}
-		
+
 		if(nameInput.toLowerCase().equals("true") || nameInput.toLowerCase().equals("false")) {
 			nameInput = "_" + nameInput;
 			if(firstPlaceRenameWarning) {
@@ -444,7 +456,7 @@
 				firstPlaceRenameWarning = false;
 			}
 		}
-		
+
 		idResolver.add(tapn.name(), idInput, nameInput);
 
 		TimedPlace p;
@@ -461,7 +473,7 @@
 		nameGenerator.updateIndicesForAllModels(nameInput);
 		TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput, lens);
 		placeComponent.setUnderlyingPlace(p);
-		
+
 		if (!displayName){
 			placeComponent.setAttributesVisible(false);
 		}
@@ -500,7 +512,7 @@
 
 		int _endx = targetIn.getX() + targetIn.centreOffsetLeft();
 		int _endy = targetIn.getY() + targetIn.centreOffsetTop();
-		
+
 		//Get weight if any
 		Weight weight = new IntWeight(1);
 		if(arc.hasAttribute("weight")){

=== modified file 'src/pipe/dataLayer/DataLayer.java'
--- src/pipe/dataLayer/DataLayer.java	2020-06-19 11:34:53 +0000
+++ src/pipe/dataLayer/DataLayer.java	2021-09-30 14:12:43 +0000
@@ -792,8 +792,8 @@
 			}
 		}
 
-		return null;
-	}
+		throw new NullPointerException("One or more arcs are connected to a place/transition, which can not be found in the net");
+    }
 
     public void redrawVisibleTokenLists() {
 		for (Place place : placesArray) {

=== modified file 'src/pipe/gui/GuiFrameController.java'
--- src/pipe/gui/GuiFrameController.java	2021-07-23 21:16:09 +0000
+++ src/pipe/gui/GuiFrameController.java	2021-09-30 14:12:43 +0000
@@ -305,11 +305,15 @@
                     List<TabContent> tabs = get();
                     openTab(tabs);
                 } catch (Exception e) {
+                    String message = e.getMessage();
+
+                    if (message.contains("Exception:")) {
+                        message = message.split(":", 2)[1];
+                    }
                     JOptionPane.showMessageDialog(CreateGui.getApp(),
-                            e.getMessage(),
+                            message,
                             "Error loading file",
                             JOptionPane.ERROR_MESSAGE);
-                    e.printStackTrace();
                     return;
                 }finally {
                     CreateGui.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));