Index: trunk/src/scriptbuilder/gui/application.properties
===================================================================
--- trunk/src/scriptbuilder/gui/application.properties	(revision 111)
+++ trunk/src/scriptbuilder/gui/application.properties	(revision 121)
@@ -1,3 +1,3 @@
-#Tue, 05 Sep 2017 18:53:17 -0700
+#Thu, 14 Sep 2017 11:38:45 -0700
 
 Application.revision=0
Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 118)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 121)
@@ -207,5 +207,5 @@
             {
                 currentEventType = null;
-                newButton = selectButton;
+                newButton = null;
             }
 
@@ -261,5 +261,4 @@
 
         incidentNumberPanel1.update(theIncident);
-        selectButton.addKeyListener(new TimelineKeyListener());
         cadButton.addKeyListener(new TimelineKeyListener());
         cctvButton.addKeyListener(new TimelineKeyListener());
@@ -300,5 +299,4 @@
         eventButtons.add(cctvButton);
         eventButtons.add(chpRadioButton);
-        eventButtons.add(selectButton);
         eventButtons.add(cmsEvalButton);
         eventButtons.add(atmsEvalButton);
@@ -463,5 +461,4 @@
         incidentDescription = new javax.swing.JTextArea();
         incidentNumber = new javax.swing.JTextField();
-        selectButton = new javax.swing.JButton();
         incidentEventsPanel = new javax.swing.JPanel();
         maintenanceRadioButton = new javax.swing.JButton();
@@ -924,17 +921,4 @@
         );
 
-        selectButton.setToolTipText("Select");
-        selectButton.setFocusPainted(false);
-        selectButton.setIconTextGap(0);
-        selectButton.setMargin(new java.awt.Insets(2, 10, 2, 10));
-        selectButton.setPreferredSize(new java.awt.Dimension(30, 25));
-        selectButton.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                selectButtonActionPerformed(evt);
-            }
-        });
-
         incidentEventsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Incident Events"));
 
@@ -1384,6 +1368,5 @@
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGap(46, 46, 46)
                         .addComponent(incidentEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -1413,8 +1396,5 @@
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(evaluationEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addComponent(incidentEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                            .addGroup(layout.createSequentialGroup()
-                                .addGap(47, 47, 47)
-                                .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                            .addComponent(incidentEventsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                     .addGroup(layout.createSequentialGroup()
                         .addGap(9, 9, 9)
@@ -1482,17 +1462,22 @@
     }//GEN-LAST:event_editEventListActionPerformed
 
-    /**
-     * Deselects new event type upon click of blank "select" button.
-     *
-     * @param evt the button press event
-     */
-    private void selectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectButtonActionPerformed
-        currentEventType = null;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
+    private void toggleEventButton(JButton btn, ScriptEventType evt)
+    {
+        if (btn.isSelected())
+        {
+            currentEventType = null;
+
+            btn.setSelected(false);
         }
-        selectButton.setSelected(true);
-    }//GEN-LAST:event_selectButtonActionPerformed
+        else
+        {
+            currentEventType = evt;
+            for (JButton eb : eventButtons)
+            {
+                eb.setSelected(false);
+            }
+            btn.setSelected(true);
+        }
+    }
 
     /**
@@ -1503,10 +1488,5 @@
      */
     private void cadButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cadButtonActionPerformed
-        currentEventType = ScriptEventType.CAD_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        cadButton.setSelected(true);
+        toggleEventButton(cadButton, ScriptEventType.CAD_EVENT);
     }//GEN-LAST:event_cadButtonActionPerformed
 
@@ -1518,10 +1498,5 @@
      */
     private void cctvButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cctvButtonActionPerformed
-        currentEventType = ScriptEventType.CCTV_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        cctvButton.setSelected(true);
+        toggleEventButton(cctvButton, ScriptEventType.CCTV_EVENT);
     }//GEN-LAST:event_cctvButtonActionPerformed
 
@@ -1533,10 +1508,5 @@
      */
     private void chpRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_chpRadioButtonActionPerformed
-        currentEventType = ScriptEventType.CHP_RADIO_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        chpRadioButton.setSelected(true);
+        toggleEventButton(chpRadioButton, ScriptEventType.CHP_RADIO_EVENT);
     }//GEN-LAST:event_chpRadioButtonActionPerformed
 
@@ -1602,10 +1572,5 @@
      */
     private void witnessButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_witnessButtonActionPerformed
-        currentEventType = ScriptEventType.WITNESS_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        witnessButton.setSelected(true);
+        toggleEventButton(witnessButton, ScriptEventType.WITNESS_EVENT);
     }//GEN-LAST:event_witnessButtonActionPerformed
 
