Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 53)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 54)
@@ -2677,5 +2677,41 @@
     private void editIncidentActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_editIncidentActionPerformed
     {//GEN-HEADEREND:event_editIncidentActionPerformed
-        new IncidentEditorFrame().setVisible(true);
+        Object[] incidentList = script.incidents.toArray();
+        String input = "";
+        ScriptIncident inc = null;
+        Object result = JOptionPane.showInputDialog(
+                this,
+                "Select Incident:",
+                "Save Incident",
+                JOptionPane.PLAIN_MESSAGE,
+                null,
+                incidentList,
+                script.incidents.get(0));
+
+        System.out.println("RESULT = " + result.toString());
+
+        input = result.toString();
+
+        System.out.println("INPUT = " + input);
+
+        int i = 0;
+        for (ScriptIncident incident : script.incidents)
+        {
+            if (incident == null)
+            {
+                continue;
+            }
+            System.out.println((++i) + ": " + incident.toString());
+            if (incident.toString().equals(input))
+            {
+                inc = incident;
+            }
+        }
+
+        if (inc != null)
+        {
+            new IncidentEditorFrame(inc).setVisible(true);
+        }
+        update(script, script);
     }//GEN-LAST:event_editIncidentActionPerformed