final commit

Remove selection from save.

Agenda/Agenda.java

@@ -51,7 +51,20 @@ public class Agenda implements Serializable {
 	{
 		return stages;
 	}
+	public ArrayList<Event> eventsForStage(AgendaStage st)
+	{
+		ArrayList<Event> stageEvents = new ArrayList<Event>();
+		for(Event e: events)
+		{
+			if(e.getStage() == st)
+			{
+				stageEvents.add(e);
+			}
+		}
+		return stageEvents;
+	}
 	
+	/*
 	public void saveAgenda()
 	{
 		JFileChooser fileChooser = new JFileChooser();
@@ -179,7 +192,7 @@ public class Agenda implements Serializable {
 		{
 			boolean exists = false;
 			String name = e.getStage().getName();
-			for (AgendaStage s : stages)
+			for (Stage s : stages)
 			{
 				if ( s.getName().equals(name) ) {
 					exists = true;
@@ -202,7 +215,8 @@ public class Agenda implements Serializable {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-	}		
+	}	
+	*/	
 	
 	public void clearAgenda()
 	{
@@ -211,10 +225,12 @@ public class Agenda implements Serializable {
 		artists.clear();
 	}	
 	
+	/*
 	public void fillAllLists()
 	{
 		loadAgenda();
 		fillStages();
 		fillArtists();
 	}
-}
+	*/
+}

Agenda/EditArtistPanel.java

@@ -19,7 +19,7 @@ public class EditArtistPanel extends JFrame {
 
 	public EditArtistPanel(Agenda agenda, Artist art, TabbedPane tab)
 	{
-		super("Artist editscreen!");
+		super("Artist editscreen");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
 		JPanel content = new JPanel(new BorderLayout());
 		JPanel south = new JPanel(new FlowLayout());

Agenda/EditEventPanel.java

@@ -24,7 +24,7 @@ public class EditEventPanel extends JFrame{
 
 	public EditEventPanel(Agenda agenda, Event e, TabbedPane tab)
 	{
-		super("Event editscreen!");
+		super("Event editscreen");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
 		JPanel content = new JPanel(new BorderLayout());
 		JPanel south = new JPanel(new FlowLayout());

Agenda/EditStagePanel.java

@@ -20,7 +20,7 @@ public class EditStagePanel extends JFrame{
 
 	public EditStagePanel(Agenda agenda, AgendaStage sta)
 	{
-		super("Stage editscreen!");
+		super("Stage editscreen");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
 		JPanel content = new JPanel(new BorderLayout());
 		JPanel south = new JPanel(new FlowLayout());

Agenda/Event.java

@@ -55,11 +55,11 @@ public class Event implements Serializable {
 	}
 	
 	public int getStart(){
-		return (startHour * 100) + startMinute;
+		return (startHour * 60) + startMinute;
 	}
 	
 	public int getStop(){
-		return (stopHour * 100) + stopMinute;
+		return (stopHour * 60) + stopMinute;
 	}
 	
 	public int getStopHour(){

Agenda/MenuBar.java

@@ -63,7 +63,8 @@ public class MenuBar extends JMenuBar {
 		open.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK));
 		open.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				w.getAgenda().loadAgenda();
+				Applicatie.SaveLoad.load(w.getPanel());
+				w.setAgenda(w.getPanel().getAgenda());
 				Window.updatePanel();
 			}
 		});
@@ -72,7 +73,7 @@ public class MenuBar extends JMenuBar {
 		save.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK));
 		save.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				w.getAgenda().saveAgenda();
+				Applicatie.SaveLoad.save(w.getPanel());
 				Window.updatePanel();
 			}
 		});
@@ -133,4 +134,4 @@ public class MenuBar extends JMenuBar {
 		view.add(art_sta);
 		add(view);
 	}
-}
+}

Agenda/Window.java

@@ -1,6 +1,5 @@
 package Agenda;
 
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -36,14 +35,16 @@ public class Window extends JFrame {
 	private static GregorianCalendar date;
 	private static Agenda agenda;
 	private static String currentPanel = "table";
+	private Applicatie.Panel ap;
 	
-	public Window()
+	public Window(Applicatie.Panel ap)
 	{
 		/*
 		 * Initialize window
 		 */
 		super("Agenda");
-		agenda = new Agenda();
+		this.ap = ap;
+		agenda = ap.getAgenda();
 		
 		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
@@ -181,7 +182,7 @@ public class Window extends JFrame {
             }
 		});
 	}
-	
+
 	public static void changePanel(String panel)
 	{
 		currentPanel = panel;
@@ -231,7 +232,13 @@ public class Window extends JFrame {
 	public void setAgenda(Agenda a)
 	{
 		agenda = a; 
+		ap.setAgenda(a);
+	}
+	
+	public Applicatie.Panel getPanel()
+	{
+		return ap;
 	}
 	
 	
-}
+}

Applicatie/Action.java

@@ -46,9 +46,8 @@ public class Action
 	{
 		return duration;
 	}
-	
+
 	public Waypoint getWaypoint(){
 		return waypoint;
 	}
-	
 }

Applicatie/AddPeoplePanel.java

@@ -0,0 +1,100 @@
+package Applicatie;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+public class AddPeoplePanel extends JFrame {
+
+	public AddPeoplePanel(Panel topPanel) {
+		super("Adding people");
+		setDefaultCloseOperation(HIDE_ON_CLOSE);
+		setResizable(false);
+		
+		JPanel mainPanel = new JPanel(new BorderLayout());
+		JLabel label;
+		JButton button;
+		
+		//Top:
+		JPanel panel = new JPanel();
+		label = new JLabel("Enter the amount of people you want to add: ");
+		panel.add(label);
+		mainPanel.add(panel,BorderLayout.NORTH);
+		//Center:
+		panel = new JPanel();
+		JTextField amountOfPeopleField = new JTextField("0");
+		amountOfPeopleField.setPreferredSize(new Dimension(100,20));
+		amountOfPeopleField.addKeyListener(new KeyListener() {
+			
+			@Override
+			public void keyTyped(KeyEvent e) {
+			}
+			
+			@Override
+			public void keyReleased(KeyEvent e) {
+				try {
+					amountOfPeopleField.setBackground(Color.WHITE);
+					int amountOfPeople = Integer.parseInt(amountOfPeopleField.getText());
+					amountOfPeopleField.setText(amountOfPeople + "");
+				}
+				catch(NumberFormatException nf) {
+					amountOfPeopleField.setBackground(Color.RED);
+				}
+			}
+			
+			@Override
+			public void keyPressed(KeyEvent e) {
+			}
+		});
+		
+		label = new JLabel("people ");
+		panel.add(amountOfPeopleField);
+		panel.add(label);
+		mainPanel.add(panel,BorderLayout.CENTER);
+		//Bottom:
+		panel = new JPanel();
+		button = new JButton("Cancel");
+		button.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				AddPeoplePanel.this.dispose();
+			}
+		});
+		panel.add(button);
+		button = new JButton("Apply");
+		button.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if(amountOfPeopleField.getBackground() != Color.RED) {
+					topPanel.addVisitors(Integer.parseInt(amountOfPeopleField.getText()));
+					AddPeoplePanel.this.dispose();
+				}
+				else 
+					JOptionPane.showMessageDialog(topPanel, "Only numbers are accepted");
+			}
+		});
+		panel.add(button);
+		mainPanel.add(panel,BorderLayout.SOUTH);
+		
+		add(mainPanel);
+		
+		//Finishing off
+		pack();
+		setSize(290,150);
+		setLocationRelativeTo(null);
+		setVisible(true);
+	}
+}

