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;
@@ -203,6 +216,7 @@ public class Agenda implements Serializable {
 			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/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();
 			}
 		});

Agenda/Stage.java

@@ -1,41 +0,0 @@
-package Agenda;
-import java.io.Serializable;
-
-public class Stage implements Serializable {
-
-	private static final long serialVersionUID = 1;
-	
-	private String name;
-	private String description;
-	
-	public Stage(String name, String description)
-	{
-		this.name = name;
-		this.description = description;
-	}
-	
-	public String getName()
-	{
-		return this.name;
-	}
-		
-	public String getDescription()
-	{
-		return this.description;
-	}
-	
-	public void setDescription(String description)
-	{
-		this.description = description;
-	}
-	
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	
-	public String toString()
-	{
-		return name;
-	}
-}

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() {
@@ -231,6 +232,12 @@ public class Window extends JFrame {
 	public void setAgenda(Agenda a)
 	{
 		agenda = a; 
+		ap.setAgenda(a);
+	}
+	
+	public Applicatie.Panel getPanel()
+	{
+		return ap;
 	}
 	
 	

Applicatie/ControlPanel.java

@@ -22,6 +22,7 @@ public class ControlPanel extends JPanel
 	private int people;
 	JLabel timeLabel;
 	JLabel peopleLabel;
+	JLabel runningLabel;
 	
 	public ControlPanel()
 	{
@@ -36,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.setPreferredSize(new Dimension(290,50));
-		simulatorPanel.setMaximumSize(new Dimension(350,50));
+		simulatorPanel.setMaximumSize(new Dimension(290,50));
 		add(simulatorPanel);
 		{
 			JLabel simulatorLabel = new JLabel("Simulator: ");
@@ -51,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));
@@ -73,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);
@@ -131,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);
 		}

Applicatie/DrawObject.java

