Index: trunk/src/event/editor/CMSEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/CMSEvaluationPanel.java	(revision 92)
+++ trunk/src/event/editor/CMSEvaluationPanel.java	(revision 130)
@@ -35,49 +35,7 @@
         event = (CMSEvaluationEvent) sei;
         txtID.setText(event.cmsID);
-        txtID.addKeyListener(new KeyListener()
-        {
-
-            @Override
-            public void keyTyped(KeyEvent e)
-            {
-            }
-
-            @Override
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.cmsID = txtID.getText();
-                }
-            }
-
-            @Override
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
+        
         txtLocation.setText(event.location);
-        txtLocation.addKeyListener(new KeyListener()
-        {
-
-            @Override
-            public void keyTyped(KeyEvent e)
-            {
-            }
-
-            @Override
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.location = txtLocation.getText();
-                }
-            }
-
-            @Override
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
+        
         txtMessage.setText("");
         for (int i = 0; i < event.message.size(); i++)
@@ -92,13 +50,5 @@
             }
         }
-        TypeDropdown.addActionListener(new ActionListener()
-        {
-
-            @Override
-            public void actionPerformed(ActionEvent e)
-            {
-                event.cmsType = TypeDropdown.getSelectedItem().toString();
-            }
-        });
+        
         addButton.addActionListener(new ActionListener()
         {
@@ -139,4 +89,12 @@
         event = null;
         return true;
+    }
+
+    @Override
+    public void uponClose()
+    {
+        event.cmsID = txtID.getText();
+        event.location = txtLocation.getText();
+        event.cmsType = TypeDropdown.getSelectedItem().toString();
     }