Changeset 140 in tmcsimulator-scriptbuilder for trunk/src/event/editor/CMSEvaluationPanel.java

Timestamp:

12/22/2017 02:05:13 PM (8 years ago)

Author:

bmcguffin

Message:

Fixed defect #67. Removing an event and then closing the event editor window no longer causes the program to hang; a null check for the event is encountered before taking action upon close of the window.

File:

• trunk/src/event/editor/CMSEvaluationPanel.java (modified) (4 diffs)

trunk/src/event/editor/CMSEvaluationPanel.java

@@ -35 +35 @@
         event = (CMSEvaluationEvent) sei;
         txtID.setText(event.cmsID);
-        
+
         txtLocation.setText(event.location);
-        
+
         txtMessage.setText("");
         for (int i = 0; i < event.message.size(); i++)
@@ -50 +50 @@
             }
         }
-        
+
         addButton.addActionListener(new ActionListener()
         {
@@ -82 +82 @@
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-    
+
     @Override
     public boolean removeAssociatedEvent()
@@ -94 +94 @@
     public void uponClose()
     {
-        event.cmsID = txtID.getText();
-        event.location = txtLocation.getText();
-        event.cmsType = TypeDropdown.getSelectedItem().toString();
+        if (event != null)
+        {
+            event.cmsID = txtID.getText();
+            event.location = txtLocation.getText();
+            event.cmsType = TypeDropdown.getSelectedItem().toString();
+        }
     }