Changeset 445 in tmcsimulator for trunk

Timestamp:

07/14/2019 03:37:52 PM (7 years ago)

Author:

jdalbey

Message:

Changed restart dialog in CADClientView to a non-modal one to fix #159. Shortened exception log messages in other client modules.

Location:

trunk/src

Files:

• python/unifiedlogger/wing_project.wpr (modified) (1 diff)
• tmcsim/application.properties (modified) (1 diff)
• tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (1 diff)
• tmcsim/client/CADClient.java (modified) (1 diff)
• tmcsim/client/CADClientModel.java (modified) (1 diff)
• tmcsim/client/CADClientView.java (modified) (3 diffs)
• tmcsim/client/cadclientgui/screens/AssignedIncidents.java (modified) (1 diff)
• tmcsim/client/cadclientgui/screens/PendingIncidents.java (modified) (1 diff)
• tmcsim/client/cadclientgui/screens/UnitStatus.java (modified) (1 diff)
• tmcsim/simulationmanager/SimulationManagerModel.java (modified) (1 diff)

trunk/src/python/unifiedlogger/wing_project.wpr

@@ -506 +506 @@
                  'traversal_pos': ((0,
                                     4),
-                                   1563131442.756592),
+                                   1563131506.336019),
                  'user_data': {}},
         'window-alloc': (29,

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 14 Jul 2019 12:12:07 -0700
+#Sun, 14 Jul 2019 16:45:46 -0700
 
-Application.revision=443
+Application.revision=444
 
-Application.buildnumber=152
+Application.buildnumber=154

trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

@@ -422 +422 @@
                 catch (FileNotFoundException ex)
                 {
-                    Logger.getLogger(GoogleMapAnimator.class.getName()).log(Level.SEVERE, null, ex);
+                    Logger.getLogger(TrafficModelManager.class.getName()).log(Level.SEVERE, null, ex);
                 }
                 // Wait for Google Map to process the data we just sent

trunk/src/tmcsim/client/CADClient.java

@@ -513 +513 @@
                     theCoorInt.unregisterForCallback(client);
                 } catch (RemoteException e) {
-                    e.printStackTrace();
+                    cadClientLogger.logp(Level.WARNING, "CADClient.java", "Main",
+                    "Error unregistering in ensureProperShutdown().");
                 }
             }

trunk/src/tmcsim/client/CADClientModel.java

@@ -132 +132 @@
                 receiveObject(in.readObject());                 
             }
