Index: trunk/src/atmsdriver/ATMSDriver.java
===================================================================
--- trunk/src/atmsdriver/ATMSDriver.java	(revision 180)
+++ trunk/src/atmsdriver/ATMSDriver.java	(revision 184)
@@ -17,5 +17,6 @@
  * @version 09/10/2017
  */
-public class ATMSDriver implements Runnable {
+public class ATMSDriver implements Runnable
+{
 
     /**
@@ -36,8 +37,7 @@
      * @see ATMSDriver
      */
-    private static enum PROPERTIES {
-        LDS_FILE_NAME("LDSFileName"),
-        LOOPS_FILE_NAME("LoopsFileName"),
-        HIGHWAY_META_FILE("HighwayMetaFileName"),
+    private static enum PROPERTIES
+    {
+        HIGHWAYS_MAP_FILE_NAME("HighwaysMapFileName"),
         EXCHANGE_FILE_NAME("ExchangeFileName"),
         FEP_WRITER_HOST("FEPWriterHost"),
@@ -46,5 +46,6 @@
         public String name;
 
-        private PROPERTIES(String n) {
+        private PROPERTIES(String n)
+        {
             name = n;
         }
@@ -67,18 +68,23 @@
 
     @Override
-    public void run() {
+    public void run()
+    {
         // Check for packets and update the simulator
-        while (true) {
+        while (true)
+        {
             // Flush the input file
             ExchangeInfo exInfo = exchangeReader.parse(ATMSDriverProperties
                     .getProperty(PROPERTIES.EXCHANGE_FILE_NAME.name));
 
-            try {
+            try
+            {
                 highways.writeToFEP();
-            } catch (SimulationException ex) {
-                            System.out.println("Skipping writeToFEP...");
+            } catch (SimulationException ex)
+            {
+                System.out.println("Skipping writeToFEP...");
             }
             // Update if exchangeInfo is recieved
-            if (exInfo != null) {
+            if (exInfo != null)
+            {
                 // TODO: handle this condition
                 Logger.getLogger("ATMSDriver").log(Level.INFO, "exInfo is not null");
@@ -86,7 +92,9 @@
 
             // Wait for FEP Sim to process the data we just sent
-            try {
+            try
+            {
                 Thread.sleep(SLEEP_TIME);
-            } catch (InterruptedException ie) {
+            } catch (InterruptedException ie)
+            {
                 ie.printStackTrace();
             }
@@ -94,7 +102,9 @@
     }
 
-    public ATMSDriver(String propertiesFile) {
+    public ATMSDriver(String propertiesFile)
+    {
         // verify properties file
-        if (!verifyProperties(propertiesFile)) {
+        if (!verifyProperties(propertiesFile))
+        {
             System.exit(0);
         }
@@ -102,9 +112,5 @@
         highways = new Highways(
                 ATMSDriverProperties.getProperty(
-                                PROPERTIES.LDS_FILE_NAME.name),
-                ATMSDriverProperties.getProperty(
-                                PROPERTIES.LOOPS_FILE_NAME.name),
-                ATMSDriverProperties.getProperty(
-                                PROPERTIES.HIGHWAY_META_FILE.name),
+                        PROPERTIES.HIGHWAYS_MAP_FILE_NAME.name),
                 ATMSDriverProperties.getProperty(PROPERTIES.FEP_WRITER_HOST.name),
                 Integer.parseInt(ATMSDriverProperties.getProperty(
@@ -113,17 +119,20 @@
         exchangeReader = new ExchangeReader();
     }
-    
+
     /**
      * Verifies that the properties file has all necessary properties.
-     * 
+     *
      * @param propertiesFile
-     * @return 
+     * @return
      */
-    private boolean verifyProperties(String propertiesFile) {
+    private boolean verifyProperties(String propertiesFile)
+    {
         // Load the properties file.
-        try {
+        try
+        {
             ATMSDriverProperties = new Properties();
             ATMSDriverProperties.load(new FileInputStream(propertiesFile));
-        } catch (Exception e) {
+        } catch (Exception e)
+        {
             ATMSDriverLogger.logp(Level.SEVERE, "ATMSDriver",
                     "Constructor", "Exception in reading properties file.", e);
@@ -136,19 +145,24 @@
      * Runs the ATMS Driver.
      */
-    public static void main(String[] args) {
-        try {
-            if (System.getProperty("ATMSDRIVER_PROPERTIES") != null) {
+    public static void main(String[] args)
+    {
+        try
+        {
+            if (System.getProperty("ATMSDRIVER_PROPERTIES") != null)
+            {
                 // Create and run the ATMSDriver thread
                 ATMSDriver atmsDriver = new ATMSDriver(System.getProperty("ATMSDRIVER_PROPERTIES"));
                 Thread ATMSDriverThread = new Thread(atmsDriver);
                 ATMSDriverThread.start();
-                
+
                 // run the console driver, pass it the atmsDriver highways model
                 ConsoleTrafficDriver driver = new ConsoleTrafficDriver(atmsDriver.highways);
-                
-            } else {
+
+            } else
+            {
                 throw new Exception("ATMSDRIVER_PROPERTIES system property not defined.");
             }
-        } catch (Exception e) {
+        } catch (Exception e)
+        {
             ATMSDriverLogger.logp(Level.SEVERE, "ATMSDriver", "Main",
                     "Error occured initializing application", e);