Applicatie/ControlPanel.java

@@ -19,13 +19,17 @@ public class ControlPanel extends JPanel
 	private static final long serialVersionUID = 6805244250902524351L;
 
 	private Panel p;
+	private int people;
 	JLabel timeLabel;
+	JLabel peopleLabel;
+	JLabel runningLabel;
 	
 	public ControlPanel()
 	{
 		super();
 		BoxLayout box = new BoxLayout(this, BoxLayout.X_AXIS);
 		setLayout(box);
+		people = 0;
 		
 		setPreferredSize(new Dimension(0,50));
 		setBorder(BorderFactory.createLineBorder(new Color(180, 180, 180)));
@@ -33,8 +37,8 @@ public class ControlPanel extends JPanel
 		setFocusable(false);
 		
 		JPanel simulatorPanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
-		simulatorPanel.setPreferredSize(new Dimension(350,50));
-		simulatorPanel.setMaximumSize(new Dimension(350,50));
+		simulatorPanel.setPreferredSize(new Dimension(290,50));
+		simulatorPanel.setMaximumSize(new Dimension(290,50));
 		add(simulatorPanel);
 		{
 			JLabel simulatorLabel = new JLabel("Simulator: ");
@@ -48,21 +52,12 @@ public class ControlPanel extends JPanel
 				public void actionPerformed(ActionEvent e)
 				{
 					p.getT().start();
+					p.setPlay(true);
+					runningLabel.setText("Simulation Started");
 				}
 			});
 			simulatorPanel.add(playButton);
 			
-			JButton pauseButton = new JButton("Pause");
-			pauseButton.setFocusable(false);
-			pauseButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
-			pauseButton.addActionListener(new ActionListener(){
-				public void actionPerformed(ActionEvent e)
-				{
-					p.getT().stop();
-				}
-			});
-			simulatorPanel.add(pauseButton);
-			
 			JButton stopButton = new JButton("Stop");
 			stopButton.setFocusable(false);
 			stopButton.setFont(new Font("Segoe UI", Font.PLAIN, 20));
@@ -70,6 +65,8 @@ public class ControlPanel extends JPanel
 				public void actionPerformed(ActionEvent e)
 				{
 					p.getT().stop();
+					p.setPlay(false);
+					runningLabel.setText("Simulation Stopped");
 				}
 			});
 			simulatorPanel.add(stopButton);
@@ -105,7 +102,7 @@ public class ControlPanel extends JPanel
 		peoplePanel.setMaximumSize(new Dimension(285,50));
 		add(peoplePanel);
 		{
-			JLabel peopleLabel = new JLabel("0/0 People");
+			peopleLabel = new JLabel(people + " People");
 			peopleLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
 			peoplePanel.add(peopleLabel);
 			
@@ -115,7 +112,7 @@ public class ControlPanel extends JPanel
 			peopleButton.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e)
 				{
-					p.addVisitors();
+					new AddPeoplePanel(p);
 				}
 			});
 			peoplePanel.add(peopleButton);
@@ -128,7 +125,7 @@ public class ControlPanel extends JPanel
 		runningPanel.setMaximumSize(new Dimension(195,50));
 		add(runningPanel);
 		{
-			JLabel runningLabel = new JLabel("Simulation stopped");
+			runningLabel = new JLabel("Simulation stopped");
 			runningLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
 			runningPanel.add(runningLabel);
 		}
@@ -147,6 +144,7 @@ public class ControlPanel extends JPanel
 	
 	public void setPeople(int people)
 	{
-		
+		this.people = people;
+		peopleLabel.setText(people + " People");
 	}
 }

Applicatie/Main.java

@@ -2,7 +2,6 @@ package Applicatie;
 
 public class Main
 {
-
 	public static void main(String[] args)
 	{
 		new Window();

Applicatie/MenuBar.java

@@ -33,11 +33,13 @@ public class MenuBar extends JMenuBar
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				new Agenda.Window();
+				new Agenda.Window(w.getPanel());
 			}
 		});
 		file.add(agenda);
 		
+		file.addSeparator();
+		
 		item = new JMenuItem("Open");
 		item.addActionListener(new ActionListener() {
 			
@@ -60,22 +62,12 @@ public class MenuBar extends JMenuBar
 		
 		file.addSeparator();
 		
-		item = new JMenuItem("Load agenda");
-		item.addActionListener(new ActionListener() {
-			
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				w.getPanel().agenda.loadAgenda();
-			}
-		});
-		file.add(item);
-		
 		item = new JMenuItem("Agenda");
 		item.addActionListener(new ActionListener()
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				new Agenda.Window();
+				new Agenda.Window(w.getPanel());
 			}
 		});
 		file.add(item);
@@ -87,8 +79,7 @@ public class MenuBar extends JMenuBar
 		{
 			public void actionPerformed(ActionEvent e)
 			{
-				w.setVisible(false);
-				w.dispose();
+				System.exit(0);
 			}
 		});
 

Applicatie/Panel.java

@@ -63,6 +63,7 @@ public class Panel extends JPanel implements ActionListener
 	private Path currentPath;
 	private static int width = 1920;
 	private static int height = 1080;
+	private boolean play = false;
 
 	Point2D cameraPoint = new Point2D.Double(getWidth() / 2, getHeight() / 2);
 	float cameraScale = 1;
@@ -148,7 +149,7 @@ public class Panel extends JPanel implements ActionListener
 		addMouseWheelListener(new MouseWheel(this));
 
 		addFocusListener(new WindowFocusListener(this));
-		t = new Timer(1000 / 10, this);
+		t = new Timer(1000/60, this);
 	}
 
 	public int getPanelInfoLength()
@@ -229,7 +230,16 @@ public class Panel extends JPanel implements ActionListener
 		return waypoints;
 	}
 
