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

Timestamp:

11/04/2019 08:14:32 AM (7 years ago)

Author:

sdanthin

Message:

Move from Git to Svn (LARGE COMMIT)

Location:

trunk/src/event/editor

Files:

• TelephonePanel.form (modified) (3 diffs)
• TelephonePanel.java (modified) (7 diffs)
• UnitPanel.form (modified) (6 diffs)
• UnitPanel.java (modified) (15 diffs)
• WitnessPanel.form (modified) (1 diff)
• WitnessPanel.java (modified) (4 diffs)
• frame/Editor.form (modified) (6 diffs)
• frame/Editor.java (modified) (25 diffs)
• frame/PropertyModel.java (modified) (2 diffs)

trunk/src/event/editor/TelephonePanel.form

@@ -84 +84 @@
         <Property name="toolTipText" type="java.lang.String" value="Deletes the selected row in the table"/>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deleteSelectedButtonActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JButton" name="addInstructorButton">
@@ -90 +93 @@
         <Property name="toolTipText" type="java.lang.String" value="Adds a row for instructor dialog in the table"/>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addInstructorButtonActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JTextField" name="txtInstructorRole">
@@ -108 +114 @@
       <Events>
         <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="removeThisProperty"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="removeButtonActionPerformed"/>
       </Events>
     </Component>

trunk/src/event/editor/TelephonePanel.java

@@ -53 +53 @@
             public void keyPressed(KeyEvent e)
             {
+                //this needs to be changed to add the instructor role when a new line is created
                 if (e.getKeyCode() == KeyEvent.VK_ENTER)
                 {
@@ -69 +70 @@
             public void actionPerformed(ActionEvent e)
             {
-                int i = event.roles.size();
-                event.roles.add(txtInstructorRole.getText());
-                event.lines.add("");
+                //this listener was not working as exprected, replaced with netbeans auto generated
+//                int i = event.roles.size();
+//                event.roles.add(txtInstructorRole.getText());
+//                event.lines.add("");
             }
         });
@@ -129 +131 @@
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents()
-    {
+    private void initComponents() {
 
         addStudentButton = new javax.swing.JButton();
@@ -147 +148 @@
         deleteSelectedButton.setText("Delete Selected Line");
         deleteSelectedButton.setToolTipText("Deletes the selected row in the table");
+        deleteSelectedButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                deleteSelectedButtonActionPerformed(evt);
+            }
+        });
 
         addInstructorButton.setText("Add Instructor Line");
         addInstructorButton.setToolTipText("Adds a row for instructor dialog in the table");
+        addInstructorButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                addInstructorButtonActionPerformed(evt);
+            }
+        });
 
         txtInstructorRole.setToolTipText("Specifies the role the instructor plays");
@@ -157 +168 @@
         removeButton.setText("Remove");
         removeButton.setToolTipText("Removes this property");
-        removeButton.addMouseListener(new java.awt.event.MouseAdapter()
-        {
-            public void mouseClicked(java.awt.event.MouseEvent evt)
-            {
+        removeButton.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
                 removeThisProperty(evt);
+            }
+        });
+        removeButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                removeButtonActionPerformed(evt);
             }
         });
@@ -208 +222 @@
 
     private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty
+        //linked to remove button - removes the current buton
         if (removeListener != null)
         {
@@ -213 +228 @@
         }
     }//GEN-LAST:event_removeThisProperty
+
+    private void addInstructorButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addInstructorButtonActionPerformed
+        // TODO add your handling code here:
+        buttonMap.put(addInstructorButton, txtInstructorRole.getText());
+        int i = event.roles.size();
+        event.roles.add(txtInstructorRole.getText());
+        event.lines.add("");
+    }//GEN-LAST:event_addInstructorButtonActionPerformed
+
+    private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_removeButtonActionPerformed
+
+    private void deleteSelectedButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteSelectedButtonActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_deleteSelectedButtonActionPerformed
 
 

trunk/src/event/editor/UnitPanel.form

@@ -23 +23 @@
                   <Group type="102" alignment="0" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="StatusDropdown" pref="475" max="32767" attributes="0"/>
