Update Visitor.java

Agenda/Agenda.java

@@ -51,20 +51,7 @@ 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();
@@ -192,7 +179,7 @@ public class Agenda implements Serializable {
 		{
 			boolean exists = false;
 			String name = e.getStage().getName();
-			for (Stage s : stages)
+			for (AgendaStage s : stages)
 			{
 				if ( s.getName().equals(name) ) {
 					exists = true;
@@ -215,8 +202,7 @@ public class Agenda implements Serializable {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-	}	
+	}		
-	*/	
 	
 	public void clearAgenda()
 	{
@@ -225,12 +211,10 @@ 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 * 60) + startMinute;
+		return (startHour * 100) + startMinute;
 	}
 	
 	public int getStop(){
-		return (stopHour * 60) + stopMinute;
+		return (stopHour * 100) + stopMinute;
 	}
 	
 	public int getStopHour(){

Agenda/MenuBar.java

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

Agenda/Window.java

@@ -1,5 +1,6 @@
 package Agenda;
 
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -35,16 +36,14 @@ public class Window extends JFrame {
 	private static GregorianCalendar date;
 	private static Agenda agenda;
 	private static String currentPanel = "table";
-	private Applicatie.Panel ap;
 	
-	public Window(Applicatie.Panel ap)
+	public Window()
 	{
 		/*
 		 * Initialize window
 		 */
 		super("Agenda");
-		this.ap = ap;
+		agenda = new Agenda();
-		agenda = ap.getAgenda();
 		
 		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
@@ -182,7 +181,7 @@ public class Window extends JFrame {
             }
 		});
 	}
-
+	
 	public static void changePanel(String panel)
 	{
 		currentPanel = panel;
@@ -232,13 +231,7 @@ 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,8 +46,9 @@ public class Action
 	{
 		return duration;
 	}
-
+	
 	public Waypoint getWaypoint(){
 		return waypoint;
 	}
+	
 }

Applicatie/AddPeoplePanel.java

@@ -1,100 +0,0 @@
-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,17 +19,13 @@ 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)));
@@ -37,8 +33,8 @@ public class ControlPanel extends JPanel
 		setFocusable(false);
 		
 		JPanel simulatorPanel  = new JPanel(new FlowLayout(FlowLayout.LEFT));
-		simulatorPanel.setPreferredSize(new Dimension(290,50));
+		simulatorPanel.setPreferredSize(new Dimension(350,50));
-		simulatorPanel.setMaximumSize(new Dimension(290,50));
+		simulatorPanel.setMaximumSize(new Dimension(350,50));
 		add(simulatorPanel);
 		{
 			JLabel simulatorLabel = new JLabel("Simulator: ");
@@ -52,11 +48,21 @@ public class ControlPanel extends JPanel
 				public void actionPerformed(ActionEvent e)
 				{
 					p.getT().start();
-					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));
@@ -64,7 +70,6 @@ public class ControlPanel extends JPanel
 				public void actionPerformed(ActionEvent e)
 				{
 					p.getT().stop();
-					runningLabel.setText("Simulation Stopped");
 				}
 			});
 			simulatorPanel.add(stopButton);
@@ -100,7 +105,7 @@ public class ControlPanel extends JPanel
 		peoplePanel.setMaximumSize(new Dimension(285,50));
 		add(peoplePanel);
 		{
-			peopleLabel = new JLabel(people + " People");
+			JLabel peopleLabel = new JLabel("0/0 People");
 			peopleLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
 			peoplePanel.add(peopleLabel);
 			
@@ -110,7 +115,7 @@ public class ControlPanel extends JPanel
 			peopleButton.addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent e)
 				{
-					new AddPeoplePanel(p);
+					p.addVisitors();
 				}
 			});
 			peoplePanel.add(peopleButton);
@@ -123,7 +128,7 @@ public class ControlPanel extends JPanel
 		runningPanel.setMaximumSize(new Dimension(195,50));
 		add(runningPanel);
 		{
-			runningLabel = new JLabel("Simulation stopped");
+			JLabel runningLabel = new JLabel("Simulation stopped");
 			runningLabel.setFont(new Font("Segoe UI", Font.PLAIN, 20));
 			runningPanel.add(runningLabel);
 		}
@@ -142,7 +147,6 @@ public class ControlPanel extends JPanel
 	
 	public void setPeople(int people)
 	{
-		this.people = people;
+		
-		peopleLabel.setText(people + " People");
 	}
 }

Applicatie/Main.java

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

Applicatie/MenuBar.java

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

Applicatie/Panel.java