@@ -1,268 +0,0 @@
-package Applicatie;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.NoninvertibleTransformException;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import javax.swing.ImageIcon;
-
-public abstract class DrawObject
-{
-	Point2D position;
-	double rotation;
-	double scale;
-	private Image image;
-	protected boolean selected;
-	private Rectangle2D rektAngle;
-	private Rectangle2D upperLeftCorner;
-	private Rectangle2D upperRightCorner;
-	private Rectangle2D bottomLeftCorner;
-	private Rectangle2D bottomRightCorner;
-	private Ellipse2D rotateDot;
-	static final int UPPERLEFT = 0;
-	static final int UPPERRIGHT = 1;
-	static final int BOTTOMLEFT = 2;
-	static final int BOTTOMRIGHT = 3;
-	private Color rectangleColor;
-
-	public DrawObject(String filename, Point2D position)
-	{
-		image = new ImageIcon(filename).getImage();
-		scale = 1;
-		rotation = 0;
-		this.position = position;
-		rectangleColor = Color.BLACK;
-	}
-
-	public abstract String getName();
-
-	public void draw(Graphics2D g)
-	{
-		AffineTransform tx = getTransform();
-		g.drawImage(image, tx, null);
-		if (selected)
-		{
-			// g.rotate(Math.toRadians(rotation), image.getWidth(null)/2,
-			// image.getHeight(null)/2);
-
-			AffineTransform rotate = AffineTransform.getRotateInstance(Math.toRadians(rotation), position.getX() + image.getWidth(null) / 2, position.getY() + image.getHeight(null) / 2);
-			//g.transform(rotate);
-			g.setColor(rectangleColor);
-			g.setStroke(new BasicStroke(7));
-			rektAngle = new Rectangle2D.Double((int) position.getX(), (int) position.getY(), image.getWidth(null), image.getHeight(null));
-			tx = getTransformRectangle();
-			rektAngle.setFrame(tx.createTransformedShape(rektAngle).getBounds());
-			g.draw(rektAngle);
-			g.setColor(Color.YELLOW);
-			upperLeftCorner = new Rectangle2D.Double(rektAngle.getX() - 7, rektAngle.getY() - 7, 15, 15);
-			upperRightCorner = new Rectangle2D.Double(rektAngle.getX() + rektAngle.getWidth() - 8, rektAngle.getY() - 7, 15, 15);
-			bottomLeftCorner = new Rectangle2D.Double(rektAngle.getX() - 7, rektAngle.getY() + rektAngle.getHeight() - 8, 15, 15);
-			bottomRightCorner = new Rectangle2D.Double(rektAngle.getX() + rektAngle.getWidth() - 8, rektAngle.getY() + rektAngle.getHeight() - 8, 15, 15);
-			g.fill(upperLeftCorner); // upperleft
-			g.fill(upperRightCorner); // upperright
-			g.fill(bottomLeftCorner); // bottomleft
-			g.fill(bottomRightCorner); // bottomright
-			g.setColor(Color.RED);
-			rotateDot = new Ellipse2D.Double((rektAngle.getX() + (rektAngle.getWidth() / 2)) - 8, rektAngle.getY() - 8, 15, 15);
-			g.fill(rotateDot);
-
-		}
-	}
-
-	protected AffineTransform getTransform()
-	{
-		AffineTransform tx = new AffineTransform();
-		tx.scale(scale, scale);
-		tx.translate(position.getX(), position.getY());
-		tx.rotate(Math.toRadians(rotation), image.getWidth(null) / 2, image.getHeight(null) / 2);
-		return tx;
-	}
-
-	protected AffineTransform getTransformSelection()
-	{
-		AffineTransform tx = new AffineTransform();
-		tx.scale(scale, scale);
-		tx.translate(position.getX(), position.getY());
-		return tx;
-	}
-
-	/**
-	 * Special transformation for the selection rectangle, because the
-	 * translation of the image one places the rectangle translated from the
-	 * image.
-	 * 
-	 * @return affineTransform
-	 */
-	private AffineTransform getTransformRectangle()
-	{
-		AffineTransform tx = new AffineTransform();
-		tx.scale(scale, scale);
-		return tx;
-	}
-
-	public boolean contains(Point2D clickPoint)
-	{
-		Shape shape;
-		if (rektAngle == null)
-		{
-			shape = new Rectangle2D.Double(0, 0, image.getWidth(null), image.getHeight(null));
-			return getTransform().createTransformedShape(shape).contains(clickPoint);
-
-		}
-		else
-		{
-			shape = new Rectangle2D.Double(-9, -9, image.getWidth(null) + 13, image.getHeight(null) + 13);
-			return getTransformSelection().createTransformedShape(shape).contains(clickPoint);
-		}
-
-	}
-
-	public Point2D getObjectPoint(Point2D point)
-	{
-		try
-		{
-			return getTransform().inverseTransform(point, null);
-
-		}
-		catch (NoninvertibleTransformException e)
-		{
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	/**
-	 * Checking collision.
-	 * @param object. the drawObject to check collision with.
-	 * @return if there is a collision.
-	 */
-	public boolean collision(DrawObject object)
-	{
-		Shape ownShape = getRectangle();
-		Rectangle2D otherRectangle = object.getTransform().createTransformedShape(object.getImageRectangle()).getBounds2D();
-		if(ownShape.intersects(otherRectangle))
-			return true;
-		else 
-			return false;
-	}
-
-	/**
-	 * This method checks if the place thats clicked is inside one of the
-	 * corners.
-	 * 
-	 * @param point
-	 * @param corner
-	 * @return if the clicked point is inside one of the corners
-	 */
-	public boolean containsCorner(Point2D point, int corner)
-	{
-		Rectangle2D chosenCorner = null;
-		switch (corner)
-		{
-			case 0:
-				chosenCorner = upperLeftCorner;
-				break;
-			case 1:
-				chosenCorner = upperRightCorner;
-				break;
-			case 2:
-				chosenCorner = bottomLeftCorner;
-				break;
-			case 3:
-				chosenCorner = bottomRightCorner;
-				break;
-			case 4:
-				if (point.getX() > rotateDot.getX() && point.getX() < rotateDot.getX() + rotateDot.getWidth() && point.getY() > rotateDot.getY() && point.getY() < rotateDot.getY() + rotateDot.getHeight())
-					return true;
-				else
-					return false;
-
-		}
-		if (point.getX() > chosenCorner.getX() && point.getX() < chosenCorner.getX() + chosenCorner.getWidth() && point.getY() > chosenCorner.getY() && point.getY() < chosenCorner.getY() + chosenCorner.getHeight())
-			return true;
-		else
-			return false;
-	}
-
-	public void setSelected(boolean b)
-	{
-		selected = b;
-	}
-
-	public Point2D getPosition()
-	{
-		return position;
-	}
-
-	public void setPosition(Point2D position)
-	{
-		this.position = position;
-	}
-
-	public double getRotation()
-	{
-		return rotation;
-	}
-
-	public void setRotation(double rotation)
-	{
-		this.rotation = rotation;
-	}
-
-	public double getScale()
-	{
-		return scale;
-	}
-
-	public void setScale(double scale)
-	{
-		this.scale = scale;
-	}
-
-	public Image getImage()
-	{
-		return image;
-	}
-
-	public void setImage(Image image)
-	{
-		this.image = image;
-	}
-
-	public boolean isSelected()
-	{
-		return selected;
-	}
-
-	public Rectangle2D getRectangle()
-	{
-		return rektAngle;
-	}
-
-	public void setRectangle(Rectangle2D rectangle)
-	{
-		rektAngle = rectangle;
-	}
-
-	public Color getRectangleColor()
-	{
-		return rectangleColor;
-	}
-
-	public void setRectangleColor(Color rectangleColor)
-	{
-		this.rectangleColor = rectangleColor;
-	}
-	
-	public Rectangle2D getImageRectangle() {
-		return new Rectangle2D.Double(0,0, image.getWidth(null), image.getHeight(null));
-	}
-
-}

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);
+				System.exit(0);
-				w.dispose();
 			}
 		});
 

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()
@@ -389,6 +390,9 @@ public class Panel extends JPanel implements ActionListener
 	public void clearObjects()
 	{
 		objects.clear();
+		visitors.clear();
+		waypoints.clear();
+		paths.clear();
 	}
 
 	public Point getLastMousePosition()