-                          <Component id="txtUnitNumber" alignment="0" pref="475" max="32767" attributes="0"/>
-                      </Group>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="jLabel3" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -41 +30 @@
                           <Component id="ActiveDropdown" alignment="0" pref="475" max="32767" attributes="0"/>
                           <Component id="PrimaryDropdown" alignment="0" pref="475" max="32767" attributes="0"/>
+                      </Group>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jLabel5" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace min="-2" pref="54" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Group type="102" attributes="0">
+                              <Component id="StatusDropdown" pref="419" max="32767" attributes="0"/>
+                              <EmptySpace min="-2" pref="57" max="-2" attributes="0"/>
+                          </Group>
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="unitSelector" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                          </Group>
                       </Group>
                   </Group>
@@ -51 +57 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" pref="47" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="82" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="txtUnitNumber" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="unitSelector" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -71 +77 @@
                   <Component id="ActiveDropdown" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="128" max="32767" attributes="0"/>
+              <EmptySpace pref="100" max="32767" attributes="0"/>
               <Component id="help" min="-2" pref="20" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
@@ -79 +85 @@
   </Layout>
   <SubComponents>
-    <Component class="javax.swing.JLabel" name="jLabel1">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Unit Number"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JFormattedTextField" name="txtUnitNumber">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="  -  "/>
-        <Property name="toolTipText" type="java.lang.String" value=""/>
-      </Properties>
-    </Component>
     <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
@@ -138 +133 @@
     <Component class="javax.swing.JLabel" name="help">
     </Component>
+    <Component class="javax.swing.JLabel" name="jLabel5">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Unit"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JComboBox" name="unitSelector">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="0"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="ancestorAdded" listener="javax.swing.event.AncestorListener" parameters="javax.swing.event.AncestorEvent" handler="unitSelectorAncestorAdded"/>
+        <EventHandler event="mouseEntered" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="unitSelectorMouseEntered"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="unitSelectorActionPerformed"/>
+      </Events>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
+    </Component>
   </SubComponents>
 </Form>

trunk/src/event/editor/UnitPanel.java

@@ -3 +3 @@
 import java.awt.event.*;
 import java.util.Observable;
+import java.util.List;
+import java.util.ArrayList;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.ComboBoxModel;
 import scriptbuilder.structures.events.I_ScriptEvent;
+import scriptbuilder.structures.units.Unit;
 import scriptbuilder.structures.events.UnitEvent;
 
@@ -9 +14 @@
  *
  * @author nathaniellehrer
+ * 
+ * 
  */
 public class UnitPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel
@@ -15 +22 @@
     private ActionListener removeListener;
     private UnitEvent event;
