Index: trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java
===================================================================
--- trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java	(revision 59)
+++ trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java	(revision 288)
@@ -296,4 +296,13 @@
             public void actionPerformed(ActionEvent arg0)
             {
+                String commentMsg = upperCommentBox.getText().trim();
+                // If any text was entered in upper comment box
+                if (commentMsg.length() > 0)
+                {
+                    /*save text from comment box */
+                    saveComment(commentMsg.toUpperCase());
+                    // Clear the text before closing
+                    upperCommentBox.setText("");
+                }
                 close();
             }
@@ -358,24 +367,6 @@
             public void actionPerformed(ActionEvent arg0)
             {
-                DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
-                DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
-                String[] fields =
-                {
-                    dateFormat.format(new Date()),
-                    timeFormat.format(new Date()),
-                    ScreenManager.getUserName(), // Put username in "Initials" column
-                    "", // "Block" is left blank for now 
-                    commentsNotesField.getText().toUpperCase() // JD
-                };
-                try
-                {
-                    ScreenManager.theCoordinator.addCadDataIncidentTable(
-                            INC_TABLE.COMMENTS_NOTES, incidentId, fields);
-                    ((DefaultTableModel) commentsNotesTable.getModel()).insertRow(0, fields);//JD
-                    //((DefaultTableModel) commentsNotesTable.getModel()).addRow(fields);
-                } catch (RemoteException e)
-                {
-                    e.printStackTrace();
-                }
+                // pull the text from the text area and go save it
+                saveComment(commentsNotesField.getText().toUpperCase());
 
                 commentsNotesField.setText("");
@@ -388,5 +379,35 @@
         };
     }
-
+    
+    /** There are two comment fields on the form so this method performs
+     * the save actions that are common to both fields.
+     * @author jdalbey
+     * @param commentMsg the text of the comment to be saved.
+     */
+    private void saveComment(String commentMsg)
+    {
+                DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy");
+                DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
+                // prepare fields to be added to comment table
+                String[] fields =
+                {
+                    dateFormat.format(new Date()),
+                    timeFormat.format(new Date()),
+                    ScreenManager.getUserName(), // Put username in "Initials" column
+                    "", // "Block" is left blank for now 
+                    commentMsg
+                };
+                try
+                {
+                    // insert a new row in the comment table
+                    ScreenManager.theCoordinator.addCadDataIncidentTable(
+                            INC_TABLE.COMMENTS_NOTES, incidentId, fields);
+                    ((DefaultTableModel) commentsNotesTable.getModel()).insertRow(0, fields);
+                } catch (RemoteException e)
+                {
+                    e.printStackTrace();
+                }
+        
+    }
     // JD Add a mouselistener to the comments table to display a single cell
     //  contents in a popup
@@ -1479,4 +1500,5 @@
 
         jScrollPane11.setViewportView(dataFieldsTable);
+        jScrollPane2.setViewportView(upperCommentBox);
 
         dataFieldsLabel.setText("Data Fields");
@@ -2413,4 +2435,5 @@
     private javax.swing.JTextField userDataTimeField;
     private javax.swing.JTextField userDataTimeStampField;
+    private javax.swing.JTextArea upperCommentBox = new javax.swing.JTextArea();
     // End of variables declaration//GEN-END:variables
 }