-	public void addVisitors()
+	public void addVisitors(ArrayList<DrawObject> entrances)
+	{
+		
+			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
+			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
+			visitors.add(new Visitor("visitor",point, agenda, objects, waypoints, date));
+		
+	}
+
+	public void addVisitors(int count)
 	{
 		ArrayList<DrawObject> entrances = new ArrayList<>();
 		for(DrawObject object : objects) {
@@ -238,21 +248,14 @@ public class Panel extends JPanel implements ActionListener
 			}
 		}
 		if(!entrances.isEmpty()) {
-			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
-			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
-			visitors.add(new Visitor("visitor",point, agenda, objects, waypoints, date));
+			for (int i = 0; i < count; i++)
+			{
+				addVisitors(entrances);
+			}
 		}
-		else {
+		else 
 			JOptionPane.showMessageDialog(this, "You don't have an entrance");
-		}
-	}
-
-	public void addVisitors(int count)
-	{
-		for (int i = 0; i < count; i++)
-		{
-			addVisitors();
-		}
+		cp.setPeople(visitors.size());
 	}
 
 	public void paintComponent(Graphics g)
@@ -387,6 +390,9 @@ public class Panel extends JPanel implements ActionListener
 	public void clearObjects()
 	{
 		objects.clear();
+		visitors.clear();
+		waypoints.clear();
+		paths.clear();
 	}
 
 	public Point getLastMousePosition()
@@ -637,7 +643,6 @@ public class Panel extends JPanel implements ActionListener
 			currentTime++;
 			date.setTimeInMillis(date.getTimeInMillis() + 1000);
 			cp.setTime(formatter.format(date.getTime()));
-			System.out.println(currentTime);
 		}
 
 		for (Visitor v : visitors)
@@ -662,6 +667,16 @@ public class Panel extends JPanel implements ActionListener
 	{
 		this.t = t;
 	}
+	
+	public void setPlay(boolean play)
+	{
+		this.play = play;
+	}
+
+	public boolean getPlay()
+	{
+		return play;
+	}
 
 	public void newWorld(int width, int height, int terrainIndex)
 	{
@@ -669,6 +684,7 @@ public class Panel extends JPanel implements ActionListener
 		this.height = height;
 		paths.clear();
 		objects.clear();
+		visitors.clear();
 		cameraScale = 1;
 		switch (terrainIndex)
 		{

Applicatie/PathPopup.java

@@ -1,11 +1,11 @@
 package Applicatie;
 
-import java.awt.BorderLayout;
 import java.awt.FlowLayout;
-import java.awt.GridLayout;
+import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -21,20 +21,21 @@ public class PathPopup extends JFrame
 
 	public PathPopup(Path p, Panel panel)
 	{
-		super("Artist editscreen!");
+		super("");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
-		JPanel content = new JPanel(new BorderLayout());
+		JPanel content = new JPanel();
+		content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS));
 		JPanel south = new JPanel(new FlowLayout());
-		JPanel center = new JPanel(new GridLayout(5, 2));
-		content.add(south, BorderLayout.SOUTH);
-		content.add(center, BorderLayout.CENTER);
-
+		JPanel center = new JPanel();
 		JPanel panel1 = new JPanel();
-		JLabel name = new JLabel("Path");
+		JLabel name = new JLabel("Add WayPoint");
+		name.setFont(new Font("Dialog", Font.BOLD, 20));
 		panel1.add(name);
-		center.add(panel1);
+		content.add(panel1);
+		content.add(center);
+		content.add(south);
 
-		JTextField tf = new JTextField(5);
+		JTextField tf = new JTextField(10);
 		center.add(tf);
 
 		JButton edit = new JButton("Done");
@@ -47,11 +48,22 @@ public class PathPopup extends JFrame
 				dispose();
 			}
 		});
+		
+		JButton cancel = new JButton("Cancel");
+		cancel.addActionListener(new ActionListener()
+		{
+			@Override
+			public void actionPerformed(ActionEvent e)
+			{
+				dispose();
+			}
+		});
 		south.add(edit);
-
+		south.add(cancel);
+		
 		setContentPane(content);
 		setVisible(true);
-		setSize(500, 320);
+		setSize(200, 150);
 	}
 
 }

Applicatie/PropertiesPanel.java

@@ -11,6 +11,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -20,8 +22,11 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import Agenda.AgendaStage;
+import Agenda.Event;
 import Objects.DrawObject;
 import Objects.Path;
+import Objects.Stage;
 
 @SuppressWarnings("serial")
 public class PropertiesPanel extends JPanel
@@ -36,6 +41,7 @@ public class PropertiesPanel extends JPanel
 
 	JLabel nameLabel;
 	JPanel areaPanel;
+	JPanel agendaPanel;
 	Component rigidArea;
 
 	JTextField locationXField;
@@ -500,12 +506,9 @@ public class PropertiesPanel extends JPanel
 		add(Box.createRigidArea(spacerDimension));
 
 		// AGENDA
-		JPanel agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-		JLabel agendaLabel = new JLabel("Agenda");
-		agendaLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
-		agendaPanel.setPreferredSize(new Dimension(200, 100));
-		agendaPanel.setMaximumSize(new Dimension(200, 100));
-		agendaPanel.add(agendaLabel);
+		agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		agendaPanel.setVisible(false);
+	
 		add(agendaPanel);
 
 		enableComponents(this, false);
@@ -566,12 +569,19 @@ public class PropertiesPanel extends JPanel
 		nameLabel.setText("No Selection");
 		areaPanel.setVisible(false);
 		rigidArea.setVisible(false);
+		agendaPanel.setVisible(false);
+		agendaPanel.removeAll();
+		agendaPanel.validate();
 	}
 
 	private void fillFields()
 	{
 
 		nameLabel.setText(selectedObject.getName());
+		
+		agendaPanel.removeAll();
+		agendaPanel.validate();
+		agendaPanel.setVisible(false);
 
 		locationXField.setText(Math.round(selectedObject.getPosition().getX()) + "");
 		locationYField.setText(Math.round(selectedObject.getPosition().getY()) + "");
@@ -582,7 +592,31 @@ public class PropertiesPanel extends JPanel
 		areaBottomField.setText(selectedObject.getAreaBottom() + "");
 		areaLeftField.setText(selectedObject.getAreaLeft() + "");
 		areaRightField.setText(selectedObject.getAreaRight() + "");
-
+		
+		if(selectedObject instanceof Stage)
+		{
+		
+			agendaPanel.setVisible(true);
+			JLabel agendaLabel = new JLabel("Agenda");
+			agendaLabel.setFont(new Font("Segoe UI", Font.ITALIC, 20));
+			agendaPanel.add(agendaLabel);
+			
+			AgendaStage st = ((Stage) selectedObject).getStage();
+			nameLabel.setText("Stage: " + st.getName());
+			ArrayList<Event> events = p.getAgenda().eventsForStage(st);
+			agendaPanel.setPreferredSize(new Dimension(200, ((30*events.size())+50) ));
+			agendaPanel.setMaximumSize(new Dimension(200, ((30*events.size())+50) ));
+			for(Event e : events)
+			{
+				JPanel eventPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+				JLabel eventLabel = new JLabel(e.getEventName() + " - " + e.getArtist().getName());
+				eventLabel.setFont(new Font("Segoe UI", Font.PLAIN, 15));
+				eventPanel.setPreferredSize(new Dimension(200, 30));
+				eventPanel.setMaximumSize(new Dimension(200, 30));
+				eventPanel.add(eventLabel);
+				agendaPanel.add(eventPanel);
+			}
+		}
 	}
 
 	public void setPanel(Panel p)

