Changeset 103 in tmcsimulator for trunk/src/atmsdriver/model/FEPLine.java

Timestamp:

10/12/2017 12:28:28 AM (9 years ago)

Author:

jtorres

Message:

trunk/src/atmsdriver/ConsoleDriver.java: Created console driver for ATMSDriver, completed and very nice. Still need to apply correct vol/occ values to actually change the colors. Still need to write a JUnit test for it. trunk/src/atmsdriver/ATMSDriver.java: Refactored to run the console driver. ATMSDriver runs in thread, console driver runs, and they share the highways instance. Renamed NetworkLoader?.java to FEPLineLoader.java. trunk/src/atmsdriver/model/Highways.java: refactored loadHighways() method to conform to new undirected highway abstraction. trunk/src/atmsdriver/model/Station.java: added updateByDirection(DIRECTION dir) method and supporting utility methods. trunk/test/atmsdriver/model/LoadHighwaysTest.java: Conformed LoadHighways? test to new undirected highway abstraction. trunk/test/atmsdriver/model/StationTest.java: Conformed StationTest?.java to new changes - very minor stuff. Went through all model classes and changed any final privates with a getter method to final public, for good OOP practice and simplicity. Went through ALL FILES and commented everything very well. minor application custom configuration changes. Removed all .class or .o.d files from svn repository

File:

• trunk/src/atmsdriver/model/FEPLine.java (modified) (3 diffs)

trunk/src/atmsdriver/model/FEPLine.java

@@ -4 +4 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
-
 
 /** An FEPLine is a simulated line of communication from the FEP to 
@@ -18 +16 @@
 public class FEPLine {
     /* Static FEPLine meta data */
-    final private int lineNum;
-    final private List<Station> stations;
+    final public int lineNum;
+    final public List<Station> stations;
     final private int count;
-    // NOT SURE IF NEXT IS FINAL
+    
     final private int schedule;
     final private int lineInfo;
     final private long systemKey;
+    
+    // THESE WILL NEED TO BE UPDATED MAYBE, NOT SURE, NOT A PRIORITY. SEE METHOD
+    // UPDATESEQUENCES()
     private long globalSeq;
     private long scheduleSeq;
@@ -40 +41 @@
         this.globalSeq = globalSeq;
         this.scheduleSeq = scheduleSeq;
-    }
-    
-    public int getLineNumber()
-    {
-        return this.lineNum;
-    }
-    
-    public List<Station> getStations()
-    {
-        return this.stations;
     }