-
+    private List<Unit> units;
+    
+    List<String> names = new ArrayList<String>();
     /**
      * Creates new form UnitPanel
@@ -22 +31 @@
     {
         initComponents();
-
-        txtUnitNumber.addFocusListener(new FocusListener()
-        {
-
-            public void focusGained(FocusEvent e)
-            {
-                help.setText("Unit number is formatted as #-#\t\tExample: 5-5");
-            }
-
-            public void focusLost(FocusEvent e)
-            {
-                help.setText("");
-            }
-
-        });
-    }
-
+        
+        //units = event.slice.getIncident().script.units;
+        
+    }
+
+    /**
+     * Loads the event information into the event editor window.
+     * @param sei  Scriptevent that is being loaded in
+     */
     @Override
     public void getEventObject(I_ScriptEvent sei)
     {
+        
         event = (UnitEvent) sei;
-        txtUnitNumber.setText(event.unitNum);
+        //loads the current unit list into the combobox on re-opening of unit event
+        loadSelector();
         for (int i = 0; i < ActiveDropdown.getItemCount(); i++)
         {
@@ -49 +52 @@
             {
                 ActiveDropdown.setSelectedIndex(i);
+            }
+        }
+        
+        //for each name in the names list
+        for (int i = 0; i < names.size(); i++)
+        {
+            //which event equals which index in the names list?
+            if (event.unitNum.equalsIgnoreCase((String) names.get(i)))
+            {
+                
+                //set the unit selector to the data model value
+                unitSelector.setSelectedIndex(i);
+                
             }
         }
@@ -80 +96 @@
     public void update(Observable o, Object arg)
     {
+        //todo: make supported
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
@@ -90 +107 @@
         return true;
     }
+    
+    
+    private void loadSelector(){
+        //checks if the event is exist
+        if(event != null)
+        {
+            //loads the names list from the top data model
+            loadNames();
+            //asks if the unitselector already has some units added into it
+            
+            if(unitSelector.getModel().equals(new DefaultComboBoxModel(names.toArray())) || (unitSelector.getModel().getSize() == 0))
+            {
+                //if combobox empty, load combobox
+                unitSelector.setModel(new DefaultComboBoxModel(names.toArray()));
+            }
+            
+            
+            
+        }
+        
+    }
+    
+    /**
+     * Loads the unit names from the unit list in SimulationScript
+     */
+    private void loadNames(){
+        //checks if the event is exist
+        if(event!=null)
+        {
+            //this sucks! try to change it sometime
+            //grabs the unit list from the top of the SimulationScript and 
+            //appends them to the names list
+            units = event.slice.getIncident().script.units;
+            
+            for(Unit u : units)
+            {
+                names.add(u.UnitNum);
+            }
+        }
+    }
 
     @Override
+    /**
+     * when window is closed, these values are set.
+     */
     public void uponClose()
     {
-        if (event != null)
-        {
-            event.unitNum = txtUnitNumber.getText();
+        
+        if (event != null && unitSelector.getItemCount() != 0)
+        {
+            event.unitNum = unitSelector.getSelectedItem().toString();
             event.unitActive = ActiveDropdown.getSelectedItem().toString();
             event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
             event.unitStatus = StatusDropdown.getSelectedItem().toString();
+                
+            //old logic for creating dummy unit
+            /*if(event.slice.getIncident().script.hasUnit(txtUnitNumber.getText())){
+                //checks to see if there is already a unit selected there
+                //event.unitNum = (txtUnitNumber.getText());
+                
+            }else{
+                //Creates a dummy unit here
+                event.slice.getIncident().script.addDummyUnit(txtUnitNumber.getText());
+                //event.unitNum = (txtUnitNumber.getText());
+                event.unitActive = ActiveDropdown.getSelectedItem().toString();
+                event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
+                event.unitStatus = StatusDropdown.getSelectedItem().toString();
+                //System.out.println("invalid unit number");
+            }*/
+            
         }
     }
@@ -110 +187 @@
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents()
-    {
-
-        jLabel1 = new javax.swing.JLabel();
-        txtUnitNumber = new javax.swing.JFormattedTextField();
+    private void initComponents() {
+
         jLabel2 = new javax.swing.JLabel();
         StatusDropdown = new javax.swing.JComboBox();
@@ -122 +196 @@
         ActiveDropdown = new javax.swing.JComboBox();
         help = new javax.swing.JLabel();
-
-        jLabel1.setText("Unit Number");
-
-        txtUnitNumber.setText("  -  ");
-        txtUnitNumber.setToolTipText("");
+        jLabel5 = new javax.swing.JLabel();
+        unitSelector = new javax.swing.JComboBox<>();
 
         jLabel2.setText("Status");
@@ -139 +210 @@
 
         ActiveDropdown.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "True", "False" }));
+
+        jLabel5.setText("Unit");
+
+        unitSelector.addAncestorListener(new javax.swing.event.AncestorListener() {
+            public void ancestorMoved(javax.swing.event.AncestorEvent evt) {
+            }
+            public void ancestorAdded(javax.swing.event.AncestorEvent evt) {
+                unitSelectorAncestorAdded(evt);
+            }
+            public void ancestorRemoved(javax.swing.event.AncestorEvent evt) {
+            }
+        });
+        unitSelector.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseEntered(java.awt.event.MouseEvent evt) {
+                unitSelectorMouseEntered(evt);
+            }
+        });
+        unitSelector.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                unitSelectorActionPerformed(evt);
+            }
+        });
 
         org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
