Succesful merge but with nullpointerexceptions

Listeners/Mouse.java

@@ -53,8 +53,15 @@ public class Mouse extends MouseAdapter {
 		else
 		{
 			for(DrawObject o : panel.getObjects())
+			{
 				if(o.contains(clickPoint))
+				{
 					panel.setDragObject(o);
+					panel.getPP().setSelected(o);
+					return;
+				}
+			}
+			panel.getPP().clearSelected();
 		}
 	}
 

Listeners/MouseMotion.java

@@ -48,5 +48,6 @@ public class MouseMotion extends MouseMotionAdapter {
 		}
 		panel.setLastMousePosition(e.getPoint());
 		panel.setLastClickPosition(clickPoint);
+		panel.getPP().update();
 	}
 }

Listeners/MouseWheel.java

@@ -25,6 +25,7 @@ public class MouseWheel implements MouseWheelListener {
 			{
 				double scale = o.getScale()* 1 + (e.getPreciseWheelRotation()/10.0);
 				o.setScale(scale);
+				panel.getPP().update();
 				panel.repaint();
 				return;
 			}