Index: trunk/src/tmcsim/client/CADClockDisplay.java
===================================================================
--- trunk/src/tmcsim/client/CADClient.java	(revision 33)
+++ trunk/src/tmcsim/client/CADClockDisplay.java	(revision 54)
@@ -37,5 +37,5 @@
  * between the CAD Client and the CAD Simulator. The CADClientModel object is
  * instantiated and the CAD Client registers itself with the CAD Simulator.
- * Finally, the CADClientView is initialized, the model-view and observer
+ * Finally, the CADClockView is initialized, the model-view and observer
  * relationships are established, and the view is shown.<br>
  * <br>
@@ -61,5 +61,5 @@
  */
 
-public class CADClient extends UnicastRemoteObject implements
+public class CADClockDisplay extends UnicastRemoteObject implements
         CADClientInterface {
 
@@ -96,9 +96,9 @@
     private CADClientModel theClientScreenModel;
 
-    /** Instance of the CADClientView. */
-    private CADClientView theClientScreenView;
-
-    /**
-     * Instance of the CADCLientGUI Replaces CADClientView
+    /** Instance of the CADClockView. */
+    private CADClockView theClientScreenView;
+
+    /**
+     * Instance of the CADCLientGUI Replaces CADClockView
      */
     private CADClientGUI theClientGUI;
@@ -131,5 +131,5 @@
      *            containing configuration data.
      */
-    public CADClient(String propertiesFile) throws SimulationException,
+    public CADClockDisplay(String propertiesFile) throws SimulationException,
             RemoteException {
         if (!verifyProperties(propertiesFile))
@@ -155,5 +155,5 @@
         // Instantiate the CADScreenView and set up the model-view observer
         // relationship.
-        theClientScreenView = new CADClientView(theClientScreenModel);
+        theClientScreenView = new CADClockView(theClientScreenModel);
         theClientScreenView.setVisible(false);
 
@@ -163,102 +163,102 @@
         // modify in parallel
         // This is required to perform powerline commands on the data
-        theClientGUI = new CADClientGUI();
+//        theClientGUI = new CADClientGUI();
 
         // Each screen of the UI should have a reference to either it's parent
         // object or the main client
         // This ensures they all have access to each other and the data model
-        theClientGUI.screen = new ScreenManager(theCoorInt);
-        theClientGUI.login = new Login();
-        theClientGUI.client = this;
+//        theClientGUI.screen = new ScreenManager(theCoorInt);
+//        theClientGUI.login = new Login();
+//        theClientGUI.client = this;
 
         // setup keyboard settings for CAD Client
-        if (cadClientProp.getProperty(PROPERTIES.KEYBOARD_TYPE.name).trim()
-                .equals("CAD")) {
-            CADEnums.CAD_KEYS.setupCADKeyboard();
-        }
-        // STD
-        else {
-            CADEnums.CAD_KEYS.setupStandardKeyboard();
-        }
-
-        theClientScreenModel.addObserver(theClientScreenView);
-
-        // Initialize the display
-        if (cadClientProp.getProperty(PROPERTIES.DISPLAY_TYPE.name).equals(
-                "FULL_SCREEN")) {
-
-            theClientScreenView.addWindowListener(new WindowListener() {
-                public void windowClosed(WindowEvent e) {
-                }
-
-                public void windowOpened(WindowEvent e) {
-                }
-
-                public void windowIconified(WindowEvent e) {
-                }
-
-                public void windowDeiconified(WindowEvent e) {
-                }
-
-                public void windowActivated(WindowEvent e) {
-                }
-
-                public void windowDeactivated(WindowEvent e) {
-                }
-
-                public void windowClosing(WindowEvent e) {
-
-                    try {
-                        theClientSocket.closeSocket();
-                    } catch (SimulationException se) {
-                    }
-
-                    System.exit(0);
-                }
-            });
-
-            theClientScreenView.initWindow();
-            theClientScreenView.setVisible(false);
-        } else {
-            JFrame cadFrame = new JFrame("CAD Client");
-            cadFrame.add(theClientScreenView.initBox());
-            cadFrame.setSize(800, 600);
-
-            cadFrame.addWindowListener(new WindowListener() {
-                public void windowClosed(WindowEvent e) {
-                }
-
-                public void windowOpened(WindowEvent e) {
-                }
-
-                public void windowIconified(WindowEvent e) {
-                }
-
-                public void windowDeiconified(WindowEvent e) {
-                }
-
-                public void windowActivated(WindowEvent e) {
-                }
-
-                public void windowDeactivated(WindowEvent e) {
-                }
-
-                public void windowClosing(WindowEvent e) {
-
-                    try {
-                        theClientSocket.closeSocket();
-                    } catch (SimulationException se) {
-                    }
-
-                    System.exit(0);
-                }
-            });
-
-            cadFrame.setVisible(true);
-        }
-
-        // Create the CAD Client thread to run the CADClientModel Object.
-        Thread clientThread = new Thread(theClientScreenModel);
-        clientThread.start();
+//        if (cadClientProp.getProperty(PROPERTIES.KEYBOARD_TYPE.name).trim()
+//                .equals("CAD")) {
+//            CADEnums.CAD_KEYS.setupCADKeyboard();
+//        }
+//        // STD
+//        else {
+//            CADEnums.CAD_KEYS.setupStandardKeyboard();
+//        }
+//
+//        theClientScreenModel.addObserver(theClientScreenView);
+//
+//        // Initialize the display
+//        if (cadClientProp.getProperty(PROPERTIES.DISPLAY_TYPE.name).equals(
+//                "FULL_SCREEN")) {
+//
+//            theClientScreenView.addWindowListener(new WindowListener() {
+//                public void windowClosed(WindowEvent e) {
+//                }
+//
+//                public void windowOpened(WindowEvent e) {
+//                }
+//
+//                public void windowIconified(WindowEvent e) {
+//                }
+//
+//                public void windowDeiconified(WindowEvent e) {
+//                }
+//
+//                public void windowActivated(WindowEvent e) {
+//                }
+//
+//                public void windowDeactivated(WindowEvent e) {
+//                }
+//
+//                public void windowClosing(WindowEvent e) {
+//
+//                    try {
+//                        theClientSocket.closeSocket();
+//                    } catch (SimulationException se) {
+//                    }
+//
+//                    System.exit(0);
+//                }
+//            });
+//
+//            theClientScreenView.initWindow();
+//            theClientScreenView.setVisible(false);
+//        } else {
+//            JFrame cadFrame = new JFrame("CAD Client");
+//            cadFrame.add(theClientScreenView.initBox());
+//            cadFrame.setSize(800, 600);
+//
+//            cadFrame.addWindowListener(new WindowListener() {
+//                public void windowClosed(WindowEvent e) {
+//                }
+//
+//                public void windowOpened(WindowEvent e) {
+//                }
+//
+//                public void windowIconified(WindowEvent e) {
+//                }
+//
+//                public void windowDeiconified(WindowEvent e) {
+//                }
+//
+//                public void windowActivated(WindowEvent e) {
+//                }
+//
+//                public void windowDeactivated(WindowEvent e) {
+//                }
+//
+//                public void windowClosing(WindowEvent e) {
+//
+//                    try {
+//                        theClientSocket.closeSocket();
+//                    } catch (SimulationException se) {
+//                    }
+//
+//                    System.exit(0);
+//                }
+//            });
+//
+//            cadFrame.setVisible(true);
+//        }
+//
+//        // Create the CAD Client thread to run the CADClientModel Object.
+//        Thread clientThread = new Thread(theClientScreenModel);
+//        clientThread.start();
 
         ensureProperShutdown();
@@ -482,5 +482,5 @@
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new CADClient(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+            new CADClockDisplay(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
          
         } catch (Exception e) {