@@ -150 +243 @@
                     .add(layout.createSequentialGroup()
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(jLabel1)
-                            .add(jLabel2))
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(StatusDropdown, 0, 475, Short.MAX_VALUE)
-                            .add(txtUnitNumber, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 475, Short.MAX_VALUE)))
-                    .add(layout.createSequentialGroup()
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(jLabel3)
                             .add(jLabel4))
@@ -163 +248 @@
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(ActiveDropdown, 0, 475, Short.MAX_VALUE)
-                            .add(PrimaryDropdown, 0, 475, Short.MAX_VALUE))))
+                            .add(PrimaryDropdown, 0, 475, Short.MAX_VALUE)))
+                    .add(layout.createSequentialGroup()
+                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(jLabel2)
+                            .add(jLabel5))
+                        .add(54, 54, 54)
+                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                            .add(layout.createSequentialGroup()
+                                .add(StatusDropdown, 0, 419, Short.MAX_VALUE)
+                                .add(57, 57, 57))
+                            .add(layout.createSequentialGroup()
+                                .add(unitSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                                .add(0, 0, Short.MAX_VALUE)))))
                 .addContainerGap())
         );
@@ -169 +266 @@
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(layout.createSequentialGroup()
-                .add(47, 47, 47)
+                .add(82, 82, 82)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel1)
-                    .add(txtUnitNumber, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                    .add(jLabel5)
+                    .add(unitSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(jLabel2)
@@ -185 +282 @@
                     .add(jLabel4)
                     .add(ActiveDropdown, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 128, Short.MAX_VALUE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 100, Short.MAX_VALUE)
                 .add(help, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
+
+    private void unitSelectorAncestorAdded(javax.swing.event.AncestorEvent evt) {//GEN-FIRST:event_unitSelectorAncestorAdded
+        //loads the unitSelector on the initialization of the window
+        loadSelector();
+    }//GEN-LAST:event_unitSelectorAncestorAdded
+
+    private void unitSelectorMouseEntered(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_unitSelectorMouseEntered
+        
+    }//GEN-LAST:event_unitSelectorMouseEntered
+
+    private void unitSelectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_unitSelectorActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_unitSelectorActionPerformed
 
 
@@ -197 +307 @@
     private javax.swing.JComboBox StatusDropdown;
     private javax.swing.JLabel help;
-    private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
-    private javax.swing.JFormattedTextField txtUnitNumber;
+    private javax.swing.JLabel jLabel5;
+    private javax.swing.JComboBox<String> unitSelector;
     // End of variables declaration//GEN-END:variables
 

trunk/src/event/editor/WitnessPanel.form

@@ -103 +103 @@
           <Format format="(###)###-####" subtype="-1" type="0"/>
         </Property>
+        <Property name="focusLostBehavior" type="int" value="3"/>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtPhoneNumberActionPerformed"/>
+      </Events>
     </Component>
   </SubComponents>

trunk/src/event/editor/WitnessPanel.java

@@ -42 +42 @@
 
         txtPhoneNumber.setText("" + event.witnessNum);
+        System.out.println("you just loaded a new witness event into the editor");
 
         txtAddress.setText(event.witnessAddress);
@@ -79 +80 @@
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents()
-    {
+    private void initComponents() {
 
         jLabel1 = new javax.swing.JLabel();
@@ -100 +100 @@
 
         txtPhoneNumber.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter(new java.text.DecimalFormat("(###)###-####"))));
+        txtPhoneNumber.setFocusLostBehavior(javax.swing.JFormattedTextField.PERSIST);
+        txtPhoneNumber.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                txtPhoneNumberActionPerformed(evt);
+            }
+        });
 
         org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
@@ -147 +153 @@
     }// </editor-fold>//GEN-END:initComponents
 
+    private void txtPhoneNumberActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtPhoneNumberActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_txtPhoneNumberActionPerformed
+
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

trunk/src/event/editor/frame/Editor.form

