Changeset 124 in tmcsimulator for trunk/src

Timestamp:

10/15/2017 04:30:50 PM (9 years ago)

Author:

jdalbey

Message:

CADClientVew.java Changed to action when server drops to hard exit because Windows was just hanging the app. More renaming.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/viewer/CADServerViewer.java (moved) (moved from trunk/src/tmcsim/cadsimulator/viewer/CADSimulatorViewer.java) (3 diffs)
• cadsimulator/viewer/actions/ExitAction.java (modified) (2 diffs)
• client/CADClientView.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 15 Oct 2017 17:03:46 -0700
+#Sun, 15 Oct 2017 17:38:51 -0700
 
-Application.revision=122
+Application.revision=123
 
-Application.buildnumber=52
+Application.buildnumber=53

trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java

@@ -25 +25 @@
 /**
  * This class provides a GUI to view current status information for the CAD
- * Simulator.
+ * Server.
  *
  * @see SimulationStatusPanel
@@ -33 +33 @@
  */
 @SuppressWarnings("serial")
-public class CADSimulatorViewer extends JFrame implements CADViewer
+public class CADServerViewer extends JFrame implements CADViewer
 {
 
@@ -52 +52 @@
      * Constructor.
      */
-    public CADSimulatorViewer()
+    public CADServerViewer()
     {
         super();
-        setTitle("CAD Simulator " + getAppVersion());
+        setTitle("CAD Server " + getAppVersion());
 
         initComponents();

trunk/src/tmcsim/cadsimulator/viewer/actions/ExitAction.java

@@ -3 +3 @@
 import java.awt.event.ActionEvent;
 import javax.swing.AbstractAction;
-import tmcsim.cadsimulator.viewer.CADSimulatorViewer;
+import tmcsim.cadsimulator.viewer.CADServerViewer;
 
 /**
@@ -19 +19 @@
      * Reference to the CADSimulatorViewer.
      */
-    private CADSimulatorViewer theViewer;
+    private CADServerViewer theViewer;
 
-    public ExitAction(CADSimulatorViewer viewer)
+    public ExitAction(CADServerViewer viewer)
     {
         super("Exit");

trunk/src/tmcsim/client/CADClientView.java

@@ -48 +48 @@
  * Main Text Area, and Footer.  User input is handled by the Command Line Pane.
  * Any commands are sent to the model which are then transmitted to the
- * CAD Simulator.  The view keeps track of current CAD Screen Number and the
+ * CAD Server.  The view keeps track of current CAD Screen Number and the
  * current page being displayed on each screen.  This allows for the screen
  * refresh and cycle commands to return the screen to its previous page. 
@@ -645 +645 @@
         {
             JOptionPane.showMessageDialog(this, 
-                    "Connection to the CAD Simulator has been lost.  " +
+                    "Connection to the CAD Server has been lost.  " +
                     "Restart the CAD Client.", "Connection Error", 
                     JOptionPane.ERROR_MESSAGE); 
-            return;
+            //return;
+            // Changed to hard exit because Windows was hanging here
+            System.exit(-1);
         }