From a8281523e2bbee4a1b4688f175896fe9c6b30c55 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Thu, 28 May 2015 23:50:19 +0200 Subject: This does seem to work a bit... kindof... --- Week14 Route 66/src/OO14route66/Model.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Week14 Route 66/src/OO14route66/Model.java') diff --git a/Week14 Route 66/src/OO14route66/Model.java b/Week14 Route 66/src/OO14route66/Model.java index 10c413f..c79aa4e 100644 --- a/Week14 Route 66/src/OO14route66/Model.java +++ b/Week14 Route 66/src/OO14route66/Model.java @@ -14,9 +14,8 @@ public class Model extends Observable { private final Car [] cars; public static final int -// DIRECTIONS = 4, // for a crossing - DIRECTIONS = 2, // for a single road - NUMBEROFCARS = 5 * DIRECTIONS; // total number of cars in system + DIRECTIONS = 2, + NUMBEROFCARS = 5 * DIRECTIONS; // total number of cars in system private final ArrayList views; @@ -25,10 +24,10 @@ public class Model extends Observable * Constructor: create all cars */ public Model() { - views = new ArrayList(); + views = new ArrayList<>(); cars = new Car [NUMBEROFCARS]; for (int c = 0; c < NUMBEROFCARS; c += 1) { - cars[c] = new Car(c); + cars[c] = new Car(c, this); } } @@ -39,6 +38,10 @@ public class Model extends Observable public void addView(JFrame view) { views.add(view); } + + public Car[] getCars() { + return cars; + } /** * get a car from the model -- cgit v1.2.3