Combined Agenda

Objects/Path.java

@@ -14,7 +14,6 @@ import java.util.ArrayList;
 
 import javax.imageio.ImageIO;
 
-import Applicatie.Panel;
 import Applicatie.Waypoint;
 
 /**
@@ -96,7 +95,7 @@ public class Path
 		}
 		return null;
 	}
-
+	
 	/**
 	 * Check if one of the lines contains the given point.
 	 * 
@@ -115,13 +114,12 @@ public class Path
 		}
 		return false;
 	}
-
-
+	
 	public boolean intersectsRect(Rectangle2D rect)
 	{
-		for (Shape line : getPath())
+		for(Shape line : getPath())
 		{
-			if (line.intersects(rect))
+			if(line.intersects(rect))
 			{
 				return true;
 			}
@@ -146,23 +144,13 @@ public class Path
 			lines.add(stroke.createStrokedShape(line));
 		}
 		return lines;
-
 	}
-
-	public void addWaypoint(int i, Panel panel)
+	
+	public void addWaypoint(Waypoint w)
 	{
-		for (Waypoint w : panel.getWaypoints())
-		{
-			if (w.getSelf() == i)
-			{
-				waypoints.add(w);
-				return;
-			}
-		}
-
+		waypoints.add(w);
 	}
 
-
 	/**
 	 * Add a point to the path.
 	 *