Changeset 64 in tmcsimulator

Timestamp:

03/16/2017 07:28:12 AM (9 years ago)

Author:

jdalbey

Message:

Renamed to ClockClient?, added build target for it.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (9 diffs)
• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/client/ClockClient.java (moved) (moved from trunk/src/tmcsim/client/CADClockDisplay.java) (10 diffs)
• src/tmcsim/client/ClockView.java (moved) (moved from trunk/src/tmcsim/client/CADClockView.java) (3 diffs)
• src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java (modified) (3 diffs)
• src/tmcsim/client/cadclientgui/screens/UnitStatus.java (modified) (3 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -89 +89 @@
 <!--
                 =================
-                LOC counter 
+                LOC counter
                 =================
 -->
@@ -96 +96 @@
               classpath="${workdir}/lib/JavaLOC.jar">
                <arg line="-r -d ${workdir}/src"/>
-        </java>    
-</target>    
+        </java>
+</target>
 <!--
                 =================
@@ -143 +143 @@
                 =================
 -->
-<target description="Build separate jar files for each component of the TMC system." 
+<target description="Build separate jar files for each component of the TMC system."
         name="package-jars" depends="jar">
 
@@ -211 +211 @@
         </manifest>
       </jar>
-      <!-- Remove the following line when we get CADClient to run 
+      <!-- Remove the following line when we get CADClient to run
       <delete file="${deploy.dir}/CADClient.jar"/>-->
-      
+
+      <!--                   *** Build Clock Client Only Jar ***         -->
+      <jar destfile="${deploy.dir}/ClockClient.jar"
+       basedir="${build.dir}/classes"
+       includes="tmcsim/client/ClockClient*.class, tmcsim/client/ClockView.class,
+        tmcsim/interfaces/**, tmcsim/cadmodels/**, tmcsim/common/**, tmcsim/client/**">
+      <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>
+        <manifest>
+            <attribute name="Main-Class" value="tmcsim.client.ClockClient"/>
+            <attribute name="Implementation-Version" value="${TODAY}"/>
+        </manifest>
+      </jar>
+
       <!--                   *** Build Paramics Communicator Only Jar ***         -->
       <jar destfile="${deploy.dir}/ParamicsCommunicator.jar"
@@ -227 +239 @@
 </target>
 
-<target description="Build separate jar files for each component of the TMC system." 
+<target description="Build separate jar files for each component of the TMC system."
         name="ZipForInstall" depends="package-jars">
     <!-- Notes:    Create a zip file with jars and all external resources for distributing
@@ -240 +252 @@
     <!--
 
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+    There exist several targets which are by default empty and which can be
+    used for execution of your tasks. These targets are usually executed
+    before and after some main targets. They are:
 
       -pre-init:                 called before initialization of project properties
@@ -268 +280 @@
         </target>
 
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    For list of available properties check the imported
+    nbproject/build-impl.xml file.
 
 
     Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+    The targets of interest are:
 
       -init-macrodef-javac:     defines macro for javac compilation
@@ -281 +293 @@
       -do-jar-with-manifest:    JAR building (if you are using a manifest)
       -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
+      run:                      execution of project
       -javadoc-build:           Javadoc generation
       test-report:              JUnit report generation
@@ -293 +305 @@
         </target>
 
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
+    Notice that the overridden target depends on the jar target and not only on
+    the compile target as the regular run target does. Again, for a list of available
     properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file.
 
     -->

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Wed, 15 Mar 2017 11:18:58 -0700
+#Thu, 16 Mar 2017 08:26:10 -0700
 
-Application.revision=58
+Application.revision=63
 
-Application.buildnumber=33
+Application.buildnumber=44

trunk/src/tmcsim/client/ClockClient.java

@@ -4 +4 @@
 import java.awt.event.ActionListener;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.rmi.Naming;
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.Properties;
-import java.util.Vector;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -18 +15 @@
 import javax.swing.Timer;
 import javax.swing.UIManager;
-import tmcsim.client.cadclientgui.CADClientGUI;
 import tmcsim.common.SimulationException;
 import tmcsim.interfaces.CADClientInterface;
@@ -24 +20 @@
 
 /**
- * CADClockDisplay shows the simulation clock time. It operates as a client of
- * the CAD server, using RMI to poll the server every second for the current
+ * ClockClient shows the simulation clock time. It operates as a client of the
+ * CAD server, using RMI to poll the server every second for the current
  * simulation clock time.
+ *
+ * @author jdalbey
  */
-public class CADClockDisplay extends UnicastRemoteObject implements
+public class ClockClient extends UnicastRemoteObject implements
         CADClientInterface
 {
@@ -35 +33 @@
      */
     private static Logger cadClientLogger = Logger.getLogger("tmcsim.client");
+
+    @Override
+    public void refresh() throws RemoteException
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 
     /**
@@ -62 +66 @@
     private CADClientSocket theClientSocket;
     /**
-     * Instance of the CADClientModel.
-     */
-    private CADClientModel theClientScreenModel;
-    /**
-     * Instance of the CADClockView.
-     */
-    private CADClockView theClientScreenView;
-    /**
-     * Instance of the CADCLientGUI Replaces CADClockView
-     */
-    private CADClientGUI theClientGUI;
+     * Instance of the ClockView.
+     */
+    private ClockView theView;
     /**
      * Properties object for the CADClient class.
@@ -95 +91 @@
      * file containing configuration data.
      */
-    public CADClockDisplay(String propertiesFile) throws SimulationException,
+    public ClockClient(String propertiesFile) throws SimulationException,
             RemoteException
     {
@@ -106 +102 @@
                 cadClientProp.getProperty(PROPERTIES.CAD_RMI_PORT.name).trim());
 
-        theClientScreenView = new CADClockView();
-        theClientScreenView.setVisible(true);
+        theView = new ClockView();
+        theView.setVisible(true);
 
         // Create a timer that fetches the simulation time every second.
@@ -117 +113 @@
                 {
                     long simtime = theCoorInt.getCurrentSimulationTime();
-                    theClientScreenView.updateTime("" + formatInterval(simtime));
+                    theView.updateTime("" + formatInterval(simtime));
                 } catch (RemoteException ex)
                 {
-                    Logger.getLogger(CADClockDisplay.class.getName()).log(Level.SEVERE, null, ex);
+                    Logger.getLogger(ClockClient.class.getName()).log(Level.SEVERE, null, ex);
                 }
             }
@@ -199 +195 @@
         }
 