@@ -148,7 +148,7 @@ public class Panel extends JPanel implements ActionListener
 		addMouseWheelListener(new MouseWheel(this));
 
 		addFocusListener(new WindowFocusListener(this));
-		t = new Timer(1000 / 50, this);
+		t = new Timer(1000 / 10, this);
 	}
 
 	public int getPanelInfoLength()
@@ -229,16 +229,7 @@ public class Panel extends JPanel implements ActionListener
 		return waypoints;
 	}
 
-	public void addVisitors(ArrayList<DrawObject> entrances)
+	public void addVisitors()
-	{
-		
-			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) {
@@ -247,14 +238,21 @@ public class Panel extends JPanel implements ActionListener
 			}
 		}
 		if(!entrances.isEmpty()) {
-			for (int i = 0; i < count; i++)
+			DrawObject entrance = entrances.get((int) Math.floor(Math.random()*entrances.size()));
-			{
+			Point point = new Point((int)entrance.getPosition().getX(),(int)entrance.getPosition().getY());
-				addVisitors(entrances);
+			visitors.add(new Visitor("visitor",point, agenda, objects, waypoints, date));
-			}
 		}
-		else 
+		else {
 			JOptionPane.showMessageDialog(this, "You don't have an entrance");
-		cp.setPeople(visitors.size());
+		}
+	}
+
+	public void addVisitors(int count)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			addVisitors();
+		}
 	}
 
 	public void paintComponent(Graphics g)
@@ -389,9 +387,6 @@ public class Panel extends JPanel implements ActionListener
 	public void clearObjects()
 	{
 		objects.clear();
-		visitors.clear();
-		waypoints.clear();
-		paths.clear();
 	}
 
 	public Point getLastMousePosition()
@@ -642,6 +637,7 @@ 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)
@@ -673,7 +669,6 @@ 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.Font;
+import java.awt.GridLayout;
 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,21 +21,20 @@ public class PathPopup extends JFrame
 
 	public PathPopup(Path p, Panel panel)
 	{
-		super("");
+		super("Artist editscreen!");
 		setDefaultCloseOperation(HIDE_ON_CLOSE);
-		JPanel content = new JPanel();
+		JPanel content = new JPanel(new BorderLayout());
-		content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS));
 		JPanel south = new JPanel(new FlowLayout());
-		JPanel center = new JPanel();
+		JPanel center = new JPanel(new GridLayout(5, 2));
-		JPanel panel1 = new JPanel();
+		content.add(south, BorderLayout.SOUTH);
-		JLabel name = new JLabel("Add WayPoint");
+		content.add(center, BorderLayout.CENTER);
-		name.setFont(new Font("Dialog", Font.BOLD, 20));
-		panel1.add(name);
-		content.add(panel1);
-		content.add(center);
-		content.add(south);
 
-		JTextField tf = new JTextField(10);
+		JPanel panel1 = new JPanel();
+		JLabel name = new JLabel("Path");
+		panel1.add(name);
+		center.add(panel1);
+
+		JTextField tf = new JTextField(5);
 		center.add(tf);
 
 		JButton edit = new JButton("Done");
@@ -48,22 +47,11 @@ 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(200, 150);
+		setSize(500, 320);
 	}
 
 }

Applicatie/PropertiesPanel.java

@@ -11,8 +11,6 @@ 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;
@@ -22,11 +20,8 @@ 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
@@ -41,7 +36,6 @@ public class PropertiesPanel extends JPanel
 
 	JLabel nameLabel;
 	JPanel areaPanel;
-	JPanel agendaPanel;
 	Component rigidArea;
 
 	JTextField locationXField;
@@ -506,9 +500,12 @@ public class PropertiesPanel extends JPanel
 		add(Box.createRigidArea(spacerDimension));
 
 		// AGENDA
-		agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+		JPanel agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-		agendaPanel.setVisible(false);
+		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);
 		add(agendaPanel);
 
 		enableComponents(this, false);
@@ -569,19 +566,12 @@ 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()) + "");
@@ -592,31 +582,7 @@ 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,5 +1,4 @@
 package Applicatie;
-
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
@@ -8,62 +7,48 @@ 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()
+		fileChooser.setFileFilter(new FileFilter() {
-		{
+				@Override
-			@Override
+				public boolean accept(File pathname) {
-			public boolean accept(File pathname)
+					if(pathname.isFile() && pathname.getName().endsWith(".agn"))
-			{
+					{
-				if (pathname.isFile() && pathname.getName().endsWith(".agn"))
+						return true;
-				{
+					}else if(pathname.isDirectory()){return true;}else{return false;}
-					return true;
 				}
-				else if (pathname.isDirectory())
-				{
-					return true;
-				}
-				else
-				{
-					return false;
-				}
-			}
-
-			@Override
-			public String getDescription()
-			{
-				return ".agn";
-			}
 
+				@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);
 				}
@@ -74,70 +59,49 @@ public class SaveLoad
 			}
 		}
 	}