@@ -251 +251 @@
   </NonVisualComponents>
   <Properties>
-    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="defaultCloseOperation" type="int" value="0"/>
     <Property name="title" type="java.lang.String" value="Event Editor"/>
   </Properties>
@@ -279 +279 @@
               <Component id="txtEventStart" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="timeHourComboSelector" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="timeMinuteComboSelector" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="timeSecondComboSelector" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="bottomFramePanel" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="btnRemoveCurrentEvent" min="-2" pref="226" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="saveCloseBtn" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -290 +304 @@
           <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="eventTabsPane" pref="534" max="32767" attributes="0"/>
+              <Component id="eventTabsPane" min="-2" pref="523" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="bottomFramePanel" min="-2" max="-2" attributes="0"/>
-                  <Component id="txtEventStart" min="-2" max="-2" attributes="0"/>
-                  <Component id="btnRemoveCurrentEvent" min="-2" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="txtEventStart" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="timeSecondComboSelector" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="timeMinuteComboSelector" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="timeHourComboSelector" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="saveCloseBtn" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="btnRemoveCurrentEvent" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
               </Group>
           </Group>
@@ -311 +336 @@
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
-              <EmptySpace min="0" pref="613" max="32767" attributes="0"/>
+              <EmptySpace min="0" pref="70" max="32767" attributes="0"/>
           </Group>
         </DimensionLayout>
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
-              <EmptySpace min="0" pref="34" max="32767" attributes="0"/>
+              <EmptySpace min="0" pref="45" max="32767" attributes="0"/>
           </Group>
         </DimensionLayout>
@@ -325 +350 @@
         <Property name="text" type="java.lang.String" value="00:00:00"/>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtEventStartActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JButton" name="saveCloseBtn">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Save and Close"/>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="saveCloseBtnActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JButton" name="btnRemoveCurrentEvent">
@@ -334 +370 @@
       </Events>
     </Component>
+    <Component class="javax.swing.JComboBox" name="timeSecondComboSelector">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="1">
+            <StringItem index="0" value="Second"/>
+          </StringArray>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="timeSecondComboSelectorActionPerformed"/>
+      </Events>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
+    </Component>
+    <Component class="javax.swing.JComboBox" name="timeMinuteComboSelector">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="1">
+            <StringItem index="0" value="Minute"/>
+          </StringArray>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="timeMinuteComboSelectorActionPerformed"/>
+      </Events>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
+    </Component>
+    <Component class="javax.swing.JComboBox" name="timeHourComboSelector">
+      <Properties>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+          <StringArray count="1">
+            <StringItem index="0" value="Hour"/>
+          </StringArray>
+        </Property>
+      </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Hour"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel2">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Minute"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel3">
+      <Properties>
+        <Property name="text" type="java.lang.String" value="Second"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>

trunk/src/event/editor/frame/Editor.java

@@ -11 +11 @@
 import scriptbuilder.gui.IncidentEditorFrame;
 import scriptbuilder.gui.ScriptBuilderFrame;
+import scriptbuilder.gui.ScriptBuilderGuiConstants;
 import scriptbuilder.gui.panels.IncidentTimelinePanel;
 import scriptbuilder.structures.ScriptEvent;
@@ -32 +33 @@
         model.addEventPanel(property, se);
     }
-
+    /**
+     * adds all of the events from the timeslice to the incidentTimelinePanel
+     * @param ts the timeslice to be added
+     */
     public void setSlice(TimeSlice ts)
     {
@@ -42 +46 @@
             for (I_ScriptEvent se : slice.events)
             {
-
+                
                 this.addEvent(IncidentTimelinePanel.eventTypeToPropertyMap.get(se.getScriptEventType()), se);
 
@@ -52 +56 @@
             System.out.println("[" + eventTime + "]");
             txtEventStart.setText(eventTime);
+            List<Integer> timesS = timeGenerator(eventTime,"s");
+            List<Integer> timesM = timeGenerator(eventTime,"m");
+            List<Integer> timesH = timeGenerator(eventTime,"h");
+            timeHourComboSelector.setModel(new DefaultComboBoxModel(timesH.toArray()));
+            timeMinuteComboSelector.setModel(new DefaultComboBoxModel(timesM.toArray()));
+            timeSecondComboSelector.setModel(new DefaultComboBoxModel(timesS.toArray()));
+            timeHourComboSelector.setSelectedItem(slice.getTime()/3600);
+            timeMinuteComboSelector.setSelectedItem((slice.getTime()%3600)/60);
+            timeSecondComboSelector.setSelectedItem(slice.getTime()%60);
         }
 
     }