Applicatie/SaveLoad.java

@@ -1,4 +1,5 @@
 package Applicatie;
+
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
@@ -7,48 +8,62 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import javax.imageio.ImageIO;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 
+import Agenda.Agenda;
 import Objects.DrawObject;
+import Objects.Path;
 
-public class SaveLoad {
+public class SaveLoad
+{
 
-	
 	public static void save(Panel panel)
 	{
 		JFileChooser fileChooser = new JFileChooser();
-		
-		fileChooser.setFileFilter(new FileFilter() {
-				@Override
-				public boolean accept(File pathname) {
-					if(pathname.isFile() && pathname.getName().endsWith(".agn"))
-					{
-						return true;
-					}else if(pathname.isDirectory()){return true;}else{return false;}
-				}
 
-				@Override
-				public String getDescription() {
-					return ".agn";	
+		fileChooser.setFileFilter(new FileFilter()
+		{
+			@Override
+			public boolean accept(File pathname)
+			{
+				if (pathname.isFile() && pathname.getName().endsWith(".agn"))
+				{
+					return true;
 				}
-			
+				else if (pathname.isDirectory())
+				{
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			@Override
+			public String getDescription()
+			{
+				return ".agn";
+			}
+
 		});
 		fileChooser.setDialogTitle("Choose save location");
 		int userSelection = fileChooser.showSaveDialog(null);
-		
-		if(userSelection == JFileChooser.APPROVE_OPTION)
+
+		if (userSelection == JFileChooser.APPROVE_OPTION)
 		{
 			File file = fileChooser.getSelectedFile();
-			if(!file.getName().endsWith(".agn"))
+			if (!file.getName().endsWith(".agn"))
 			{
 				file = new File(file.getAbsolutePath() + ".agn");
 			}
-			
-			if(file.exists())
+
+			if (file.exists())
 			{
-				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to overwrite: " + file.getName(), "Overwrite", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
+				if (JOptionPane.showConfirmDialog(null, "Are you sure you want to overwrite: " + file.getName(), "Overwrite", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
 				{
 					saveTerrain(file, panel);
 				}
@@ -59,49 +74,70 @@ public class SaveLoad {
 			}
 		}
 	}
-	
-	
-	public static void saveTerrain(File file, Panel panel) {
 
-		try {
+	public static void saveTerrain(File file, Panel panel)
+	{
+
+		try
+		{
 			FileOutputStream fos = new FileOutputStream(file);
 			ObjectOutputStream oos = new ObjectOutputStream(fos);
-			for (DrawObject object : panel.objects) {
+			oos.writeObject(panel.getAgenda());
+			for (DrawObject object : panel.objects)
+			{
+				object.setSelected(false);
 				oos.writeObject(object);
 			}
+			for(Path p : panel.paths)
+			{
+				oos.writeObject(p);
+			}
 			oos.close();
 			JOptionPane.showMessageDialog(null, "Saved succesfully");
-		} catch (IOException e) {
+		}
+		catch (IOException e)
+		{
 			e.printStackTrace();
 		}
-	}		
-	
+	}
+
 	public static void load(Panel panel)
 	{
 		JFileChooser fileChooser = new JFileChooser();
-		fileChooser.setFileFilter(new FileFilter() {
+		fileChooser.setFileFilter(new FileFilter()
+		{
 			@Override
-			public boolean accept(File pathname) {
-				if(pathname.isFile() && pathname.getName().endsWith(".agn"))
+			public boolean accept(File pathname)
+			{
+				if (pathname.isFile() && pathname.getName().endsWith(".agn"))
 				{
 					return true;
-				}else if(pathname.isDirectory()){return true;}else{return false;}
+				}
+				else if (pathname.isDirectory())
+				{
+					return true;
+				}
+				else
+				{
+					return false;
+				}
 			}
 
 			@Override
-			public String getDescription() {
+			public String getDescription()
+			{
 				return ".agn";
 			}
-		
+
 		});
-		
+
 		fileChooser.setDialogTitle("Choose file");
 		int userSelection = fileChooser.showOpenDialog(null);
-		
-		if(userSelection == JFileChooser.APPROVE_OPTION)
+
+		if (userSelection == JFileChooser.APPROVE_OPTION)
 		{
 			File file = fileChooser.getSelectedFile();
-			if(!file.exists())
+			if (!file.exists())
 			{
 				JOptionPane.showMessageDialog(null, "This file does not exist: " + file.getName());
 			}
@@ -112,33 +148,54 @@ public class SaveLoad {
 			}
 		}
 	}
-	
-	
-	public static void fillTerrain(File file, Panel panel) {
+
+	public static void fillTerrain(File file, Panel panel)
+	{
 		FileInputStream fis = null;
 		ObjectInputStream ois = null;
 
-		try {
-			
+		try
+		{
+
 			fis = new FileInputStream(file);
 			ois = new ObjectInputStream(fis);
 
 			Object object;
-			object = ois.readObject();
-			try {
+			Agenda a = (Agenda) ois.readObject();
+			panel.setAgenda(a);
+			try
+			{
+				object = ois.readObject();
 				panel.clearObjects();
-				while (object != null) {
-					panel.objects.add((DrawObject) object); 					
+				while (object != null)
+				{
+					if (object instanceof Waypoint)
+					{
+						panel.addWaypoint((Waypoint) object);
+						panel.objects.add((DrawObject) object);
+					}
+					if (object instanceof Path)
+					{
+						Path p = (Path) object;
+						p.updateImage();
+						panel.paths.add((Path) object);
+					}
+					else
+					{
+						panel.objects.add((DrawObject) object);
+					}
 					object = ois.readObject();
 				}
-			} catch (EOFException e) {
 			}
-		} catch (Exception e) {
+			catch (EOFException e)
+			{
+			}
+		}
+		catch (Exception e)
+		{
 			e.printStackTrace();
 		}
 		panel.update();
 	}
-	
-	
-	
-}
+
+}

Applicatie/Visitor.java

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Random;
 
 import Agenda.Agenda;
 import Agenda.Event;
@@ -19,7 +20,8 @@ import Objects.Entrance;
 import Objects.Path;
 import Objects.Stage;
 
-public class Visitor {
+public class Visitor
+{
 
 	Point2D position;
 	double rotation;
@@ -29,14 +31,15 @@ public class Visitor {
 	ArrayList<Action> actions;
 	Agenda agenda;
 	ArrayList<DrawObject> objects;
+
 	ArrayList<Waypoint> waypoints;
 	GregorianCalendar date;
 	int target;
 	int finalTarget;
 
-	public Visitor(String filename, Point2D position, Agenda agenda,
-			ArrayList<DrawObject> objects, ArrayList<Waypoint> waypoints,
-			GregorianCalendar date) {
+	public Visitor(String filename, Point2D position, Agenda agenda, ArrayList<DrawObject> objects, ArrayList<Waypoint> waypoints, GregorianCalendar date)
+
+	{
 		this.position = position;
 		this.filename = filename;
 		this.rotation = 0;
@@ -48,21 +51,19 @@ public class Visitor {
 		this.agenda = agenda;
 		this.objects = objects;
 		fillActions();
-		System.out.println(actions.size());
-		for (Action a : actions){
-			System.out.println("" + a.getStartTime());
-		}
 		target = 1;
-		finalTarget = 4;
+		finalTarget = 0;
 	}
 
-	public void draw(Graphics2D g2) {
+	public void draw(Graphics2D g2)
+	{
 		AffineTransform tx = getTransform();
 		Image image = Images.getImage(filename);
 		g2.drawImage(image, tx, null);
 	}
 
-	private AffineTransform getTransform() {
+	private AffineTransform getTransform()
+	{
 		Image image = Images.getImage(filename);
 		AffineTransform tx = new AffineTransform();
 		tx.scale(scale, scale);
@@ -71,131 +72,160 @@ public class Visitor {
 		return tx;
 	}
 
-	public DrawObject getEntrance() {
-		for (DrawObject o : objects) {
-			if (o instanceof Entrance) {
+	public DrawObject getEntrance()
+	{
+		for (DrawObject o : objects)
+		{
+			if (o instanceof Entrance)
+			{
 				return o;
 			}
 		}
 		return null;
 	}
 
-	public void update(ArrayList<DrawObject> objects, int currentTime,
-			ArrayList<Visitor> visitors, ArrayList<Path> paths, Panel panel) {
+	public void update(ArrayList<DrawObject> objects, int currentTime, ArrayList<Visitor> visitors, ArrayList<Path> paths, Panel panel)
+	{
 		DrawObject target = getEntrance();
-		for (Action a : actions) {
-			if (currentTime >= a.getStartTime()
-					&& currentTime < a.getStoptime()) {
-				finalTarget = a.getWaypoint().getSelf();
+
+		for (Action a : actions)
+		{
+			if (currentTime >= a.getStartTime() && currentTime < a.getStoptime())
+			{
+				this.finalTarget = a.getWaypoint().getSelf();
+
 			}
 
 		}
-
 		// moveToTarget(target, objects, visitors, paths);
 		move(target, panel);
 	}
 
-	public void move(DrawObject tar, Panel panel) {
+	public void move(DrawObject tar, Panel panel)
+	{
 		Point2D targetPoint = panel.getWaypoint(target).getPosition();
 
-		double newRot = Math.atan2(targetPoint.getY() - position.getY(),
-				targetPoint.getX() - position.getX());
+		double newRot = Math.atan2(targetPoint.getY() - position.getY(), targetPoint.getX() - position.getX());
 
 		int difx = (int) (targetPoint.getX() - position.getX());
 		int dify = (int) (targetPoint.getY() - position.getY());
 		int distance = (int) Math.sqrt((difx * difx) + (dify * dify));
 
-		if (rotation > newRot && distance > 10) {
+		if (rotation > newRot && distance > 10)
+		{
 			rotation -= 0.15;
-		} else if (rotation < newRot && distance > 10) {
+		}
+		else if (rotation < newRot && distance > 10)
+		{
 			rotation += 0.15;
 		}
-
 		Point2D oldPosition = position;
 
 		// face direction
 		float directionX = (float) Math.cos(rotation);
 		float directionY = (float) Math.sin(rotation);
 
-		if (distance > 10) {
-			position = new Point2D.Double(
-					(position.getX() + directionX * speed),
-					(position.getY() + directionY * speed));
+		if (distance > 10)
+		{
+			position = new Point2D.Double((position.getX() + directionX * speed), (position.getY() + directionY * speed));
 		}
 
 		boolean possible = true;
-		for (DrawObject object : objects) {
-			if (object instanceof Entrance || object instanceof Waypoint) {
+		for (DrawObject object : objects)
+		{
+			if (object instanceof Entrance || object instanceof Waypoint)
+			{
 				continue;
 			}
-			if (hasCollisionDO(object)) {
+
+			if (hasCollisionDO(object))
+			{
+
 				possible = false;
 			}
 		}
-		if (possible == false) {
+		if (possible == false)
+		{
 			position = oldPosition;
 			rotation += 0.2;
 		}
-		if (checkIfOnWaypoint(panel)) {
-			// for(int i : panel.getWaypoint(target).getOptions())
-			// {
-			// if(i == finalTarget)
-			// {
-			// target = finalTarget;
-			// }
-			// }
-			// ArrayList<int[]> options = new ArrayList<int[]>();
+
+		if (checkIfOnWaypoint(panel))
+		{
+
 			HashMap<Integer, int[]> options = new HashMap<Integer, int[]>();
-			for (Waypoint w : panel.getWaypoints()) {
+			for (Waypoint w : panel.getWaypoints())
+			{
 				options.put(w.getSelf(), w.getOptions());
 			}
-			for (Map.Entry<Integer, int[]> e : options.entrySet()) {
-				System.out.println(e.getKey());
-				System.out.println("=====================");
-				for (int i : e.getValue()) {
-					System.out.println(i);
+
+			if (finalTarget != target)
+			{
+				for (Map.Entry<Integer, int[]> e : options.entrySet())
+				{
+					// System.out.println("KEY: " + e.getKey());
+					for (int i : e.getValue())
+					{
+						// System.out.println("VAL: " + i);
+
+						if (finalTarget == i && e.getKey() == target)
+						{
+							target = finalTarget;
+							break;
+						}
+						else if (finalTarget == i)
+						{
+							target = e.getKey();
+							break;
+						}
+					}
+
 				}
-				System.out.println("----------");
 			}
 		}
-
 	}
 
-	public boolean checkIfOnWaypoint(Panel panel) {
-		if (panel.getWaypoint(target).contains(position)) {
+	public boolean checkIfOnWaypoint(Panel panel)
+	{
+		if (panel.getWaypoint(target).contains(position))
+		{
 			return true;
 		}
 		return false;
 	}
 
-	public void moveToTarget(DrawObject target, ArrayList<DrawObject> objects,
-			ArrayList<Visitor> visitors, ArrayList<Path> paths) {
+	public void moveToTarget(DrawObject target, ArrayList<DrawObject> objects, ArrayList<Visitor> visitors, ArrayList<Path> paths)
+	{
 		Point2D tar = target.getPosition();
 		boolean hasPathBelow = false;
-		for (Path p : paths) {
-			if (p.containsPoint(position)) {
+		for (Path p : paths)
+		{
+			if (p.containsPoint(position))
+			{
 				hasPathBelow = true;
 				break;
 			}
 			Shape containsShape = p.containsPointShape(position);
-			if (containsShape != null) {
-				tar = new Point2D.Double(
-						containsShape.getBounds().getCenterX(), containsShape
-								.getBounds().getCenterY());
+			if (containsShape != null)
+			{
+				tar = new Point2D.Double(containsShape.getBounds().getCenterX(), containsShape.getBounds().getCenterY());
 			}
 		}
 
-		if (hasPathBelow) {
-			double newRot = Math.atan2(tar.getY() - position.getY(), tar.getX()
-					- position.getX());
+		if (hasPathBelow)
+		{
+			double newRot = Math.atan2(tar.getY() - position.getY(), tar.getX() - position.getX());
 
 			int difx = (int) (tar.getX() - position.getX());
 			int dify = (int) (tar.getY() - position.getY());
 			int distance = (int) Math.sqrt((difx * difx) + (dify * dify));
 
-			if (rotation > newRot && distance > 10) {
+			if (rotation > newRot && distance > 10)
+			{
 				rotation -= 0.15;
-			} else if (rotation < newRot && distance > 10) {
+			}
+			else if (rotation < newRot && distance > 10)
+			{
 				rotation += 0.15;
 			}
 
@@ -205,30 +235,41 @@ public class Visitor {
 			float directionX = (float) Math.cos(rotation);
 			float directionY = (float) Math.sin(rotation);
 
-			if (distance > 10) {
-				position = new Point2D.Double((position.getX() + directionX
-						* speed), (position.getY() + directionY * speed));
+			if (distance > 10)
+			{
+				position = new Point2D.Double((position.getX() + directionX * speed), (position.getY() + directionY * speed));
 			}
 
 			boolean possible = true;
-			for (DrawObject object : objects) {
-				if (hasCollisionDO(object)) {
+			for (DrawObject object : objects)
+			{
+				if (hasCollisionDO(object))
+				{
 					possible = false;
 				}
 			}
-			for (Visitor object : visitors) {
-				if (hasCollision(object) && object != this) {
+			for (Visitor object : visitors)
+			{
+
+				if (hasCollision(object) && object != this)
+				{
+
 					possible = false;
 				}
 			}
-			if (possible == false) {
+			if (possible == false)
+			{
 				position = oldPosition;
 				rotation += 0.2;
 			}
-		} else {
+		}
+		else
+		{
 			HashMap<Double, Shape> values = new HashMap<Double, Shape>();
-			for (Path p : paths) {
-				for (Shape s : p.getPath()) {
+			for (Path p : paths)
+			{
+				for (Shape s : p.getPath())
+				{
 					Rectangle b = s.getBounds();
 					double maxx = b.getMaxX();
 					double minx = b.getMinX();
@@ -242,14 +283,16 @@ public class Visitor {
 					points[3] = new Point2D.Double(maxx, maxy);
 
 					Double lastdistance = null;
-					for (Point2D.Double point : points) {
-						double distance = Point2D.distance(point.getX(),
-								point.getY(), position.getX(), position.getY());
-						if (lastdistance == null) {
+					for (Point2D.Double point : points)
+					{
+						double distance = Point2D.distance(point.getX(), point.getY(), position.getX(), position.getY());
+						if (lastdistance == null)
+						{
 							lastdistance = distance;
 							continue;
 						}
-						if (distance < lastdistance) {
+						if (distance < lastdistance)
+						{
 							lastdistance = distance;
 						}
 					}
@@ -259,31 +302,35 @@ public class Visitor {
 			}
 			Double lastdistance = null;
 			Shape lastShape = null;
-			for (Map.Entry<Double, Shape> e : values.entrySet()) {
+			for (Map.Entry<Double, Shape> e : values.entrySet())
+			{
 				double distance = e.getKey();
-				if (lastdistance == null) {
+				if (lastdistance == null)
+				{
 					lastdistance = distance;
 					continue;
 				}
-				if (distance < lastdistance) {
+				if (distance < lastdistance)
+				{
 					lastdistance = distance;
 				}
 			}
 			lastShape = values.get(lastdistance);
 
-			Point2D.Double target2 = new Point2D.Double(lastShape.getBounds()
-					.getCenterX(), lastShape.getBounds().getCenterY());
+			Point2D.Double target2 = new Point2D.Double(lastShape.getBounds().getCenterX(), lastShape.getBounds().getCenterY());
 
-			double newRot = Math.atan2(target2.getY() - position.getY(),
-					target2.getX() - position.getX());
+			double newRot = Math.atan2(target2.getY() - position.getY(), target2.getX() - position.getX());
 
 			int difx = (int) (target2.getX() - position.getX());
 			int dify = (int) (target2.getY() - position.getY());
 			int distance = (int) Math.sqrt((difx * difx) + (dify * dify));
 
-			if (rotation > newRot && distance > 10) {
+			if (rotation > newRot && distance > 10)
+			{
 				rotation -= 0.15;
-			} else if (rotation < newRot && distance > 10) {
+			}
+			else if (rotation < newRot && distance > 10)
+			{
 				rotation += 0.15;
 			}
 
@@ -293,118 +340,145 @@ public class Visitor {
 			float directionX = (float) Math.cos(rotation);
 			float directionY = (float) Math.sin(rotation);
 
-			if (distance > 10) {
-				position = new Point2D.Double((position.getX() + directionX
-						* speed), (position.getY() + directionY * speed));
+			if (distance > 10)
+			{
+				position = new Point2D.Double((position.getX() + directionX * speed), (position.getY() + directionY * speed));
 			}
 
 			boolean possible = true;
-			for (DrawObject object : objects) {
-				if (hasCollisionDO(object)) {
+			for (DrawObject object : objects)
+			{
+				if (hasCollisionDO(object))
+				{
 					possible = false;
 				}
 			}
-			for (Visitor object : visitors) {
-				if (hasCollision(object) && object != this) {
+			for (Visitor object : visitors)
+			{
+				if (hasCollision(object) && object != this)
+				{
 					possible = false;
 				}
 			}
-			if (possible == false) {
+			if (possible == false)
+			{
 				position = oldPosition;
 				rotation += 0.2;
 			}
 		}
 	}
 
-	
-	public void fillActions() {
+	@SuppressWarnings("static-access")
+	public void fillActions()
+	{
 		int startTime = 540;
 		int stopTime = 1260;
 
-		while (startTime < stopTime) {
+		while (startTime < stopTime)
+		{
 			int random = (int) Math.floor(Math.random() * 51);
-			if (random < 30) {
+			if (random < 30)
+			{
 				Point2D position = null;
 				DrawObject targetStage = null;
 				ArrayList<Event> posEvents = new ArrayList<Event>();
-				for (Event e : agenda.getEvents()) {
-					if (startTime >= e.getStart() && startTime < e.getStop()) {
+				for (Event e : agenda.getEvents())
+				{
+					if (startTime >= e.getStart() && startTime < e.getStop())
+					{
 						posEvents.add(e);
 					}
 				}
-				
 				int totalPopularity = 0;
-				for (Event ev : posEvents){
+				for (Event ev : posEvents)
+				{
 					totalPopularity += ev.getExpectedPopularity();
 				}
 
 				Random rand = new Random();
-				int n = rand.nextInt(totalPopularity) + 1;
+				int n = rand.nextInt(totalPopularity + 1);
 				int currentPop = 0;
-				if (posEvents != null){
-					for (Event evs : posEvents){
+				if (posEvents != null)
+				{
+					for (Event evs : posEvents)
+					{
 						int before = currentPop;
 						currentPop = currentPop + evs.getExpectedPopularity();
-						if (before < n && currentPop >= n){
-							for (DrawObject d : objects) {
-								if (d.getFileName().equals("stage")) {
+						if (before < n && currentPop >= n)
+						{
+							for (DrawObject d : objects)
+							{
+								if (d.getFileName().equals("stage"))
+								{
 									Stage s = (Stage) d;
-									if (s.getStage().getName()
-											.equals(evs.getStage().getName())) {
+									if (s.getStage().getName().equals(evs.getStage().getName()))
+									{
 										position = s.getPosition();
 										targetStage = d;
 									}
-								}	
+								}
+
 							}
 						}
 					}
 				}
 
 				int randomtime = (int) (40 + (Math.random() * (60 - 40)));
-				if (position != null) {
+				if (position != null)
+				{
 					Waypoint w = getClosedWaypoint(position);
-					actions.add(new Action(position, startTime, randomtime,
-							targetStage, w));
+					actions.add(new Action(position, startTime, randomtime, targetStage, w));
 				}
 				startTime = startTime + randomtime;
 
-			} else if (random >= 30 && random < 40) {
+			}
+			else if (random >= 30 && random < 40)
+			{
 				Point2D position = null;
 				DrawObject targetStage = null;
 				ArrayList<DrawObject> foodPlaces = new ArrayList<DrawObject>();
-				for (DrawObject d : objects) {
-					if (d.getFileName().equals("food")) {
+				for (DrawObject d : objects)
+				{
+					if (d.getFileName().equals("food"))
+					{
 						foodPlaces.add(d);
 					}
 				}
 
-				if (foodPlaces.size() != 0) {
+				if (foodPlaces.size() != 0)
+				{
 					int r = (int) Math.floor(Math.random() * foodPlaces.size());
 					position = foodPlaces.get(r).getPosition();
 					targetStage = foodPlaces.get(r);
 					Waypoint w = getClosedWaypoint(position);
-					actions.add(new Action(position, startTime, 35,
-							targetStage, w));
+					actions.add(new Action(position, startTime, 35, targetStage, w));
 					startTime = startTime + 20;
 				}
 				startTime = startTime + 35;
 
-			} else if (random >= 40) {
+			}
+			else if (random >= 40)
+			{
+
 				Point2D position = null;
 				DrawObject targetStage = null;
 				ArrayList<DrawObject> toilets = new ArrayList<DrawObject>();
-				for (DrawObject d : objects) {
-					if (d.getFileName().equals("wc")) {
+				for (DrawObject d : objects)
+				{
+					if (d.getFileName().equals("wc"))
+					{
 						toilets.add(d);
 					}
 				}
-				if (toilets.size() != 0) {
+
+				if (toilets.size() != 0)
+				{
 					int r = (int) Math.floor(Math.random() * toilets.size());
 					position = toilets.get(r).getPosition();
 					targetStage = toilets.get(r);
 					Waypoint w = getClosedWaypoint(position);
-					actions.add(new Action(position, startTime, 35,
-							targetStage, w));
+					actions.add(new Action(position, startTime, 35, targetStage, w));
+
 					startTime = startTime + 20;
 				}
 				startTime = startTime + 35;
@@ -413,11 +487,15 @@ public class Visitor {
 		}
 	}
 
-	public Waypoint getClosedWaypoint(Point2D point) {
+	public Waypoint getClosedWaypoint(Point2D point)
+	{
 		Waypoint waypoint = null;
 		int distance = 10000;
-		for (Waypoint w : waypoints) {
-			if (w.getPosition().distance(point) < distance) {
+		for (Waypoint w : waypoints)
+		{
+			if (w.getPosition().distance(point) < distance)
+			{
+
 				waypoint = w;
 				distance = (int) w.getPosition().distance(point);
 			}
@@ -425,15 +503,13 @@ public class Visitor {
 		return waypoint;
 	}
 
-	public boolean hasCollisionDO(DrawObject object) {
+	public boolean hasCollisionDO(DrawObject object)
+	{
+
 		Image image = Images.getImage(filename);
 		Image image2 = Images.getImage(object.getFileName());
-		Rectangle recta = new Rectangle((int) position.getX(),
-				(int) position.getY(), image.getWidth(null),
-				image.getHeight(null));
-		Rectangle rectb = new Rectangle((int) object.getPosition().getX(),
-				(int) object.getPosition().getY(), image2.getWidth(null),
-				image2.getHeight(null));
+		Rectangle recta = new Rectangle((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
+		Rectangle rectb = new Rectangle((int) object.getPosition().getX(), (int) object.getPosition().getY(), image2.getWidth(null), image2.getHeight(null));
 
 		Area a = new Area(recta);
 		Area b = new Area(rectb);
@@ -442,26 +518,23 @@ public class Visitor {
 		transA.rotate(rotation, position.getX(), position.getY());
 
 		AffineTransform transB = new AffineTransform();
-		transB.rotate(Math.toRadians(object.getRotation()), object
-				.getPosition().getX(), object.getPosition().getY());
+		transB.rotate(Math.toRadians(object.getRotation()), object.getPosition().getX(), object.getPosition().getY());
 
 		Area aa = a.createTransformedArea(transA);
 		Area bb = b.createTransformedArea(transB);
 
-		if (bb.intersects(aa.getBounds2D())) {
+		if (bb.intersects(aa.getBounds2D()))
+		{
 			return true;
 		}
 		return false;
 	}
 
-	public boolean hasCollision(Visitor v) {
+	public boolean hasCollision(Visitor v)
+	{
 		Image image = Images.getImage(filename);
-		Rectangle a = new Rectangle((int) position.getX(),
-				(int) position.getY(), image.getWidth(null),
-				image.getHeight(null));
-		Rectangle b = new Rectangle((int) v.position.getX(),
-				(int) v.position.getY(), image.getWidth(null),
-				image.getHeight(null));
+		Rectangle a = new Rectangle((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
+		Rectangle b = new Rectangle((int) v.position.getX(), (int) v.position.getY(), image.getWidth(null), image.getHeight(null));
 
 		Area aa = new Area(a);
 		Area bb = new Area(b);
@@ -475,7 +548,8 @@ public class Visitor {
 		Area ra = aa.createTransformedArea(af);
 		Area rb = bb.createTransformedArea(bf);
 
-		if (ra.intersects(rb.getBounds2D())) {
+		if (ra.intersects(rb.getBounds2D()))
+		{
 			return true;
 		}
 		return false;

Applicatie/Waypoint.java

@@ -13,6 +13,11 @@ public class Waypoint extends DrawObject
 		super("waypoint", position);
 	}
 
+	public Point2D getAccuratePoint()
+	{
+		return new Point2D.Double(super.getPosition().getX() + (super.getImageRectangle().getWidth()/2), super.getPosition().getY() + super.getImageRectangle().getHeight());
+	}
+	
 	@Override
 	public String getName()
 	{
@@ -36,7 +41,6 @@ public class Waypoint extends DrawObject
 
 	public void setSelf(int self)
 	{
-		System.out.println(self);
 		this.self = self;
 	}
 

Applicatie/WaypointPopup.java

@@ -60,7 +60,7 @@ public class WaypointPopup extends JFrame {
 		panel1.add(name);
 		row1.add(panel1);
 		
-		JTextField tf = new JTextField(10);
+		JTextField tf = new JTextField(wp.getSelf() + "", 10);
 		row2.add(tf);
 		
 		JPanel panel2 = new JPanel();
@@ -73,7 +73,21 @@ public class WaypointPopup extends JFrame {
 		empty2.add(Box.createRigidArea(new Dimension(0, 5)));
 		row2.add(empty2);
 		
-		JTextField tx = new JTextField(8);
+		String optionss = "";
+		if(wp.getOptions() != null)
+		{
+			if(wp.getOptions().length != 0)
+			{
+				int[] optionsa = wp.getOptions();
+				optionss += optionsa[0];
+				for(int i = 1; i < optionsa.length; i++)
+				{
+					optionss += "-" + optionsa[i];
+				}
+			}
+		}
+		
+		JTextField tx = new JTextField("" + optionss, 8);
 		row2.add(tx);
 		
 		JPanel help = new JPanel();
@@ -104,6 +118,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);

Listeners/Mouse.java

@@ -4,7 +4,6 @@ import java.awt.Color;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 
 import javax.swing.SwingUtilities;
@@ -16,7 +15,6 @@ import Applicatie.Waypoint;
 import Applicatie.WaypointPopup;
 import Objects.DrawObject;
 import Objects.Path;
-import Objects.Entrance;
 
 public class Mouse extends MouseAdapter
 {
@@ -36,6 +34,8 @@ public class Mouse extends MouseAdapter
 		panel.setLastClickPosition(clickPoint);
 		panel.setLastMousePosition(e.getPoint());
 
+		if(!panel.getPlay())
+		{
 		if (!panel.getClickedOption().equals("Path"))
 		{
 			if (e.getY() < 150)
@@ -130,7 +130,7 @@ public class Mouse extends MouseAdapter
 				{
 					if (SwingUtilities.isRightMouseButton(e))
 					{
-						new PathPopup(clickedPath, panel);
+						//new PathPopup(clickedPath, panel);
 					}
 				}
 				else
@@ -152,13 +152,14 @@ public class Mouse extends MouseAdapter
 
 			panel.getCurrentPath().addPoint(new Point2D.Double(clickPoint.getX(), clickPoint.getY()));
 
+		}
 		}
 		panel.repaint();
 	}
 
 	public void mouseReleased(MouseEvent e)
 	{
-		if (panel.getDragObject() != null)
+		if (panel.getDragObject() != null && !panel.getPlay())
 		{
 			if (panel.getDragObject().getRectangleColor() != Color.RED)
 			{
@@ -169,8 +170,15 @@ public class Mouse extends MouseAdapter
 			}
 			else
 			{
-				panel.getDragObject().setPosition(panel.getSelectionPosition());
-				panel.getDragObject().setRectangleColor(Color.BLACK);
+				if (panel.getDragObject() instanceof Waypoint == false)
+				{
+					panel.getDragObject().setPosition(panel.getSelectionPosition());
+					panel.getDragObject().setRectangleColor(Color.BLACK);
+				}
+				else
+				{
+					panel.getDragObject().setRectangleColor(Color.BLACK);
+				}
 			}
 			panel.setSelectionPosition(panel.getSelectedObject().getPosition());
 		}

Objects/DrawObject.java

@@ -15,6 +15,7 @@ import java.io.Serializable;
 import javax.swing.ImageIcon;
 
 import Applicatie.Images;
+import Applicatie.Panel;
 
 public abstract class DrawObject implements Serializable
 {
@@ -232,13 +233,30 @@ public abstract class DrawObject implements Serializable
 
 	public void setPosition(Point2D position)
 	{
+		if(position.getX() < -Panel.getFieldWidth()/2)
+		{
+			position.setLocation(-Panel.getFieldWidth()/2, position.getY());
+		}
+		if(position.getY() < -Panel.getFieldHeight()/2)
+		{
+			position.setLocation(position.getX(), -Panel.getFieldHeight()/2);
+		}
+		if(position.getX() > Panel.getFieldWidth()/2 - width)
+		{
+			position.setLocation(Panel.getFieldWidth()/2-width, position.getY());
+		}
+		if(position.getY() > Panel.getFieldHeight()/2 - height)
+		{
+			position.setLocation(position.getX(), Panel.getFieldHeight()/2-height);
+		}
 		this.position = position;
 	}
 	public void setPosition(Point2D position, boolean b)
 	{
-		this.position = position;
+		setPosition(position);
 	}
 
+
 	public double getRotation()
 	{
 		return rotation;

Objects/Path.java

@@ -10,6 +10,7 @@ import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 
 import javax.imageio.ImageIO;
@@ -23,13 +24,15 @@ import Applicatie.Waypoint;
  * @author Wesley de Hek
  * @version 1.2
  */
-public class Path
+public class Path implements Serializable
 {
 
+	private static final long serialVersionUID = 5345485798486018597L;
+	
 	private ArrayList<Point2D> points;
 	private ArrayList<Shape> lines;
 	private Point2D tempPoint;
-	private BufferedImage pathBackground;
+	public transient BufferedImage pathBackground = null;;
 	private ArrayList<Waypoint> waypoints;
 
 	/**
@@ -49,6 +52,18 @@ public class Path
 			e.printStackTrace();
 		}
 	}
+	
+	public void updateImage()
+	{
+		try
+		{
+			pathBackground = ImageIO.read(new File("images/newPath.png"));
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+	}
 
 	/**
 	 * Draws the path.