Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 89)
+++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 90)
@@ -100,37 +100,38 @@
         }
 
-    /*
-    *   Popup menu for incident actions
-     */
-    private JPopupMenu createPopup()
-    {
-        JPopupMenu menu = new JPopupMenu();
-        JMenuItem eventsMenuItem = new JMenuItem("Events");
-        JMenuItem propsMenuItem = new JMenuItem("Properties");
-        JMenuItem deleteMenuItem = new JMenuItem("Delete");
-        eventsMenuItem.setActionCommand("Edit Events");
-        propsMenuItem.setActionCommand("Modify Incident Properties");
-        deleteMenuItem.setActionCommand("Delete Incident");
-
-        PopupMenuItemListener menuItemListener = new PopupMenuItemListener();
-
-        eventsMenuItem.addActionListener(menuItemListener);
-        propsMenuItem.addActionListener(menuItemListener);
-        deleteMenuItem.addActionListener(menuItemListener);
-
-        menu.add(eventsMenuItem);
-        menu.add(propsMenuItem);
-        menu.add(deleteMenuItem);
-        return menu;
-    }
-
-    class PopupMenuItemListener implements ActionListener
-    {
-
-        public void actionPerformed(ActionEvent e)
-        {
-            JOptionPane.showMessageDialog(null, e.getActionCommand() + " will be handled here.");
-        }
-    }
+        /*
+         *   Popup menu for incident actions
+         */
+        private JPopupMenu createPopup()
+        {
+            JPopupMenu menu = new JPopupMenu();
+            JMenuItem eventsMenuItem = new JMenuItem("Events");
+            JMenuItem propsMenuItem = new JMenuItem("Properties");
+            JMenuItem deleteMenuItem = new JMenuItem("Delete");
+            eventsMenuItem.setActionCommand("Edit Events");
+            propsMenuItem.setActionCommand("Modify Incident Properties");
+            deleteMenuItem.setActionCommand("Delete Incident");
+
+            PopupMenuItemListener menuItemListener = new PopupMenuItemListener();
+
+            eventsMenuItem.addActionListener(menuItemListener);
+            propsMenuItem.addActionListener(menuItemListener);
+            deleteMenuItem.addActionListener(menuItemListener);
+
+            menu.add(eventsMenuItem);
+            menu.add(propsMenuItem);
+            menu.add(deleteMenuItem);
+            return menu;
+        }
+
+        class PopupMenuItemListener implements ActionListener
+        {
+
+            public void actionPerformed(ActionEvent e)
+            {
+                JOptionPane.showMessageDialog(null, e.getActionCommand() + " will be handled here.");
+            }
+        }
+
         @Override
         public void mousePressed(MouseEvent e)
@@ -144,6 +145,7 @@
                 JPopupMenu popup = createPopup();
                 popup.show(e.getComponent(), currentMouseX, currentMouseY);
-            }            
-        }
+            }
+        }
+
         /**
          * Determine if the mouse click happened within a valid timeSlice on
@@ -155,5 +157,5 @@
         public void mouseClicked(MouseEvent e)
         {
-            Editor ed = new Editor(null);
+            Editor ed = null;
             ScriptBuilderFrame f = null;
             IncidentEditorFrame g = null;
@@ -161,5 +163,5 @@
             {
                 f = (ScriptBuilderFrame) getTopLevelAncestor();
-                
+
             }
             else if (getTopLevelAncestor() instanceof IncidentEditorFrame)
@@ -171,5 +173,5 @@
             x = cursorTime = e.getX();
             y = e.getY();
-            
+
             if (e.getX() % ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK
                     > ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK / 2)
@@ -200,5 +202,8 @@
                 for (I_ScriptEvent se : incident.slices.get(newSlice).events)
                 {
-                    ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se);
+                    if (ed != null)
+                    {
+                        ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se);
+                    }
                 }
             }
@@ -209,21 +214,5 @@
             if (e.getButton() == MouseEvent.BUTTON1)
             {
-                if (getTopLevelAncestor() instanceof ScriptBuilderFrame)
-                {
-                    if (f.currentEventType != null)
-                    {
-                        I_ScriptEvent s = ScriptEvent.factoryByType(f.currentEventType);
-                        ed.addProperty(eventTypeToPropertyMap.get(f.currentEventType), s);
-                        if (incident.slices.get(newSlice) == null)
-                        {
-                            incident.addNewEvent(s, newSlice);
-                        }
-                        else
-                        {
-                            incident.slices.get(newSlice).addEvent(s);
-                        }
-                        f.update(f.getScript(), f.getScript());
-                    }
-                }
+
                 if (getTopLevelAncestor() instanceof IncidentEditorFrame)
                 {
@@ -231,5 +220,8 @@
                     {
                         I_ScriptEvent s = ScriptEvent.factoryByType(g.currentEventType);
-                        ed.addProperty(eventTypeToPropertyMap.get(g.currentEventType), s);
+                        if (ed != null)
+                        {
+                            ed.addProperty(eventTypeToPropertyMap.get(g.currentEventType), s);
+                        }
                         if (incident.slices.get(newSlice) == null)
                         {