Index: trunk/src/event/editor/WitnessPanel.java
===================================================================
--- trunk/src/event/editor/WitnessPanel.java	(revision 92)
+++ trunk/src/event/editor/WitnessPanel.java	(revision 130)
@@ -34,22 +34,5 @@
             txtFirstName.setText(st.nextToken());
         }
-        txtFirstName.addKeyListener(new KeyListener()
-        {
-            public void keyTyped(KeyEvent e)
-            {
-            }
 
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
-                }
-            }
-
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
         txtLastName.setText("");
         while (st.hasMoreTokens())
@@ -57,60 +40,9 @@
             txtLastName.setText(txtLastName.getText() + st.nextToken());
         }
-        txtLastName.addKeyListener(new KeyListener()
-        {
-            public void keyTyped(KeyEvent e)
-            {
-            }
 
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
-                }
-            }
+        txtPhoneNumber.setText("" + event.witnessNum);
 
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
-        txtPhoneNumber.setText("" + event.witnessNum);
-        txtPhoneNumber.addKeyListener(new KeyListener()
-        {
-            public void keyTyped(KeyEvent e)
-            {
-            }
+        txtAddress.setText(event.witnessAddress);
 
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.witnessNum = txtPhoneNumber.getText();
-                }
-            }
-
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
-        txtAddress.setText(event.witnessAddress);
-        txtAddress.addKeyListener(new KeyListener()
-        {
-            public void keyTyped(KeyEvent e)
-            {
-            }
-
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.witnessAddress = txtAddress.getText();
-                }
-            }
-
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
     }
 
@@ -120,5 +52,5 @@
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-    
+
     @Override
     public boolean removeAssociatedEvent()
@@ -127,4 +59,12 @@
         event = null;
         return true;
+    }
+
+    @Override
+    public void uponClose()
+    {
+        event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
+        event.witnessNum = txtPhoneNumber.getText();
+        event.witnessAddress = txtAddress.getText();
     }