aboutsummaryrefslogtreecommitdiff
path: root/Week14 Route 66/src/OO14route66/Model.java
diff options
context:
space:
mode:
authorCamil Staps2015-05-28 23:50:19 +0200
committerCamil Staps2015-05-28 23:50:19 +0200
commita8281523e2bbee4a1b4688f175896fe9c6b30c55 (patch)
treef519960e5c48f215edf8a4f1a75917200f329eb4 /Week14 Route 66/src/OO14route66/Model.java
parentStart w14 (diff)
This does seem to work a bit... kindof...
Diffstat (limited to 'Week14 Route 66/src/OO14route66/Model.java')
-rw-r--r--Week14 Route 66/src/OO14route66/Model.java13
1 files changed, 8 insertions, 5 deletions
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<JFrame> views;
@@ -25,10 +24,10 @@ public class Model extends Observable
* Constructor: create all cars
*/
public Model() {
- views = new ArrayList<JFrame>();
+ 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