Index: trunk/src/event/editor/UnitPanel.java
===================================================================
--- trunk/src/event/editor/UnitPanel.java	(revision 92)
+++ trunk/src/event/editor/UnitPanel.java	(revision 130)
@@ -51,28 +51,5 @@
             }
         }
-        txtUnitNumber.addKeyListener(new KeyListener()
-        {
-            public void keyTyped(KeyEvent e)
-            {
-            }
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.unitNum = txtUnitNumber.getText();
-                }
-            }
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
-        ActiveDropdown.addActionListener(new ActionListener()
-        {
-
-            public void actionPerformed(ActionEvent e)
-            {
-                event.unitActive = ActiveDropdown.getSelectedItem().toString();
-            }
-        });
+
         for (int i = 0; i < PrimaryDropdown.getItemCount(); i++)
         {
@@ -82,12 +59,5 @@
             }
         }
-        PrimaryDropdown.addActionListener(new ActionListener()
-        {
-
-            public void actionPerformed(ActionEvent e)
-            {
-                event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
-            }
-        });
+
         boolean containsItem = false;
         for (int i = 0; i < StatusDropdown.getItemCount() && !containsItem; i++)
@@ -104,12 +74,5 @@
             StatusDropdown.setSelectedItem(StatusDropdown.getItemCount() - 1);
         }
-        StatusDropdown.addActionListener(new ActionListener()
-        {
-
-            public void actionPerformed(ActionEvent e)
-            {
-                event.unitStatus = StatusDropdown.getSelectedItem().toString();
-            }
-        });
+
     }
 
@@ -119,5 +82,5 @@
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-    
+
     @Override
     public boolean removeAssociatedEvent()
@@ -126,4 +89,13 @@
         event = null;
         return true;
+    }
+
+    @Override
+    public void uponClose()
+    {
+        event.unitNum = txtUnitNumber.getText();
+        event.unitActive = ActiveDropdown.getSelectedItem().toString();
+        event.unitPrimary = PrimaryDropdown.getSelectedItem().toString();
+        event.unitStatus = StatusDropdown.getSelectedItem().toString();
     }