@@ -1617,10 +1582,5 @@
      */
     private void unitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_unitButtonActionPerformed
-        currentEventType = ScriptEventType.UNIT_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        unitButton.setSelected(true);
+        toggleEventButton(unitButton, ScriptEventType.UNIT_EVENT);
     }//GEN-LAST:event_unitButtonActionPerformed
 
@@ -1632,10 +1592,5 @@
      */
     private void towButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_towButtonActionPerformed
-        currentEventType = ScriptEventType.TOW_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        towButton.setSelected(true);
+        toggleEventButton(towButton, ScriptEventType.TOW_EVENT);
     }//GEN-LAST:event_towButtonActionPerformed
 
@@ -1647,10 +1602,5 @@
      */
     private void paramicsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_paramicsButtonActionPerformed
-        currentEventType = ScriptEventType.PARAMICS_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        paramicsButton.setSelected(true);
+        toggleEventButton(paramicsButton, ScriptEventType.PARAMICS_EVENT);
     }//GEN-LAST:event_paramicsButtonActionPerformed
 
@@ -1662,10 +1612,5 @@
      */
     private void maintenanceRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_maintenanceRadioButtonActionPerformed
-        currentEventType = ScriptEventType.MAINTENANCE_RADIO_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        maintenanceRadioButton.setSelected(true);
+        toggleEventButton(maintenanceRadioButton, ScriptEventType.MAINTENANCE_RADIO_EVENT);
     }//GEN-LAST:event_maintenanceRadioButtonActionPerformed
 
@@ -1677,10 +1622,5 @@
      */
     private void atmsEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_atmsEvalButtonActionPerformed
-        currentEventType = ScriptEventType.ATMS_EVAL_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        atmsEvalButton.setSelected(true);
+        toggleEventButton(atmsEvalButton, ScriptEventType.ATMS_EVAL_EVENT);
     }//GEN-LAST:event_atmsEvalButtonActionPerformed
 
@@ -1692,10 +1632,5 @@
      */
     private void telephoneButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_telephoneButtonActionPerformed
-        currentEventType = ScriptEventType.TELEPHONE_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        telephoneButton.setSelected(true);
+        toggleEventButton(telephoneButton, ScriptEventType.TELEPHONE_EVENT);
     }//GEN-LAST:event_telephoneButtonActionPerformed
 
@@ -1707,10 +1642,5 @@
      */
     private void tmtRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_tmtRadioButtonActionPerformed
-        currentEventType = ScriptEventType.TMT_RADIO_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        tmtRadioButton.setSelected(true);
+        toggleEventButton(tmtRadioButton, ScriptEventType.TMT_RADIO_EVENT);
     }//GEN-LAST:event_tmtRadioButtonActionPerformed
 
@@ -1722,10 +1652,5 @@
      */
     private void cmsEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cmsEvalButtonActionPerformed
-        currentEventType = ScriptEventType.CMS_EVAL_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        cmsEvalButton.setSelected(true);
+        toggleEventButton(cmsEvalButton, ScriptEventType.CMS_EVAL_EVENT);
     }//GEN-LAST:event_cmsEvalButtonActionPerformed
 
