Changeset 140 in tmcsimulator-scriptbuilder for trunk/src/event/editor/CHPRadioPanel.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/CHPRadioPanel.java (modified) (6 diffs)

trunk/src/event/editor/CHPRadioPanel.java

@@ -36 +36 @@
         event = (CHPRadioEvent) sei;
         audioText.setText(event.radioFile);
-        
+
         for (int i = 0; i < event.lines.size(); i++)
         {
             ((MyTableModel) dialogTable.getModel()).addRow(event.roles.get(i), event.lines.get(i));
         }
-        addDispatchButton.addActionListener(new ActionListener() {
+        addDispatchButton.addActionListener(new ActionListener()
+        {
 
             public void actionPerformed(ActionEvent e)
@@ -50 +51 @@
             }
         });
-        addFieldButton.addActionListener(new ActionListener() {
+        addFieldButton.addActionListener(new ActionListener()
+        {
 
             public void actionPerformed(ActionEvent e)
@@ -69 +71 @@
                     event.lines.set(e.getLastRow(), dialogTable.getModel().getValueAt(e.getLastRow(), 1).toString());
                 }
-                if(e.getType() == TableModelEvent.DELETE)
+                if (e.getType() == TableModelEvent.DELETE)
                 {
                     event.roles.remove(e.getLastRow());
@@ -76 +78 @@
             }
         });
-        
+
     }
 
@@ -83 +85 @@
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-    
+
     @Override
     public boolean removeAssociatedEvent()
     {
-        ((I_ScriptEvent)event).removeThis();
+        ((I_ScriptEvent) event).removeThis();
         event = null;
         return true;
@@ -95 +97 @@
     public void uponClose()
     {
-        event.radioFile = audioText.getText();
+        if (event != null)
+        {
+            event.radioFile = audioText.getText();
+        }
     }