-        try
-        {
-            // If the properties file does not specify a CAD position, prompt
-            // the
-            // user to select one. If the user selects a position, write the
-            // new properties values to the file. If the user cancels, else
-            // throw an exception.
-            if (cadClientProp.getProperty(PROPERTIES.CLIENT_CAD_POS.name) == null)
-            {
-                if (getCADPosition())
-                {
-                    cadClientProp.store(new FileOutputStream(propertiesFile),
-                            "");
-                }
-                else
-                {
-                    throw new SimulationException(
-                            SimulationException.INITIALIZE_ERROR);
-                }
-            }
-
-            // If the properties file does not specifiy a CAD User ID, prompt
-            // the
-            // user to enter a value. If the user enters a valid ID, write the
-            // new properties values to the file. If the user cancels, else
-            // throw an exception.
-            if (cadClientProp.getProperty(PROPERTIES.CLIENT_USER_ID.name) == null)
-            {
-                if (getUserID())
-                {
-                    cadClientProp.store(new FileOutputStream(propertiesFile),
-                            "");
-                }
-                else
-                {
-                    throw new SimulationException(
-                            SimulationException.INITIALIZE_ERROR);
-                }
-            }
-        } catch (IOException ioe)
-        {
-            cadClientLogger.logp(Level.SEVERE, "SimulationManager",
-                    "Constructor",
-                    "Exception in writing to the properties file.");
-            throw new SimulationException(SimulationException.INITIALIZE_ERROR);
-        }
-
-        // Ensure that the properties file has a valid display type
-        if (cadClientProp.getProperty(PROPERTIES.DISPLAY_TYPE.name) == null
-                || (!cadClientProp.getProperty(PROPERTIES.DISPLAY_TYPE.name)
-                .equals("FULL_SCREEN") && !cadClientProp.getProperty(
-                PROPERTIES.DISPLAY_TYPE.name).equals("FRAME")))
-        {
-            cadClientLogger.logp(Level.SEVERE, "SimulationManager",
-                    "Constructor", "Invalid display type.");
-            throw new SimulationException(SimulationException.INITIALIZE_ERROR);
-        }
-
         return true;
     }
 
     /**
-     * This method prompts the user to select a value for the CAD position. If
-     * the user cancels the method returns false, else the Properties object is
-     * updated and true is returned.
-     *
-     * @return True if the user successfully selected a CAD position, false if
-     * not.
-     */
-    private boolean getCADPosition()
-    {
-
-        Vector<Integer> positions = new Vector<Integer>();
-        for (int i = 0; i < 10; i++)
-        {
-            positions.add(i);
-        }
-
-        Object cadPos = null;
-
-        while (true)
-        {
-            cadPos = JOptionPane.showInputDialog(null,
-                    "Please assign this workstation a CAD position number.",
-                    "CAD Position Asignment", JOptionPane.QUESTION_MESSAGE,
-                    null, positions.toArray(), positions.get(0));
-
-            // If the user pressed cancel, confirm the exit and return false.
-            if (cadPos == null)
-            {
-                if (JOptionPane
-                        .showConfirmDialog(
-                        null,
-                        "CAD Client cannot load until a valid CAD "
-                        + "position has been selected.  Do you wish to "
-                        + "cancel loading the CAD Client?",
-                        "Confirm Exit", JOptionPane.YES_NO_OPTION,
-                        JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
-                {
-                    return false;
-                }
-            } // Else the user selected a CAD position, exit the loop.
-            else
-            {
-                break;
-            }
-        }
-
-        cadClientProp.setProperty(PROPERTIES.CLIENT_CAD_POS.name,
-                cadPos.toString());
-        return true;
-    }
-
-    /**
-     * This method prompts the user to enter a 5-character User ID. If the user
-     * cancels the method returns false, else the Properties object is updated
-     * and true is returned.
-     *
-     * @return True if the user successfully selected a CAD position, false if
-     * not.
-     */
-    private boolean getUserID()
-    {
-        String cadUID = null;
-
-        while (true)
-        {
-            cadUID = JOptionPane.showInputDialog(null,
-                    "Please assign this workstation a 6-character CAD "
-                    + "User ID.", "CAD User ID Asignment",
-                    JOptionPane.QUESTION_MESSAGE);
-
-            // /If the user pressed cancel, confirm the exit and return false.
-            if (cadUID == null)
-            {
-                if (JOptionPane.showConfirmDialog(null,
-                        "CAD Client cannot load until a valid User ID "
-                        + "has been entered.  Do you wish to "
-                        + "cancel loading the CAD Client?",
-                        "Confirm Exit", JOptionPane.YES_NO_OPTION,
-                        JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
-                {
-                    return false;
-                }
-            } // If the user does not enter a valid User ID, notify and reprompt.
-            else if (cadUID.length() != 6)
-            {
-                JOptionPane.showMessageDialog(null,
-                        "The User ID must be 6 characters.", "Invalid User ID",
-                        JOptionPane.WARNING_MESSAGE);
-            } // Else the user entered a valid value, exit the loop.
-            else
-            {
-                break;
-            }
-        }
-
-        cadClientProp.setProperty(PROPERTIES.CLIENT_USER_ID.name, cadUID);
-        return true;
-    }
-
-    /**
-     * Construct the CADClient with the properties file path, either from the
-     * command line arguments or default.
-     *
-     * @param args Command line arguments.
-     */
-    public static void main(String[] args)
-    {
-        if (System.getProperty("CONFIG_DIR") == null)
-        {
-            System.setProperty("CONFIG_DIR", "config");
-        }
-
-        try
-        {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            new CADClockDisplay(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
-
-        } catch (Exception e)
-        {
-            cadClientLogger.logp(Level.SEVERE, "SimulationManager", "Main",
-                    "Error initializing application.");
-
-            JOptionPane.showMessageDialog(new JWindow(), e.getMessage(),
-                    "Error - Program Exiting", JOptionPane.ERROR_MESSAGE);
-
-            System.exit(-1);
-        }
-
-    }
-
-    public void refresh()
-    {
-        theClientGUI.screen.refreshScreens();
+     * Format a time in seconds as HH:MM:SS
+     *
+     * @param l
+     * @return
+     */
+    private String formatInterval(final long l)
+    {
+        final long hr = TimeUnit.SECONDS.toHours(l);
+        final long min = TimeUnit.SECONDS.toMinutes(l - TimeUnit.HOURS.toSeconds(hr));
+        final long sec = TimeUnit.SECONDS.toSeconds(l - TimeUnit.HOURS.toSeconds(hr) - TimeUnit.MINUTES.toSeconds(min));
+        return String.format("%02d:%02d:%02d", hr, min, sec);
     }
 
@@ -414 +230 @@
 
     /**
-     * Format a time in seconds as HH:MM:SS
-     *
-     * @param l
-     * @return
-     */
-    private String formatInterval(final long l)
-    {
-        final long hr = TimeUnit.SECONDS.toHours(l);
-        final long min = TimeUnit.SECONDS.toMinutes(l - TimeUnit.HOURS.toSeconds(hr));
-        final long sec = TimeUnit.SECONDS.toSeconds(l - TimeUnit.HOURS.toSeconds(hr) - TimeUnit.MINUTES.toSeconds(min));
-        return String.format("%02d:%02d:%02d", hr, min, sec);
+     * Construct the CADClient with the properties file path, either from the
+     * command line arguments or default.
+     *
+     * @param args Command line arguments.
+     */
+    public static void main(String[] args)
+    {
+        if (System.getProperty("CONFIG_DIR") == null)
+        {
+            System.setProperty("CONFIG_DIR", "config");
+        }
+
+        try
+        {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new ClockClient(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+
+        } catch (Exception e)
+        {
+            cadClientLogger.logp(Level.SEVERE, "SimulationManager", "Main",
+                    "Error initializing application.");
+
+            JOptionPane.showMessageDialog(new JWindow(), e.getMessage(),
+                    "Error - Program Exiting", JOptionPane.ERROR_MESSAGE);
+
+            System.exit(-1);
+        }
+
     }
 }

trunk/src/tmcsim/client/ClockView.java

@@ -16 +16 @@
  * The CADClientView class is the view component to the CAD Client application.
  *
+ * @author jdalbey
  */
 @SuppressWarnings("serial")
-public class CADClockView extends JFrame
+public class ClockView extends JFrame
 {
     /**
@@ -26 +27 @@
     private JPanel mainPane;
     private JLabel currentTime;
+    private final static Dimension SCREEN_SIZE = new Dimension(1100, 255);
 
     /**
      * Constructor. Build panes, add key listeners, and set up observer
-     * relationship between the footer and main panes.
-     *
-     * @param position The CAD position for this client terminal.
+     * relationship between the footer and main panes. TODO: Consider having
+     * screen size and font size in properties file.
      */
-    public CADClockView()
+    public ClockView()
     {
         super("Simulation Clock");
@@ -41 +42 @@
         currentTime.setFont(new Font("Geneva", Font.BOLD, 200));
         mainPane = new JPanel();
-        setSize(new Dimension(1100, 255));
-        setMaximumSize(new Dimension(1100, 255));
-        setMinimumSize(new Dimension(1100, 255));
+        setSize(SCREEN_SIZE);
+        setMaximumSize(SCREEN_SIZE);
+        setMinimumSize(SCREEN_SIZE);
         mainPane.setLayout(new BoxLayout(mainPane, BoxLayout.Y_AXIS));
         mainPane.setBorder(BorderFactory.createLineBorder(Color.black));

trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java

@@ -15 +15 @@
 import java.rmi.RemoteException;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -62 +64 @@
     // labels for the drop down menu
     private JLabel[] dropDownLabels = new JLabel[LABELS.length];
+    private static Logger clientLogger = Logger.getLogger("tmcsim.client");
     private long lastLeftClick;// used for double clicking feature
 
@@ -110 +113 @@
                 {
                     comp = super.prepareRenderer(renderer, row, column);
-                } catch (ArrayIndexOutOfBoundsException ex)
-                {
-                    // our workaround is to just return a dummy value
-                    // all will be redrawn in the next one second interval
+                } catch (Exception ex)
+                {
+                    clientLogger.logp(Level.INFO, "AssignedIncidents",
+                            "prepareRenderer", "row=" + row + " col=" + column, ex);
+
+                    // Our workaround is to just return a dummy value.
+                    // It will be erased in the next one second refresh
                     return new JLabel("?");
                 }

trunk/src/tmcsim/client/cadclientgui/screens/UnitStatus.java

@@ -18 +18 @@
 import java.rmi.RemoteException;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -48 +50 @@
 public class UnitStatus extends JFrame
 {
-    private final int ONE_SECOND = 1000;
+    private final static int ONE_SECOND = 1000;
+    private static Logger clientLogger = Logger.getLogger("tmcsim.client");
     private final String SCREEN_TITLE = "(Shift + F4)  Unit Status";
     private final Dimension SCREEN_DIMENSIONS = new Dimension(1400, 250);
@@ -152 +155 @@
                 {
                     comp = super.prepareRenderer(renderer, row, column);
-                } catch (ArrayIndexOutOfBoundsException ex)
-                {
-                    // our workaround is to just return a dummy value
-                    // all will be redrawn in the next one second interval
+                } catch (Exception ex)
+                {
+                    clientLogger.logp(Level.INFO, "UnitStatus",
+                            "prepareRenderer", "row=" + row + " col=" + column, ex);
+                    // Our workaround is to just return a dummy value.
+                    // It will be erased in the next one second refresh
                     return new JLabel("?");
                 }