+    
+    private List<Integer> timeGenerator(String time,String type)
+    {
+        List<Integer> times = new ArrayList<Integer>();
+        String[] timeArray = time.split(":");
+        int currTime = 0;
+        switch(type)
+        {
+            case "h":
+            {
+                currTime = Integer.parseInt(timeArray[0]);
+                for(int i = 0;i< ScriptBuilderGuiConstants.MAX_SIMULATION_LENGTH/3600;i++)
+                {
+                    times.add(i);
+                }
+                break;
+            }
+            case "m":
+            {
+                currTime = Integer.parseInt(timeArray[1]);
+                for(int i = 0; i<60;i++)
+                {
+                    times.add(i);
+                }
+                
+                break;
+            }
+            case "s":
+            {
+                //includes times 0,20,40,80
+                currTime = Integer.parseInt(timeArray[2]); 
+                for(int i = 0; i<60;i+=ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION)
+                {
+                    times.add(i);
+                }
+                break;
+            }
+            default:
+            {
+            }
+                
+        }
+        
+        
+        //times.add(time);
+        
+        return times;
+    }
+    
+    
 
     private ActionListener optionalChangeListener = new ActionListener()
@@ -123 +186 @@
 
         }
-
+        //this eventTime might need to be initialized to the correct time
         String eventTime = "";
 
@@ -159 +222 @@
                 //If we deleted the first event(s), this will add the offsets,
                 //to ensure that events stay at the correct times
-                model.closePanels();
-            }
-        });
+                Object[] options = {"Yes","Cancel"};
+                    int result = JOptionPane.showOptionDialog(null,"Are you sure you want to exit without saving?",
+                            "Exit",
+                            JOptionPane.YES_NO_OPTION,
+                            JOptionPane.QUESTION_MESSAGE,
+                            null,
+                            options,
+                            options[1]);
+                    switch (result){
+                        //should just close
+                        case 0:
+                            closeWindow();
+                            //this.setVisible(true);
+                            break;
+                        // should do nothing
+                        case 1:
+                            
+                            break;
+                        default:
+                            break;
+                    }
+                //add a do you want to close without saving popup window here
+               
+            }
+        });
+    }
+    private void closeWindow(){
+        this.dispose();
     }
 
@@ -171 +259 @@
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents()
-    {
+    private void initComponents() {
 
         eventTabsPane = new javax.swing.JTabbedPane();
         bottomFramePanel = new javax.swing.JPanel();
         txtEventStart = new javax.swing.JTextField();
+        saveCloseBtn = new javax.swing.JButton();
         btnRemoveCurrentEvent = new javax.swing.JButton();
+        timeSecondComboSelector = new javax.swing.JComboBox<>();
+        timeMinuteComboSelector = new javax.swing.JComboBox<>();
+        timeHourComboSelector = new javax.swing.JComboBox<>();
+        jLabel1 = new javax.swing.JLabel();
+        jLabel2 = new javax.swing.JLabel();
+        jLabel3 = new javax.swing.JLabel();
         editorMenuBar = new javax.swing.JMenuBar();
         menuEvaluations = new javax.swing.JMenu();
@@ -200 +294 @@
         Witness = new javax.swing.JMenuItem();
 
-        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
         setTitle("Event Editor");
 
@@ -207 +301 @@
         bottomFramePanelLayout.setHorizontalGroup(
             bottomFramePanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(0, 613, Short.MAX_VALUE)
+            .add(0, 70, Short.MAX_VALUE)
         );
         bottomFramePanelLayout.setVerticalGroup(
             bottomFramePanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(0, 34, Short.MAX_VALUE)
+            .add(0, 45, Short.MAX_VALUE)
         );
 
         txtEventStart.setText("00:00:00");
+        txtEventStart.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                txtEventStartActionPerformed(evt);
+            }
+        });
+
+        saveCloseBtn.setText("Save and Close");
+        saveCloseBtn.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                saveCloseBtnActionPerformed(evt);
+            }
+        });
 
         btnRemoveCurrentEvent.setText("Remove This Event");
