From b47ea128290c2dc9c8ebe471d4b2e7d011bb74bb Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Tue, 10 Mar 2015 12:23:08 +0100
Subject: [PATCH] Started bugfixes

---
 Applicatie/Panel.java       | 64 +++++++++++++++++++++++++++++++++++--
 Listneners/Mouse.java       |  8 +++++
 Listneners/MouseMotion.java |  9 ++++++
 3 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/Applicatie/Panel.java b/Applicatie/Panel.java
index ffef68a..59ebd1a 100644
--- a/Applicatie/Panel.java
+++ b/Applicatie/Panel.java
@@ -48,9 +48,9 @@ public class Panel extends JPanel {
 		objects.add(new Podium(new Point2D.Double(500, 100)));
 		objects.add(new Podium(new Point2D.Double(300, 400)));
 	
-		addMouseListener(new Mouse());
+		addMouseListener(new Mouse(this));
 		
-		addMouseMotionListener(new MouseMotion());
+		addMouseMotionListener(new MouseMotion(this));
 		
 		addMouseWheelListener(new MouseWheelListener() {
 			public void mouseWheelMoved(MouseWheelEvent e) {
@@ -115,6 +115,66 @@ public class Panel extends JPanel {
 		}
 		return null;
 	}
+
+
+	public ArrayList<DrawObject> getObjects() {
+		return objects;
+	}
+
+
+	public void setObjects(ArrayList<DrawObject> objects) {
+		this.objects = objects;
+	}
+
+
+	public DrawObject getDragObject() {
+		return dragObject;
+	}
+
+
+	public void setDragObject(DrawObject dragObject) {
+		this.dragObject = dragObject;
+	}
+
+
+	public Point2D getCameraPoint() {
+		return cameraPoint;
+	}
+
+
+	public void setCameraPoint(Point2D cameraPoint) {
+		this.cameraPoint = cameraPoint;
+	}
+
+
+	public float getCameraScale() {
+		return cameraScale;
+	}
+
+
+	public void setCameraScale(float cameraScale) {
+		this.cameraScale = cameraScale;
+	}
+
+
+	public Point2D getLastClickPosition() {
+		return lastClickPosition;
+	}
+
+
+	public void setLastClickPosition(Point2D lastClickPosition) {
+		this.lastClickPosition = lastClickPosition;
+	}
+
+
+	public Point getLastMousePosition() {
+		return lastMousePosition;
+	}
+
+
+	public void setLastMousePosition(Point lastMousePosition) {
+		this.lastMousePosition = lastMousePosition;
+	}
 	
 
 }
diff --git a/Listneners/Mouse.java b/Listneners/Mouse.java
index 5fca098..0512731 100644
--- a/Listneners/Mouse.java
+++ b/Listneners/Mouse.java
@@ -5,10 +5,18 @@ import java.awt.event.MouseEvent;
 import java.awt.geom.Point2D;
 
 import Applicatie.DrawObject;
+import Applicatie.Panel;
 import Objects.Podium;
 import Objects.Toilet;
 
 public class Mouse extends MouseAdapter {
+		Panel p;
+		
+		public Mouse(Panel p)
+		{
+			this.p = p;
+		}
+		
 		public void mousePressed(MouseEvent e) {
 			Point2D clickPoint = getClickPoint(e.getPoint());
 			lastClickPosition = clickPoint;
diff --git a/Listneners/MouseMotion.java b/Listneners/MouseMotion.java
index 90a1bd0..38b9c69 100644
--- a/Listneners/MouseMotion.java
+++ b/Listneners/MouseMotion.java
@@ -6,7 +6,16 @@ import java.awt.geom.Point2D;
 
 import javax.swing.SwingUtilities;
 
+import Applicatie.Panel;
+
 public class MouseMotion extends MouseMotionAdapter {
+	Panel p;
+	
+	public MouseMotion(Panel p)
+	{
+		this.p = p;
+	}
+	
 	public void mouseDragged(MouseEvent e) {
 		Point2D clickPoint = getClickPoint(e.getPoint());
 		if(dragObject != null)