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

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.

Location:

trunk/src/event/editor

Files:

• AudioPanel.java (modified) (1 diff)
• CADLogPanel.java (modified) (2 diffs)
• CHPRadioPanel.java (modified) (6 diffs)
• CMSEvaluationPanel.java (modified) (4 diffs)
• MaintenanceRadioPanel.java (modified) (1 diff)
• ParamicsPanel.java (modified) (1 diff)
• TMTRadioPanel.java (modified) (2 diffs)
• TowPanel.java (modified) (1 diff)
• UnitPanel.java (modified) (1 diff)
• WitnessPanel.java (modified) (1 diff)

trunk/src/event/editor/AudioPanel.java

@@ -50 +50 @@
     public void uponClose()
     {
-        event.audioPath = audioFileText.getText();
-        try
+        if (event != null)
         {
-            event.audioLength = Integer.parseInt(audioLengthText.getText());
-        }
-        catch (Exception ex)
-        {
+            event.audioPath = audioFileText.getText();
+            try
+            {
+                event.audioLength = Integer.parseInt(audioLengthText.getText());
+            }
+            catch (Exception ex)
+            {
 
+            }
         }
     }

trunk/src/event/editor/CADLogPanel.java

@@ -23 +23 @@
         initComponents();
     }
+
     /**
      * Load the script event associated with this editor panel.
@@ -52 +53 @@
     public void uponClose()
     {
-        event.detail = CadTextField.getText();
+        if (event != null)
+        {
+            event.detail = CadTextField.getText();
+        }
     }
 

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();
+        }
     }
 

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();
+        }
     }
 

trunk/src/event/editor/MaintenanceRadioPanel.java

@@ -45 +45 @@
     public void uponClose()
     {
-        event.message = jTextArea1.getText();
+        if (event != null)
+        {
+            event.message = jTextArea1.getText();
+        }
     }
 

trunk/src/event/editor/ParamicsPanel.java

@@ -96 +96 @@
     public void uponClose()
     {
-        event.locationID = LocationDropdown.getSelectedItem().toString();
-        event.status = StatusDropdown.getSelectedItem().toString();
-        event.type = TypeDropdown.getSelectedItem().toString();
-        for (JCheckBox lane : lanes)
-        {
-            lane.getActionListeners()[0].actionPerformed(new ActionEvent(lane, 0, "record"));
+        if (event != null)
+        {
+            event.locationID = LocationDropdown.getSelectedItem().toString();
+            event.status = StatusDropdown.getSelectedItem().toString();
+            event.type = TypeDropdown.getSelectedItem().toString();
+            for (JCheckBox lane : lanes)
+            {
+                lane.getActionListeners()[0].actionPerformed(new ActionEvent(lane, 0, "record"));
+            }
         }
     }

trunk/src/event/editor/TMTRadioPanel.java

@@ -33 +33 @@
         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;
@@ -45 +45 @@
     public void uponClose()
     {
-        event.message = jTextArea1.getText();
+        if (event != null)
+        {
+            event.message = jTextArea1.getText();
+        }
     }
 

trunk/src/event/editor/TowPanel.java

@@ -86 +86 @@
     public void uponClose()
     {
-        event.towCompany = txtCompany.getText();
-        event.towBeat = txtBeat.getText();
-        event.towConfNum = txtConfirmationNumber.getText();
-        event.towPubNum = txtPublicNumber.getText();
+        if (event != null)
+        {
+            event.towCompany = txtCompany.getText();
+            event.towBeat = txtBeat.getText();
+            event.towConfNum = txtConfirmationNumber.getText();
+            event.towPubNum = txtPublicNumber.getText();
+        }
     }
 

trunk/src/event/editor/UnitPanel.java

@@ -94 +94 @@
     public void uponClose()
     {
-        event.unitNum = txtUnitNumber.getText();
-        event.unitActive = ActiveDropdown.getSelectedItem().toString();
-        event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
-        event.unitStatus = StatusDropdown.getSelectedItem().toString();
+        if (event != null)
+        {
+            event.unitNum = txtUnitNumber.getText();
+            event.unitActive = ActiveDropdown.getSelectedItem().toString();
+            event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
+            event.unitStatus = StatusDropdown.getSelectedItem().toString();
+        }
     }
 

trunk/src/event/editor/WitnessPanel.java

@@ -64 +64 @@
     public void uponClose()
     {
-        event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
-        event.witnessNum = txtPhoneNumber.getText();
-        event.witnessAddress = txtAddress.getText();
+        if (event != null)
+        {
+            event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
+            event.witnessNum = txtPhoneNumber.getText();
+            event.witnessAddress = txtAddress.getText();
+        }
     }