Changeset 93 in tmcsimulator for trunk/src

Timestamp:

10/11/2017 12:35:22 PM (9 years ago)

Author:

jdalbey

Message:

Highway.java: Removed direction and made immutable

File:

• trunk/src/atmsdriver/model/Highway.java (modified) (1 diff)

trunk/src/atmsdriver/model/Highway.java

@@ -1 +1 @@
 package atmsdriver.model;
 
-import atmsdriver.model.Station.DIRECTION;
 import java.util.ArrayList;
-import java.util.Collections;
 
 /**
+ * Highway represents a freeway that has two directions of traffic. A highway is
+ * identified by its highway number.  A highway contains lane detector stations,
+ * called Stations, along its length.
  *
- * @author jtorres
+ * @author jdalbey
  */
-class Highway {
-    
-    final private ArrayList<Station> stations;
-    final private Integer highwayNumber;
-    final private DIRECTION direction;
-    
-    public Highway(Integer highwayNum, DIRECTION direction, ArrayList<Station> stations)
+final class Highway
+{
+    /** The identifying number for this highway, e.g., 101 */
+    public final Integer highwayNumber;
+    /** The ordered list of stations (lane detector stations) on this highway */
+    public final ArrayList<Station> stations;
+
+    /** Construct a highway 
+     * 
+     * @param highwayNum integer identifier for this highway
+     * @param stations ordered list of stations on this highway
+     */
+    public Highway(Integer highwayNum, ArrayList<Station> stations)
     {
         this.highwayNumber = highwayNum;
-        this.direction = direction;
         this.stations = stations;
     }
-    
-    public Integer getRouteNumber()
-    {
-        return this.highwayNumber;
-    }
-    
-    public DIRECTION getDirection()
-    {
-        return this.direction;
-    }
-    
-    public ArrayList<Station> getStations()
-    {
-        return this.stations;
-    }
 }