Merge lp:~yrke/tapaal/tapaal-fixes-1 into lp:tapaal

[Kenneth Yrke Jørgensen]

Code cleanup

Removed unused element type,
GuiFrame and Drawingsurface no longer implements observer,
code formatting
depricated usage of ShowFileBrowserDialog

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/DrawingSurfaceImpl.java'
--- src/pipe/gui/DrawingSurfaceImpl.java	2018-06-24 14:44:34 +0000
+++ src/pipe/gui/DrawingSurfaceImpl.java	2018-08-03 18:03:55 +0000
@@ -39,8 +39,7 @@
 /**
  * The petrinet is drawn onto this frame.
  */
-public class DrawingSurfaceImpl extends JLayeredPane implements Observer,
-Printable {
+public class DrawingSurfaceImpl extends JLayeredPane implements Printable {
 	private static final long serialVersionUID = 4434596266503933386L;
 	private boolean netChanged = false;
 	private boolean animationmode = false;
@@ -222,16 +221,6 @@
 		repaint();
 	}
 
-	public void update(Observable o, Object diffObj) {
-		if ((diffObj instanceof PetriNetObject) && (diffObj != null)) {
-			if (CreateGui.getAppGui().getMode() == ElementType.CREATING) {
-
-				addNewPetriNetObject((PetriNetObject) diffObj);
-			}
-			repaint();
-		}
-	}
-
 	public int print(Graphics g, PageFormat pageFormat, int pageIndex)
 			throws PrinterException {
 		if (pageIndex > 0) {
 
=== modified file 'src/pipe/gui/FileFinder.java'
--- src/pipe/gui/FileFinder.java	2018-05-02 06:58:39 +0000
+++ src/pipe/gui/FileFinder.java	2018-08-03 18:03:55 +0000
@@ -4,11 +4,17 @@
 
 import java.io.File;
 
-
+/**
+ * @deprecated use FileBrowser.constructor instead
+ */
+@Deprecated
 public class FileFinder {
 
 	public File ShowFileBrowserDialog(String description, String extension, String path) {
-		if (path==null || path=="") { path= System.getProperty("user.home"); }
+		if (path==null || path=="") {
+			path= System.getProperty("user.home");
+		}
+
 		FileBrowser fileBrowser = FileBrowser.constructor(description, extension, path);
 		return fileBrowser.openFile();
 	}
 
=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2018-07-08 17:36:25 +0000
+++ src/pipe/gui/GuiFrame.java	2018-08-03 18:03:55 +0000
@@ -72,7 +72,7 @@
 import dk.aau.cs.verification.VerifyTAPN.VerifyTAPNDiscreteVerification;
 
 
-public class GuiFrame extends JFrame implements Observer {
+public class GuiFrame extends JFrame  {
 
 	private static final long serialVersionUID = 7509589834941127217L;
 	// for zoom combobox and dropdown
@@ -1494,12 +1494,7 @@
 	}
 
 
-	// HAK Method called by netModel object when it changes
-	public void update(Observable o, Object obj) {
-		if ((mode != ElementType.CREATING) && (!appView.isInAnimationMode())) {
-			appView.setNetChanged(true);
-		}
-	}
+
 
 	private void showQueries(boolean enable){
 		showQueries = enable;
@@ -1716,10 +1711,6 @@
 
 
 		try {
-			if (CreateGui.getApp() != null) {
-				// Notifies used to indicate new instances.
-				CreateGui.getApp().setMode(ElementType.CREATING);
-			}
 
 			ModelLoader loader = new ModelLoader(tab.drawingSurface());
 			LoadedModel loadedModel = loader.load(file);
@@ -1777,10 +1768,6 @@
 
 		if (file != null) {
 			try {
-				if (CreateGui.getApp() != null) {
-					// Notifies used to indicate new instances.
-					CreateGui.getApp().setMode(ElementType.CREATING);
-				}
 
 				LoadedModel loadedModel;
 
 
=== modified file 'src/pipe/gui/Pipe.java'
--- src/pipe/gui/Pipe.java	2018-07-06 10:33:18 +0000
+++ src/pipe/gui/Pipe.java	2018-08-03 18:03:55 +0000
@@ -10,7 +10,7 @@
 		//TAPN Elements
 		TAPNPLACE, TAPNTRANS, TAPNARC, TRANSPORTARC, TAPNINHIBITOR_ARC,
 		//Others (might refactore)
-		ADDTOKEN, DELTOKEN, SELECT, DRAW, DRAG, CREATING,
+		ADDTOKEN, DELTOKEN, SELECT, DRAW, DRAG,
 		//Fast modes
 		FAST_TRANSITION, FAST_PLACE
 	}
 
=== modified file 'src/pipe/gui/VersionChecker.java'
--- src/pipe/gui/VersionChecker.java	2012-03-31 20:29:51 +0000
+++ src/pipe/gui/VersionChecker.java	2018-08-03 18:03:55 +0000
@@ -47,8 +47,8 @@
 					}
 					return result;
 				}
-				else if (forcecheck)
-				{JOptionPane.showMessageDialog(null, "It is impossible to establish a connection to the server. Try again later.", "No Update for " + TAPAAL.getProgramName(),
+				else if (forcecheck){
+					JOptionPane.showMessageDialog(null, "It is impossible to establish a connection to the server. Try again later.", "No Update for " + TAPAAL.getProgramName(),
 							JOptionPane.INFORMATION_MESSAGE, ResourceManager.appIcon());	
 				}
 			}