+	
+	
+	public static void saveTerrain(File file, Panel panel) {
 
-	public static void saveTerrain(File file, Panel panel)
+		try {
-	{
-
-		try
-		{
 			FileOutputStream fos = new FileOutputStream(file);
 			ObjectOutputStream oos = new ObjectOutputStream(fos);
-			oos.writeObject(panel.getAgenda());
+			for (DrawObject object : panel.objects) {
-			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)
+			public boolean accept(File pathname) {
-			{
+				if(pathname.isFile() && pathname.getName().endsWith(".agn"))
-				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());
 			}
@@ -148,54 +112,33 @@ 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;
-			Agenda a = (Agenda) ois.readObject();
+			object = ois.readObject();
-			panel.setAgenda(a);
+			try {
-			try
-			{
-				object = ois.readObject();
 				panel.clearObjects();
-				while (object != null)
+				while (object != null) {
-				{
+					panel.objects.add((DrawObject) object); 					
-					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 (EOFException e)
+		} catch (Exception e) {
-			{
-			}
-		}
-		catch (Exception e)
-		{
 			e.printStackTrace();
 		}
 		panel.update();
 	}
-
+	
-}
+	
+	
+}

Applicatie/Visitor.java

@@ -19,8 +19,7 @@ import Objects.Entrance;
 import Objects.Path;
 import Objects.Stage;
 
-public class Visitor
+public class Visitor {
-{
 
 	Point2D position;
 	double rotation;
@@ -30,15 +29,14 @@ 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;
@@ -50,19 +48,21 @@ 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 = 0;
+		finalTarget = 4;
 	}
 
-	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,153 +71,131 @@ public class Visitor
 		return tx;
 	}
 
-	public DrawObject getEntrance()
+	public DrawObject getEntrance() {
-	{
+		for (DrawObject o : objects) {
-		for (DrawObject o : objects)
+			if (o instanceof Entrance) {
-		{
-			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)
+		for (Action a : actions) {
-		{
+			if (currentTime >= a.getStartTime()
-			if (currentTime >= a.getStartTime() && currentTime < a.getStoptime())
+					&& currentTime < a.getStoptime()) {
-			{
+				finalTarget = a.getWaypoint().getSelf();
-				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();
-		System.out.println("CurrentTarget: " + target);
-		System.out.println("FinalTarget: " + finalTarget);
-		Point2D targetPoint = panel.getWaypoint(target).getAccuratePoint();
 
-		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)
+		if (distance > 10) {
-		{
+			position = new Point2D.Double(
-			position = new Point2D.Double((position.getX() + directionX * speed), (position.getY() + directionY * speed));
+					(position.getX() + directionX * speed),
+					(position.getY() + directionY * speed));
 		}
 
 		boolean possible = true;
-		for (DrawObject object : objects)
+		for (DrawObject object : objects) {
-		{
+			if (object instanceof Entrance || object instanceof Waypoint) {
-			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))
+		if (checkIfOnWaypoint(panel)) {
-		{
+			// for(int i : panel.getWaypoint(target).getOptions())
+			// {
+			// if(i == finalTarget)
+			// {
+			// target = finalTarget;
+			// }
+			// }
+			// ArrayList<int[]> options = new ArrayList<int[]>();
 			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()) {
-			for (Map.Entry<Integer, int[]> e : options.entrySet())
+				System.out.println(e.getKey());
-			{
+				System.out.println("=====================");
-				for (int i : e.getValue())
+				for (int i : e.getValue()) {
-				{
+					System.out.println(i);
-					if (finalTarget != target)
-					{
-						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)
+	public boolean checkIfOnWaypoint(Panel panel) {
-	{
+		if (panel.getWaypoint(target).contains(position)) {
-		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)
+		for (Path p : paths) {
-		{
+			if (p.containsPoint(position)) {
-			if (p.containsPoint(position))
-			{
 				hasPathBelow = true;
 				break;
 			}
 			Shape containsShape = p.containsPointShape(position);
-			if (containsShape != null)
+			if (containsShape != null) {
-			{
+				tar = new Point2D.Double(
-				tar = new Point2D.Double(containsShape.getBounds().getCenterX(), containsShape.getBounds().getCenterY());
+						containsShape.getBounds().getCenterX(), containsShape
+								.getBounds().getCenterY());
 			}
 		}
 
-		if (hasPathBelow)
+		if (hasPathBelow) {
-		{
+			double newRot = Math.atan2(tar.getY() - position.getY(), tar.getX()
-			double newRot = Math.atan2(tar.getY() - position.getY(), tar.getX() - position.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;
 			}
 
@@ -227,40 +205,30 @@ public class Visitor
 			float directionX = (float) Math.cos(rotation);
 			float directionY = (float) Math.sin(rotation);
 
-			if (distance > 10)
+			if (distance > 10) {
-			{
+				position = new Point2D.Double((position.getX() + directionX
-				position = new Point2D.Double((position.getX() + directionX * speed), (position.getY() + directionY * speed));
+						* speed), (position.getY() + directionY * speed));
 			}
 
 			boolean possible = true;
-			for (DrawObject object : objects)
+			for (DrawObject object : objects) {
-			{
+				if (hasCollisionDO(object)) {
-				if (hasCollisionDO(object))
-				{
 					possible = false;
 				}
 			}
-			for (Visitor object : visitors)
+			for (Visitor object : visitors) {
-			{
+				if (hasCollision(object) && object != this) {
-
-				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 (Path p : paths) {
-			{
+				for (Shape s : p.getPath()) {
-				for (Shape s : p.getPath())
-				{
 					Rectangle b = s.getBounds();
 					double maxx = b.getMaxX();
 					double minx = b.getMinX();
@@ -274,16 +242,14 @@ public class Visitor
 					points[3] = new Point2D.Double(maxx, maxy);
 
 					Double lastdistance = null;
-					for (Point2D.Double point : points)
+					for (Point2D.Double point : points) {
-					{
+						double distance = Point2D.distance(point.getX(),
-						double distance = Point2D.distance(point.getX(), point.getY(), position.getX(), position.getY());
+								point.getY(), position.getX(), position.getY());
-						if (lastdistance == null)
+						if (lastdistance == null) {
-						{
 							lastdistance = distance;
 							continue;
 						}
-						if (distance < lastdistance)
+						if (distance < lastdistance) {
-						{
 							lastdistance = distance;
 						}
 					}
@@ -293,35 +259,31 @@ 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;
 			}
 
@@ -331,127 +293,118 @@ public class Visitor
 			float directionX = (float) Math.cos(rotation);
 			float directionY = (float) Math.sin(rotation);
 
-			if (distance > 10)
+			if (distance > 10) {
-			{
+				position = new Point2D.Double((position.getX() + directionX
-				position = new Point2D.Double((position.getX() + directionX * speed), (position.getY() + directionY * speed));
+						* speed), (position.getY() + directionY * speed));
 			}
 
 			boolean possible = true;
-			for (DrawObject object : objects)
+			for (DrawObject object : objects) {
-			{
+				if (hasCollisionDO(object)) {
-				if (hasCollisionDO(object))
-				{
 					possible = false;
 				}
 			}
-			for (Visitor object : visitors)
+			for (Visitor object : visitors) {
-			{
+				if (hasCollision(object) && object != this) {
-				if (hasCollision(object) && object != this)
-				{
 					possible = false;
 				}
 			}
-			if (possible == false)
+			if (possible == false) {
-			{
 				position = oldPosition;
 				rotation += 0.2;
 			}
 		}
 	}
 
-	@SuppressWarnings("static-access")
+	
-	public void fillActions()
+	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 < 40)
+			if (random < 30) {
-			{
 				Point2D position = null;
 				DrawObject targetStage = null;
 				ArrayList<Event> posEvents = new ArrayList<Event>();
-				for (Event e : agenda.getEvents())
+				for (Event e : agenda.getEvents()) {
-				{
+					if (startTime >= e.getStart() && startTime < e.getStop()) {
-					if (startTime >= e.getStart() && startTime < e.getStop())
-					{
 						posEvents.add(e);
 					}
 				}
+				
+				int totalPopularity = 0;
+				for (Event ev : posEvents){
+					totalPopularity += ev.getExpectedPopularity();
+				}
 
-				if (posEvents.size() != 0)
+				Random rand = new Random();
-				{
+				int n = rand.nextInt(totalPopularity) + 1;
-					int r = (int) Math.floor(Math.random() * posEvents.size());
+				int currentPop = 0;
-					Event evs = posEvents.get(r);
+				if (posEvents != null){
-					for (DrawObject d : objects)
+					for (Event evs : posEvents){
-					{
+						int before = currentPop;
-						if (d.getFileName().equals("stage"))
+						currentPop = currentPop + evs.getExpectedPopularity();
-						{
+						if (before < n && currentPop >= n){
-							Stage s = (Stage) d;
+							for (DrawObject d : objects) {
-							if (s.getStage().getName().equals(evs.getStage().getName()))
+								if (d.getFileName().equals("stage")) {
-							{
+									Stage s = (Stage) d;
-								position = s.getPosition();
+									if (s.getStage().getName()
-								targetStage = d;
+											.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);
-					Waypoint w = getClosestWaypoint(position);
+					actions.add(new Action(position, startTime, randomtime,
-					actions.add(new Action(position, startTime, randomtime, targetStage, w));
+							targetStage, w));
 				}
 				startTime = startTime + randomtime;
 
-			}
+			} else if (random >= 30 && random < 40) {
-			else if (random >= 40 && random < 45)
-			{
 				Point2D position = null;
 				DrawObject targetStage = null;
 				ArrayList<DrawObject> foodPlaces = new ArrayList<DrawObject>();
-				for (DrawObject d : objects)
+				for (DrawObject d : objects) {
-				{
+					if (d.getFileName().equals("food")) {
-					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 = getClosestWaypoint(position);
+					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 > 45)
-			{
 				Point2D position = null;
 				DrawObject targetStage = null;
 				ArrayList<DrawObject> toilets = new ArrayList<DrawObject>();
-				for (DrawObject d : objects)
+				for (DrawObject d : objects) {
-				{
+					if (d.getFileName().equals("wc")) {
-					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 = getClosestWaypoint(position);
+					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;
@@ -460,14 +413,11 @@ public class Visitor
 		}
 	}
 
-	public Waypoint getClosestWaypoint(Point2D point)
+	public Waypoint getClosedWaypoint(Point2D point) {
-	{
 		Waypoint waypoint = null;
 		int distance = 10000;
-		for (Waypoint w : waypoints)
+		for (Waypoint w : waypoints) {
-		{
+			if (w.getPosition().distance(point) < distance) {
-			if (w.getPosition().distance(point) < distance)
-			{
 				waypoint = w;
 				distance = (int) w.getPosition().distance(point);
 			}
@@ -475,12 +425,15 @@ 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 recta = new Rectangle((int) position.getX(),
-		Rectangle rectb = new Rectangle((int) object.getPosition().getX(), (int) object.getPosition().getY(), image2.getWidth(null), image2.getHeight(null));
+				(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);
@@ -489,23 +442,26 @@ 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 a = new Rectangle((int) position.getX(),
-		Rectangle b = new Rectangle((int) v.position.getX(), (int) v.position.getY(), image.getWidth(null), image.getHeight(null));
+				(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);
@@ -519,10 +475,9 @@ 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,11 +13,6 @@ 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()
 	{
@@ -41,6 +36,7 @@ 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(wp.getSelf() + "", 10);
+		JTextField tf = new JTextField(10);
 		row2.add(tf);
 		
 		JPanel panel2 = new JPanel();
@@ -73,21 +73,7 @@ public class WaypointPopup extends JFrame {
 		empty2.add(Box.createRigidArea(new Dimension(0, 5)));
 		row2.add(empty2);
 		
-		String optionss = "";
+		JTextField tx = new JTextField(8);
-		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();
@@ -118,17 +104,6 @@ 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,6 +4,7 @@ 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;
@@ -15,6 +16,7 @@ import Applicatie.Waypoint;
 import Applicatie.WaypointPopup;
 import Objects.DrawObject;
 import Objects.Path;
+import Objects.Entrance;
 
 public class Mouse extends MouseAdapter
 {
@@ -128,7 +130,7 @@ public class Mouse extends MouseAdapter
 				{
 					if (SwingUtilities.isRightMouseButton(e))
 					{
-						//new PathPopup(clickedPath, panel);
+						new PathPopup(clickedPath, panel);
 					}
 				}
 				else
@@ -167,15 +169,8 @@ public class Mouse extends MouseAdapter
 			}
 			else
 			{
-				if (panel.getDragObject() instanceof Waypoint == false)
+				panel.getDragObject().setPosition(panel.getSelectionPosition());
-				{
+				panel.getDragObject().setRectangleColor(Color.BLACK);
-					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,7 +15,6 @@ import java.io.Serializable;
 import javax.swing.ImageIcon;
 
 import Applicatie.Images;
-import Applicatie.Panel;
 
 public abstract class DrawObject implements Serializable
 {
@@ -233,30 +232,13 @@ 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)
 	{
-		setPosition(position);
+		this.position = position;
 	}
 
-
 	public double getRotation()
 	{
 		return rotation;

Objects/Path.java

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