canvas

src/ui/view/MyCanvas.java

@@ -23,7 +23,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	private Image img = null; // Contains the image to draw on MyCanvas
 	private int x = 0;
 	private int y = 0;
-	ArrayList<CpsObject> choords;
+	Model model;
+	
 	boolean dragging = false;
 	boolean dropDelete = false;
 	CpsObject tempCPS = null;
@@ -33,6 +34,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	JMenuItem itemDelete = new JMenuItem("Delete Object");
 
 	public MyCanvas(Model model) {
+		this.model = model;
 		popmenu.add(itemDelete);
 		itemDelete.setEnabled(false);
 		itemDelete.addActionListener(new ActionListener() {
@@ -44,7 +46,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		});
 		img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(30, 30,
 				java.awt.Image.SCALE_SMOOTH);
-		choords = model.getObjectsOnCanvas();
+
 		this.addMouseListener(this);
 		this.addMouseMotionListener(this);
 	}
@@ -52,7 +54,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	public void paintComponent(Graphics g) {
 		// Draws the image to the canvas
 		super.paintComponent(g);
-		for (CpsObject cps : choords) {
+		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
 		}
 	}
@@ -81,7 +83,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		x = e.getX();
 		y = e.getY();
 		dropDelete = false;
-		for (CpsObject cps : choords) {
+		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			int cx = cps.getPos().x;
 			int cy = cps.getPos().y;
 			if (x - img.getWidth(null) <= cx && y - img.getHeight(null) <= cy && x + img.getWidth(null) >= cx