@@ -1737,10 +1662,5 @@
      */
     private void cadEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cadEvalButtonActionPerformed
-        currentEventType = ScriptEventType.CAD_EVAL_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        cadEvalButton.setSelected(true);
+        toggleEventButton(cadEvalButton, ScriptEventType.CAD_EVAL_EVENT);
     }//GEN-LAST:event_cadEvalButtonActionPerformed
 
@@ -1752,10 +1672,5 @@
      */
     private void activityLogEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_activityLogEvalButtonActionPerformed
-        currentEventType = ScriptEventType.ACTIVITY_LOG_EVAL_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        activityLogEvalButton.setSelected(true);
+        toggleEventButton(activityLogEvalButton, ScriptEventType.ACTIVITY_LOG_EVAL_EVENT);
     }//GEN-LAST:event_activityLogEvalButtonActionPerformed
 
@@ -1767,10 +1682,5 @@
      */
     private void radioEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_radioEvalButtonActionPerformed
-        currentEventType = ScriptEventType.RADIO_EVAL_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        radioEvalButton.setSelected(true);
+        toggleEventButton(radioEvalButton, ScriptEventType.RADIO_EVAL_EVENT);
     }//GEN-LAST:event_radioEvalButtonActionPerformed
 
@@ -1782,10 +1692,5 @@
      */
     private void facilitatorEvalButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_facilitatorEvalButtonActionPerformed
-        currentEventType = ScriptEventType.FACILITATOR_EVAL_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        facilitatorEvalButton.setSelected(true);
+        toggleEventButton(facilitatorEvalButton, ScriptEventType.FACILITATOR_EVAL_EVENT);
     }//GEN-LAST:event_facilitatorEvalButtonActionPerformed
 
@@ -1797,10 +1702,5 @@
      */
     private void audioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_audioButtonActionPerformed
-        currentEventType = ScriptEventType.AUDIO_EVENT;
-        for (JButton eb : eventButtons)
-        {
-            eb.setSelected(false);
-        }
-        audioButton.setSelected(true);
+        toggleEventButton(audioButton, ScriptEventType.AUDIO_EVENT);
     }//GEN-LAST:event_audioButtonActionPerformed
 
@@ -1968,5 +1868,4 @@
     private javax.swing.JScrollPane scriptEventsPane;
     private javax.swing.JPanel scriptEventsPanel;
-    private javax.swing.JButton selectButton;
     private javax.swing.JSlider sliderBackgroundNoise;
     private javax.swing.JSlider sliderLaneClosures;
Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form	(revision 118)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form	(revision 121)
@@ -448,6 +448,5 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="selectButton" min="-2" pref="40" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace min="-2" pref="46" max="-2" attributes="0"/>
                       <Component id="incidentEventsPanel" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
@@ -484,8 +483,4 @@
                           <Component id="evaluationEventsPanel" alignment="0" min="-2" max="-2" attributes="1"/>
                           <Component id="incidentEventsPanel" alignment="0" min="-2" max="-2" attributes="1"/>
-                          <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace min="-2" pref="47" max="-2" attributes="0"/>
-                              <Component id="selectButton" min="-2" pref="55" max="-2" attributes="1"/>
-                          </Group>
                       </Group>
                   </Group>
@@ -796,20 +791,4 @@
       </SubComponents>
     </Container>
-    <Component class="javax.swing.JButton" name="selectButton">
-      <Properties>
-        <Property name="toolTipText" type="java.lang.String" value="Select"/>
-        <Property name="focusPainted" type="boolean" value="false"/>
-        <Property name="iconTextGap" type="int" value="0"/>
-        <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[2, 10, 2, 10]"/>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[30, 25]"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="selectButtonActionPerformed"/>
-      </Events>
-    </Component>
     <Container class="javax.swing.JPanel" name="incidentEventsPanel">
       <Properties>