From 13ab1900d233c1a8c6ee105068b994c1bdb998f9 Mon Sep 17 00:00:00 2001
From: Remco <remcosannen@gmail.com>
Date: Wed, 8 Apr 2015 15:57:55 +0200
Subject: [PATCH] Added Cancel button

---
 Applicatie/PathPopup.java     |  2 +-
 Applicatie/WaypointPopup.java | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Applicatie/PathPopup.java b/Applicatie/PathPopup.java
index b7af1b3..1bfd702 100644
--- a/Applicatie/PathPopup.java
+++ b/Applicatie/PathPopup.java
@@ -51,7 +51,7 @@ public class PathPopup extends JFrame
 			}
 		});
 		
-		JButton cancel = new JButton("Done");
+		JButton cancel = new JButton("Cancel");
 		cancel.addActionListener(new ActionListener()
 		{
 			@Override
diff --git a/Applicatie/WaypointPopup.java b/Applicatie/WaypointPopup.java
index dee0671..566cef8 100644
--- a/Applicatie/WaypointPopup.java
+++ b/Applicatie/WaypointPopup.java
@@ -3,6 +3,7 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -97,6 +98,7 @@ public class WaypointPopup extends JFrame {
 				for(int i = 0; i < options.length; i++)
 				{
 					ioptions[i] = Integer.valueOf(options[i]);
+					System.out.println(ioptions[i]);
 				}
 				wp.setOptions(ioptions);
 				
@@ -104,6 +106,17 @@ public class WaypointPopup extends JFrame {
 		});
 		south.add(edit);
 		
+		JButton cancel = new JButton("Cancel");
+		cancel.addActionListener(new ActionListener()
+		{
+			@Override
+			public void actionPerformed(ActionEvent e)
+			{
+				dispose();
+			}
+		});
+		south.add(cancel);
+		
 		setContentPane(content);
 		setVisible(true);
 		setSize(300,250);