-        btnRemoveCurrentEvent.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        btnRemoveCurrentEvent.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 btnRemoveCurrentEventActionPerformed(evt);
             }
         });
+
+        timeSecondComboSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Second" }));
+        timeSecondComboSelector.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                timeSecondComboSelectorActionPerformed(evt);
+            }
+        });
+
+        timeMinuteComboSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Minute" }));
+        timeMinuteComboSelector.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                timeMinuteComboSelectorActionPerformed(evt);
+            }
+        });
+
+        timeHourComboSelector.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Hour" }));
+
+        jLabel1.setText("Hour");
+
+        jLabel2.setText("Minute");
+
+        jLabel3.setText("Second");
 
         menuEvaluations.setText("Evaluations");
@@ -230 +356 @@
         ATMS.setText("ATMS");
         ATMS.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ATMSEval.png"))); // NOI18N
-        ATMS.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        ATMS.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 multipleChange(evt);
             }
@@ -242 +366 @@
         ActivityLog.setText("Activity Log");
         ActivityLog.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ActivityLogEval.png"))); // NOI18N
-        ActivityLog.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        ActivityLog.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 multipleChange(evt);
             }
@@ -254 +376 @@
         CAD.setText("CAD");
         CAD.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CADEval.png"))); // NOI18N
-        CAD.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        CAD.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 multipleChange(evt);
             }
@@ -266 +386 @@
         CMS.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CMSEval.png"))); // NOI18N
         CMS.setText("CMS");
-        CMS.addMouseListener(new java.awt.event.MouseAdapter()
-        {
-            public void mouseClicked(java.awt.event.MouseEvent evt)
-            {
+        CMS.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
                 multipleChangeListener(evt);
             }
         });
-        CMS.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        CMS.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 multipleChange(evt);
             }
@@ -285 +401 @@
         Facilitator.setText("Facilitator");
         Facilitator.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/FacilitatorEval.png"))); // NOI18N
-        Facilitator.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        Facilitator.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 optionalChange(evt);
             }
@@ -297 +411 @@
         Radio.setText("Radio");
         Radio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/RadioEval.png"))); // NOI18N
-        Radio.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        Radio.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 optionalChange(evt);
             }
@@ -313 +425 @@
         MaintenanceRadio.setText("Maintenance Radio");
         MaintenanceRadio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/MaintenanceRadio.png"))); // NOI18N
-        MaintenanceRadio.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        MaintenanceRadio.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 optionalChange(evt);
             }
@@ -325 +435 @@
         TMTRadio.setText("TMT Radio");
         TMTRadio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/TMTRadio.png"))); // NOI18N
-        TMTRadio.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        TMTRadio.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 optionalChange(evt);
             }
@@ -337 +445 @@
         Telephone.setText("Telephone");
         Telephone.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Telephone.png"))); // NOI18N
-        Telephone.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        Telephone.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 optionalChange(evt);
             }
@@ -353 +459 @@
         Audio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Audio.png"))); // NOI18N
         Audio.setText("Audio");
-        Audio.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        Audio.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 AudioActionPerformed(evt);
             }
@@ -375 +479 @@
         CHPRadio.setText("CHP Radio");
         CHPRadio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CHPRadio.png"))); // NOI18N
-        CHPRadio.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
+        CHPRadio.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
                 optionalChange(evt);
             }
