Index: /trunk/Incidents/inc_189.xml
===================================================================
--- /trunk/Incidents/inc_189.xml	(revision 131)
+++ /trunk/Incidents/inc_189.xml	(revision 132)
@@ -118,5 +118,5 @@
 <!ELEMENT SAMPLE_MESSAGE (CMS_LINE*)>
 <!ELEMENT CMS_LINE (#PCDATA)>]>
-<TMC_SCRIPT title="Full Simulation"><SCRIPT_EVENT><TIME_INDEX>00:00:00</TIME_INDEX>
+<TMC_SCRIPT title="Full Simulation"><SCRIPT_EVENT><TIME_INDEX>01:23:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><MASTER_INC_NUM>145086SLO005</MASTER_INC_NUM>
@@ -180,5 +180,5 @@
 <MAINTENANCE_RADIO>No Maintenance needed on scene for this incident.</MAINTENANCE_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:02:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:25:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-24 1097, PD 1097</DETAIL>
@@ -194,5 +194,5 @@
 </CHP_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:06:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:29:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-19 ENRT FROM I-5 AT SND CYN, 28-13 ENRT FROM I-5 AT 133</DETAIL>
@@ -215,5 +215,5 @@
 </CHP_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:08:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:31:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-11 ENRT FROM I405 AT BRISTOL, 28-07 ENRT FROM SR55 AT DYER</DETAIL>
@@ -245,5 +245,5 @@
 </ATMS_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:09:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:32:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>PD CLOSING JEFFREY AND UNIV DR, SENDING NEGOTIATOR, REQ SIGALERT</DETAIL>
@@ -267,5 +267,5 @@
 </FACILITATOR_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:13:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:36:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-13 1097, 10-23 28-19 B4 CLOSING NB LNS, 1039 DOT FOR SIGN TRUCKS</DETAIL>
@@ -284,5 +284,5 @@
 <MAINTENANCE_RADIO>Get TMT rolling.</MAINTENANCE_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:14:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:37:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-11 1097, CLSNG DWN SB LNS AT CULVER DR OFFR</DETAIL>
@@ -329,5 +329,5 @@
 </CMS_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:15:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:38:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-13, 28-19 SHUTTING DWN NB 405 LNS AT SAND CYN ST OFFR</DETAIL>
@@ -370,5 +370,5 @@
 </CMS_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:16:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:39:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <TELEPHONE><INSTRUCTOR Role="TV Reporter #1">Hello, this is Cameron Stevens at KNOW TV 2.</INSTRUCTOR>
@@ -377,5 +377,5 @@
 </TELEPHONE>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:17:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:40:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-07 1097 ASSTNG 28-11 CLSNG SB LNS AT CULVER OFFR</DETAIL>
@@ -392,5 +392,5 @@
 <TMT_RADIO>If no sign trucks have been requested yet, another phone call needs to be made from CHP Dispatch requesting them.</TMT_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:18:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:41:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-S4 1097 I5 JEFFREY AVE ASSIST</DETAIL>
@@ -410,5 +410,5 @@
 </TELEPHONE>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:20:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:43:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>PD STTNG DETOURS, SB TRFFC OFF AT CULVER AVE, NB TRFFC OFF AT SAND CYN</DETAIL>
@@ -430,5 +430,5 @@
 </ACTIVITY_LOG_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:21:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:44:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NEGOTIATOR 1097</DETAIL>
@@ -445,5 +445,5 @@
 </ACTIVITY_LOG_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:22:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:45:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NB LNS SHUT DOWN</DETAIL>
@@ -458,5 +458,5 @@
 </CHP_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:23:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:46:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SUSP WON'T ALLOW NEGOTIATOR NEAR HIM</DETAIL>
@@ -473,5 +473,5 @@
 </ACTIVITY_LOG_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:24:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:47:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-07 SB LNS SHUT DOWN</DETAIL>
@@ -486,5 +486,5 @@
 </CHP_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:27:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:50:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SUSP IS CALMING DOWN. BOMB SQD 1097</DETAIL>
@@ -502,5 +502,5 @@
 <TMT_RADIO>Call saying the sign trucks are 10-97. Queue update.</TMT_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:31:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:54:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <TELEPHONE><INSTRUCTOR Role="Mayor">"Hello, this is Mayor Krom of Irvine."</INSTRUCTOR>
@@ -509,9 +509,9 @@
 </TELEPHONE>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:33:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>01:56:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <TMT_RADIO>Queue update</TMT_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:38:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:01:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NEGOTIATOR MAKING PROGRESS, SUSP MAY SURRENDER</DETAIL>
@@ -526,5 +526,5 @@
 </CHP_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:39:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:02:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <TELEPHONE><INSTRUCTOR Role="TV Reporter #2">"Hello, this is Fred Roppel at KNOW TV Channel 3."</INSTRUCTOR>
@@ -539,9 +539,9 @@
 </TELEPHONE>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:42:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:05:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <TMT_RADIO>Queue Update</TMT_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:43:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:06:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>MAN TRIED TO DETONATE THE DEVICE, BOMB DIDNT ACTIVATE, PD APPRHNDNG</DETAIL>
@@ -556,5 +556,5 @@
 </CHP_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:45:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:08:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SUSP IN CUSTODY, BOMB SQD INSPECTING BOMB</DETAIL>
@@ -569,9 +569,9 @@
 </CHP_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:46:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:09:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <TMT_RADIO>Queue update</TMT_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:51:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:14:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>CODE A, BOMB DEFUSED, LNS BEING OPENED</DETAIL>
@@ -597,5 +597,5 @@
 <TMT_RADIO>Queue update</TMT_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:53:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:16:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>SB LNS OPN 28-11 28-07 1098</DETAIL>
@@ -626,5 +626,5 @@
 </CMS_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:54:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:17:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>NB LNS OPN 28-13 28-19 1098</DETAIL>
@@ -653,5 +653,5 @@
 </CMS_EVALUATION>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>00:55:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:18:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CAD_DATA><CAD_INCIDENT_EVENT><DETAIL>28-24, 28-S4 1098 PD OPNNG OVRPASS</DETAIL>
@@ -669,5 +669,5 @@
 <TMT_RADIO>Queue update</TMT_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>01:00:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:23:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <TELEPHONE><INSTRUCTOR Role="TV Reporter #1">Hello, this is Cameron Stevens at KCLY Channel 11.</INSTRUCTOR>
@@ -682,5 +682,5 @@
 <MAINTENANCE_RADIO>TMT The traffic is near normal. I'm (we're) 1098.</MAINTENANCE_RADIO>
 </SCRIPT_EVENT>
