Index: trunk/src/atmsdriver/model/Highway.java
===================================================================
--- trunk/src/atmsdriver/model/Highway.java	(revision 87)
+++ trunk/src/atmsdriver/model/Highway.java	(revision 88)
@@ -1,4 +1,5 @@
 package atmsdriver.model;
 
+import atmsdriver.model.Station.DIRECTION;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,15 +10,14 @@
  */
 class Highway {
+    
     final private ArrayList<Station> stations;
+    final private Integer highwayNumber;
+    final private DIRECTION direction;
     
-    public Highway(ArrayList<FEPLine> lines, int highway)
+    public Highway(Integer highwayNum, DIRECTION direction, ArrayList<Station> stations)
     {
-        stations = new ArrayList<Station>();
-        loadHighwayStations(lines);
-    }
-    
-    private void loadHighwayStations(ArrayList<FEPLine> lines)
-    {
-        Collections.sort(stations);
+        this.highwayNumber = highwayNum;
+        this.direction = direction;
+        this.stations = stations;
     }
 }