@@ -417 +519 @@
                 .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(jLabel1)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(timeHourComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(jLabel2)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(timeMinuteComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(jLabel3)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(timeSecondComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(bottomFramePanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(btnRemoveCurrentEvent, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 226, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(saveCloseBtn)
                 .addContainerGap())
         );
@@ -426 +542 @@
             .add(layout.createSequentialGroup()
                 .addContainerGap()
-                .add(eventTabsPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE)
+                .add(eventTabsPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 523, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(bottomFramePanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btnRemoveCurrentEvent)))
+                    .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                        .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                        .add(timeSecondComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                        .add(timeMinuteComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                        .add(timeHourComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                        .add(jLabel1)
+                        .add(jLabel2)
+                        .add(jLabel3))
+                    .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                        .add(saveCloseBtn)
+                        .add(btnRemoveCurrentEvent))))
         );
 
@@ -471 +596 @@
     }//GEN-LAST:event_AudioActionPerformed
 
+    private void saveCloseBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveCloseBtnActionPerformed
+        // TODO add your handling code here:
+        //closes the current frame
+        
+        //updateEventTime();
+        if(!txtEventStart.getText().equals(""))
+        {
+            updateEventTime();
+        }
+        model.closePanels();
+        closeWindow();
+        //this.dispatchEvent(new WindowEvent(this,WindowEvent.WINDOW_CLOSING));
+    }//GEN-LAST:event_saveCloseBtnActionPerformed
+
+    private void timeSecondComboSelectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeSecondComboSelectorActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_timeSecondComboSelectorActionPerformed
+
+    private void timeMinuteComboSelectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeMinuteComboSelectorActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_timeMinuteComboSelectorActionPerformed
+
+    private void txtEventStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtEventStartActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_txtEventStartActionPerformed
+
     private void updateEventTime()
     {
-        String[] tokens = txtEventStart.getText().split(":");
-
-        int hrs = Integer.parseInt(tokens[0]);
-        int mins = Integer.parseInt(tokens[1]);
-        int secs = Integer.parseInt(tokens[2]);
+        
+//        String[] tokens = txtEventStart.getText().split(":");
+//        
+//        int hrs = Integer.parseInt(tokens[0]);
+//        int mins = Integer.parseInt(tokens[1]);
+//        int secs = Integer.parseInt(tokens[2]);
+        int hrs = Integer.parseInt(timeHourComboSelector.getSelectedItem().toString());
+        int mins = Integer.parseInt(timeMinuteComboSelector.getSelectedItem().toString());
+        int secs = Integer.parseInt(timeSecondComboSelector.getSelectedItem().toString());
+        
 
         int newTime = (3600 * hrs) + (60 * mins) + secs;
@@ -493 +649 @@
 
             }
-            SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
-            df.setTimeZone(TimeZone.getTimeZone("GMT"));
-            String eventTime = df.format(new Date(slice.getTime() * 1000));
-            txtEventStart.setText(eventTime);
+//            SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
+//            df.setTimeZone(TimeZone.getTimeZone("GMT"));
+//            String eventTime = df.format(new Date(slice.getTime() * 1000));
+//            txtEventStart.setText(eventTime);
         }
     }
@@ -538 +694 @@
     private javax.swing.JMenuBar editorMenuBar;
     private javax.swing.JTabbedPane eventTabsPane;
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel2;
+    private javax.swing.JLabel jLabel3;
     private javax.swing.JMenu menuAutoData;
     private javax.swing.JMenu menuEvaluations;
     private javax.swing.JMenu menuInstructor;
+    private javax.swing.JButton saveCloseBtn;
+    private javax.swing.JComboBox<String> timeHourComboSelector;
+    private javax.swing.JComboBox<String> timeMinuteComboSelector;
+    private javax.swing.JComboBox<String> timeSecondComboSelector;
     private javax.swing.JTextField txtEventStart;
     // End of variables declaration//GEN-END:variables

trunk/src/event/editor/frame/PropertyModel.java

@@ -70 +70 @@
         try
         {
+            //todo: this is where there are problems with initializing the unit window
             JPanel panel = (JPanel) classMap.get(property).newInstance();
 
@@ -82 +83 @@
         {
             System.err.println("Could not create panel of type \"" + property + "\"");
-        }
+        }            
     }