-<SCRIPT_EVENT><TIME_INDEX>01:17:00</TIME_INDEX>
+<SCRIPT_EVENT><TIME_INDEX>02:40:00</TIME_INDEX>
 <INCIDENT LogNum="189">Suicide Attempt/Bomb Threat</INCIDENT>
 <CMS_EVALUATION cmsID="86" type="remove"><LOCATION>TBD</LOCATION>
Index: /trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- /trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 129)
+++ /trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 132)
@@ -162,8 +162,19 @@
          */
         // Set listener for scroll pane
+        String t = "Script Builder: ";
+        if (script.saveFile == null)
+        {
+            t += "untitled1.xml";
+        }
+        else
+        {
+            t += script.saveFile.getName();
+        }
+        this.setTitle(t);
         AdjustmentListener listener = new MyAdjustmentListener();
         timelinesScrollPane.getHorizontalScrollBar().addAdjustmentListener(listener);
         timelinesScrollPane.getVerticalScrollBar().addAdjustmentListener(listener);
         repaint();
+
     }
 
@@ -260,4 +271,14 @@
                 / Math.max(script.absoluteLength(), ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH));
         zoomSlider.setMaximum(zoomSlider.getMinimum() + 20);
+        String t = "Script Builder: ";
+        if (script.saveFile == null)
+        {
+            t += "untitled1.xml";
+        }
+        else
+        {
+            t += script.saveFile.getName();
+        }
+        this.setTitle(t);
         repaint();
     }
@@ -1700,5 +1721,18 @@
     private void fileSaveAsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveAsActionPerformed
         JFileChooser fc = new JFileChooser();
-
+        boolean wasNull = false;
+        if (script.saveFile == null)
+        {
+            wasNull = true;
+            String fName = "untitled";
+            int untitledCount = 1;
+            while (new File("" + fName + untitledCount + ".xml").exists())
+            {
+                untitledCount++;
+            }
+            script.saveFile = new File("" + fName + untitledCount + ".xml");
+        }
+
+        fc.setSelectedFile(script.saveFile);
         fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)",
                 new String[]
@@ -1709,7 +1743,21 @@
         if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION)
         {
-            script.saveScriptToFile(fc.getSelectedFile());
-            script.saveFile = fc.getSelectedFile();
-        }
+            String filename = fc.getSelectedFile().toString();
+            if (!filename.endsWith(".xml"))
+            {
+                filename += ".xml";
+
+            }
+            script.saveScriptToFile(new File(filename));
+            script.saveFile = new File(filename);
+        }
+        else
+        {
+            if (wasNull)
+            {
+                script.saveFile = null;
+            }
+        }
+        this.update(script, 0);
     }//GEN-LAST:event_fileSaveAsActionPerformed
 
@@ -1885,6 +1933,8 @@
         }
 
+        String fs = System.getProperty("file.separator");
         //Pick the file to save it to
         JFileChooser fc = new JFileChooser();
+        fc.setSelectedFile(new File("" + System.getProperty("user.dir") + fs + "Incidents" + fs + "inc_" + inc.number + ".xml"));
         fc.setFileFilter(new ExtensionFileFilter("Script Incident (.xml)", new String[]
         {
@@ -1893,5 +1943,11 @@
         if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION)
         {
-            inc.saveIncidentToFile(fc.getSelectedFile());
+            String filename = fc.getSelectedFile().toString();
+            if (!filename.endsWith(".xml"))
+            {
+                filename += ".xml";
+
+            }
+            inc.saveIncidentToFile(new File(filename));
         }
     }//GEN-LAST:event_saveIncidentActionPerformed
Index: /trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java
===================================================================
--- /trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java	(revision 128)
+++ /trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java	(revision 132)
@@ -126,7 +126,7 @@
     private ArrayList<ScriptIncident> loadIncidentsFromFiles(String directoryName)
     {
-
+        String fs = System.getProperty("file.separator");
         ArrayList<ScriptIncident> newList = new ArrayList<ScriptIncident>();
-        File folder = new File(directoryName);
+        File folder = new File(""+System.getProperty("user.dir")+fs+directoryName);
 
         File[] incidentFiles;