@@ -639,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)
@@ -665,6 +668,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)
 	{
 		this.width = width;

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));
+		agendaPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-		JLabel agendaLabel = new JLabel("Agenda");
+		agendaPanel.setVisible(false);
-		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);
@@ -566,6 +569,9 @@ 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()
@@ -573,6 +579,10 @@ public class PropertiesPanel extends JPanel
 
 		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()) + "");
 		scaleField.setText((double) Math.round(selectedObject.getScale() * 10) / 10 + "");
@@ -583,6 +593,30 @@ public class PropertiesPanel extends JPanel
 		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,30 +8,44 @@ 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
-				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";
 			}
 
@@ -38,17 +53,17 @@ public class SaveLoad {
 		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);
 				}
@@ -60,18 +75,28 @@ 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);
-			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();
 		}
 	}
@@ -79,17 +104,28 @@ public class SaveLoad {
 	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";
 			}
 
@@ -98,10 +134,10 @@ public class SaveLoad {
 		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());
 			}
@@ -113,32 +149,53 @@ 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();
+			panel.setAgenda(a);
+			try
+			{
 				object = ois.readObject();
-			try {
 				panel.clearObjects();
-				while (object != null) {
+				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;
@@ -86,16 +87,16 @@ public class Visitor
 	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())
 			{
 				this.finalTarget = a.getWaypoint().getSelf();
+
 			}
 
 		}
-		System.out.println(actions.size());
-
 		// moveToTarget(target, objects, visitors, paths);
 		move(target, panel);
 	}
@@ -118,7 +119,6 @@ public class Visitor
 		{
 			rotation += 0.15;
 		}
-
 		Point2D oldPosition = position;
 
 		// face direction
@@ -140,6 +140,7 @@ public class Visitor
 
 			if (hasCollisionDO(object))
 			{
+
 				possible = false;
 			}
 		}
@@ -148,20 +149,25 @@ public class Visitor
 			position = oldPosition;
 			rotation += 0.2;
 		}
+
 		if (checkIfOnWaypoint(panel))
 		{
+
 			HashMap<Integer, int[]> options = new HashMap<Integer, int[]>();
 			for (Waypoint w : panel.getWaypoints())
 			{
 				options.put(w.getSelf(), w.getOptions());
 			}
 
-			for (Map.Entry<Integer, int[]> e : options.entrySet())
-			{
-				for (int i : e.getValue())
-				{
 			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;
@@ -173,11 +179,11 @@ public class Visitor
 							break;
 						}
 					}
-				}
-			}
-		}
 
 				}