-            catch (EOFException eofe) {
+/*            catch (EOFException eofe) {
                 clientLogger.logp(Level.SEVERE, "CADClientModel", "run()", 
                         "Exception in reading object from input stream.", eofe);
-            }
+            }*/
             catch (Exception e) {
                 clientLogger.logp(Level.SEVERE, "CADClientModel", "run()", 

trunk/src/tmcsim/client/CADClientView.java

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
@@ -14 +16 @@
 import javax.swing.Box;
 import javax.swing.BoxLayout;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
@@ -639 +642 @@
      *</table>
      */
-    public void update(Observable o, Object arg) {
-        
-        
+    public void update(Observable o, Object arg) 
+    {        
         if(arg == null) 
         {
-            JOptionPane.showMessageDialog(this, 
-                    "Connection to the CAD Server has been lost.  " +
-                    "Restart the CAD Client.", "Connection Error", 
-                    JOptionPane.ERROR_MESSAGE); 
+             final JOptionPane pane = new JOptionPane("Connection to the CAD Server has been lost.  " +
+                    "Restart the CAD Client.");
+             JDialog dialog = pane.createDialog(this, "Connection Error");
+             dialog.setModal(false); // don't block background components
+             // Listen for dialog closing
+             dialog.addComponentListener(new ComponentAdapter() 
+             {
+                @Override
+                public void componentHidden(ComponentEvent e) 
+                {
+                    System.exit(-1);  // force hard exit
+                }
+             });
+             dialog.setVisible(true);
+            
+//            JOptionPane.showMessageDialog(this, 
+//                    "Connection to the CAD Server has been lost.  " +
+//                    "Restart the CAD Client.", "Connection Error", 
+//                    JOptionPane.ERROR_MESSAGE); 
             //return;
             // Changed to hard exit because Windows was hanging here
-            System.exit(-1);
+            //System.exit(-1);
         }
-        
+        else
+        {
         ObserverMessage oMessage = (ObserverMessage)arg;
     
-        switch(oMessage.type) {
-            case INCIDENT_INQUIRY:
-                IncidentInquiryModel iiModel = (IncidentInquiryModel)oMessage.value;
-                
-                CADMainPane   = new II_IncidentInquiry(iiModel, mainTextPane.getDocument());
-                CADMainPane.addObserver(CADFooterPane);
-                
-                if(!pageLocationSaved)
-                    pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
-                
-                updateViews(iiModel);               
-                
-                break;
-                
-            case INCIDENT_SUMMARY:
-                IncidentSummaryModel isModel = (IncidentSummaryModel)oMessage.value;
-                
-                CADMainPane   = new SA_IncidentSummary(isModel, mainTextPane.getDocument());
-                CADMainPane.addObserver(CADFooterPane);
-                
-                if(!pageLocationSaved)
-                    pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
-                
-                updateViews(isModel);
-                break;
-                
-            case INCIDENT_BOARD:
-                IncidentBoardModel ibModel = (IncidentBoardModel)oMessage.value;
-            
-                CADMainPane   = new IB_IncidentBoard(ibModel, mainTextPane.getDocument());
-                CADMainPane.addObserver(CADFooterPane);     
-                
-                if(!pageLocationSaved)
-                    pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
-                
-                updateViews(ibModel);
-                break;
-                
-            case ROUTED_MESSAGE:
-                RoutedMessageModel rmModel = (RoutedMessageModel)oMessage.value;
-            
-                CADMainPane = new TO_RoutedMessage(rmModel, mainTextPane.getDocument());
-                CADMainPane.addObserver(CADFooterPane);
-                
-                if(!pageLocationSaved)
-                    pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
-                
-                updateViews(rmModel);
-                break;
-                
-            case BLANK_SCREEN:
-                BlankScreenModel bsModel = (BlankScreenModel)oMessage.value;
-                
-                CADMainPane = new CADMainView(mainTextPane.getDocument());
-                CADMainPane.addObserver(CADFooterPane); 
-
-                if(!pageLocationSaved)
-                    pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
-                
-                updateViews(bsModel);
-                break;              
-                
-            case SCREEN_UPDATE:
-                CADFooterPane.updateStatus(CADScreenModel.updateStringToMap(
-                        (String)oMessage.value));
-                break;
-                
-            case TIME_UPDATE:
-                CADFooterPane.updateTime((String)oMessage.value);           
-                break;
-                
-            case ROUTED_MESSAGE_COUNT_UPDATE:
-                CADFooterPane.updateRoutedMessageCount((Integer)oMessage.value);
-                break;
-                
-            case ROUTED_MESSAGE_UNREAD_UPDATE:
-                CADFooterPane.updateUnreadMessages((Boolean)oMessage.value);
-                break;
-                
-            case CAD_INFO_MESSAGE:
-                CADFooterPane.displayInfoMessage((String)oMessage.value);
-                break;
-        }           
+            switch(oMessage.type) 
+            {
+                case INCIDENT_INQUIRY:
+                    IncidentInquiryModel iiModel = (IncidentInquiryModel)oMessage.value;
+
+                    CADMainPane   = new II_IncidentInquiry(iiModel, mainTextPane.getDocument());
+                    CADMainPane.addObserver(CADFooterPane);
+
+                    if(!pageLocationSaved)
+                        pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
+
+                    updateViews(iiModel);               
+
+                    break;
+
+                case INCIDENT_SUMMARY:
+                    IncidentSummaryModel isModel = (IncidentSummaryModel)oMessage.value;
+
+                    CADMainPane   = new SA_IncidentSummary(isModel, mainTextPane.getDocument());
+                    CADMainPane.addObserver(CADFooterPane);
+
+                    if(!pageLocationSaved)
+                        pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
+
+                    updateViews(isModel);
+                    break;
+
+                case INCIDENT_BOARD:
+                    IncidentBoardModel ibModel = (IncidentBoardModel)oMessage.value;
+
+                    CADMainPane   = new IB_IncidentBoard(ibModel, mainTextPane.getDocument());
+                    CADMainPane.addObserver(CADFooterPane);     
+
+                    if(!pageLocationSaved)
+                        pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
+
+                    updateViews(ibModel);
+                    break;
+
+                case ROUTED_MESSAGE:
+                    RoutedMessageModel rmModel = (RoutedMessageModel)oMessage.value;
+
+                    CADMainPane = new TO_RoutedMessage(rmModel, mainTextPane.getDocument());
+                    CADMainPane.addObserver(CADFooterPane);
+
+                    if(!pageLocationSaved)
+                        pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
+
+                    updateViews(rmModel);
+                    break;
+
+                case BLANK_SCREEN:
+                    BlankScreenModel bsModel = (BlankScreenModel)oMessage.value;
+
+                    CADMainPane = new CADMainView(mainTextPane.getDocument());
+                    CADMainPane.addObserver(CADFooterPane); 
+
+                    if(!pageLocationSaved)
+                        pageLocationMap.put(currentScreenNum, CADMainPane.getCurrentPage());
+
+                    updateViews(bsModel);
+                    break;              
+
+                case SCREEN_UPDATE:
+                    CADFooterPane.updateStatus(CADScreenModel.updateStringToMap(
+                            (String)oMessage.value));
+                    break;
+
+                case TIME_UPDATE:
+                    CADFooterPane.updateTime((String)oMessage.value);           
+                    break;
+
+                case ROUTED_MESSAGE_COUNT_UPDATE:
+                    CADFooterPane.updateRoutedMessageCount((Integer)oMessage.value);
+                    break;
+
+                case ROUTED_MESSAGE_UNREAD_UPDATE:
+                    CADFooterPane.updateUnreadMessages((Boolean)oMessage.value);
+                    break;
+
+                case CAD_INFO_MESSAGE:
+                    CADFooterPane.displayInfoMessage((String)oMessage.value);
+                    break;
+            }
+        }
     }
     

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

@@ -613 +613 @@
                 assignedIncidentsTable.getRowSorter().setSortKeys(keys);
                 assignedIncidentsTable.getSelectionModel().setSelectionInterval(index, index);
-            } catch (RemoteException e)
-            {
-                e.printStackTrace();
+            } catch (RemoteException ex)
+            {
+                System.out.println("RemoteException in refreshTable method of AssignedIncidents.java");
+                System.out.println(ex.getMessage());
             }
             revalidate();

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

@@ -525 +525 @@
                 pendingIncidentsTable.getRowSorter().setSortKeys(keys);
                 pendingIncidentsTable.getSelectionModel().setSelectionInterval(index, index);
-            } catch (RemoteException e)
-            {
-                e.printStackTrace();
+            } catch (RemoteException ex)
+            {
+                System.out.println("RemoteException in refreshTable method of PendingIncidents.java");
+                System.out.println(ex.getMessage());
+
             }
             revalidate();

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

@@ -1075 +1075 @@
                 unitStatusTable.getRowSorter().setSortKeys(keys);
                 unitStatusTable.getSelectionModel().setSelectionInterval(index, index);
-            } catch (RemoteException e)
-            {
-                e.printStackTrace();
+            } catch (RemoteException ex)
+            {
+                System.out.println("RemoteException in refreshTable method of UnitStatus.java");
+                System.out.println(ex.getMessage());
             }
             revalidate();

trunk/src/tmcsim/simulationmanager/SimulationManagerModel.java

@@ -119 +119 @@
             theCoorInt.unregisterForCallback(this);
             theCoorInt = null;
-        } catch (Exception e)
+        } catch (Exception ex)
         {
             simManagerLogger.logp(Level.SEVERE, "SimulationManagerModel",
                     "closeSimManager", "Exception in unregistering Simulation"
-                    + "Manager from the CAD Simulator.", e);
+                    + "Manager from the CAD Simulator.", ex.getMessage());
         }
     }