+			}
+		}
+	}
 
 	public boolean checkIfOnWaypoint(Panel panel)
 	{
@@ -247,6 +253,7 @@ public class Visitor
 
 				if (hasCollision(object) && object != this)
 				{
+
 					possible = false;
 				}
 			}
@@ -370,7 +377,7 @@ public class Visitor
 		while (startTime < stopTime)
 		{
 			int random = (int) Math.floor(Math.random() * 51);
-			if (random < 40)
+			if (random < 30)
 			{
 				Point2D position = null;
 				DrawObject targetStage = null;
@@ -382,11 +389,23 @@ public class Visitor
 						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 currentPop = 0;
+				if (posEvents != null)
+				{
+					for (Event evs : posEvents)
+					{
+						int before = currentPop;
+						currentPop = currentPop + evs.getExpectedPopularity();
+						if (before < n && currentPop >= n)
 						{
-					int r = (int) Math.floor(Math.random() * posEvents.size());
-					Event evs = posEvents.get(r);
 							for (DrawObject d : objects)
 							{
 								if (d.getFileName().equals("stage"))
@@ -398,19 +417,22 @@ public class Visitor
 										targetStage = d;
 									}
 								}
+
+							}
+						}
 					}
 				}
 
 				int randomtime = (int) (40 + (Math.random() * (60 - 40)));
 				if (position != null)
 				{
-					Waypoint w = getClosestWaypoint(position);
+					Waypoint w = getClosedWaypoint(position);
 					actions.add(new Action(position, startTime, randomtime, targetStage, w));
 				}
 				startTime = startTime + randomtime;
 
 			}
-			else if (random >= 40 && random < 45)
+			else if (random >= 30 && random < 40)
 			{
 				Point2D position = null;
 				DrawObject targetStage = null;
@@ -428,15 +450,16 @@ public class Visitor
 					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));
 					startTime = startTime + 20;
 				}
 				startTime = startTime + 35;
 
 			}
-			else if (random > 45)
+			else if (random >= 40)
 			{
+
 				Point2D position = null;
 				DrawObject targetStage = null;
 				ArrayList<DrawObject> toilets = new ArrayList<DrawObject>();
@@ -447,13 +470,15 @@ public class Visitor
 						toilets.add(d);
 					}
 				}
+
 				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));
+
 					startTime = startTime + 20;
 				}
 				startTime = startTime + 35;
@@ -462,7 +487,7 @@ public class Visitor
 		}
 	}
 
-	public Waypoint getClosestWaypoint(Point2D point)
+	public Waypoint getClosedWaypoint(Point2D point)
 	{
 		Waypoint waypoint = null;
 		int distance = 10000;
@@ -470,6 +495,7 @@ public class Visitor
 		{
 			if (w.getPosition().distance(point) < distance)
 			{
+
 				waypoint = w;
 				distance = (int) w.getPosition().distance(point);
 			}
@@ -479,6 +505,7 @@ public class Visitor
 
 	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));

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;
 	}
 

Listeners/Mouse.java

@@ -9,6 +9,8 @@ import java.awt.image.BufferedImage;
 import javax.swing.SwingUtilities;
 
 import Applicatie.Panel;
+import Applicatie.PathPopup;
+
 import Applicatie.Waypoint;
 import Applicatie.WaypointPopup;
 import Objects.DrawObject;
@@ -32,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)
@@ -148,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)
 			{
@@ -164,10 +169,17 @@ public class Mouse extends MouseAdapter
 				panel.setClickedOption("drag");
 			}
 			else
+			{
+				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());
 		}
 		panel.repaint();

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;
 
 	/**
@@ -50,6 +53,18 @@ public class Path
 		}
 	}
 	
+	public void updateImage()
+	{
+		try
+		{
+			pathBackground = ImageIO.read(new File("images/newPath.png"));
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+	}
+
 	/**
 	 * Draws the path.
 	 * 

Objects/Podium.java

@@ -1,13 +0,0 @@
-package Objects;
-import java.awt.geom.Point2D;
-
-import Applicatie.DrawObject;
-
-
-public class Podium extends DrawObject {
-
-	public Podium(Point2D position) {
-		super("images/stage3.png", position);
-	}
-
-}

README.md

@@ -1,2 +0,0 @@
-# FestivalPlanner
-Festival Planner