Index: trunk/src/event/editor/CMSEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/CMSEvaluationPanel.java	(revision 7)
+++ trunk/src/event/editor/CMSEvaluationPanel.java	(revision 50)
@@ -40,13 +40,53 @@
         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++)
         {
-            for (MouseListener ml : addButton.getMouseListeners())
-            {
-                ml.mouseClicked(new MouseEvent(addButton, 1, 1, 1, 1, 1, 1, true));
-            }
-            ((MyTableModel) dialogTable.getModel()).setValueAt(event.message.get(i), i, 1);
+            ((MyTableModel) dialogTable.getModel()).addRow("" + (i + 1), event.message.get(i));
         }
         for (int i = 0; i < TypeDropdown.getItemCount(); i++)
@@ -57,4 +97,22 @@
             }
         }
+        TypeDropdown.addActionListener(new ActionListener()
+        {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                event.cmsType = TypeDropdown.getSelectedItem().toString();
+            }
+        });
+        addButton.addActionListener(new ActionListener()
+        {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                event.message.add("");
+            }
+        });
         dialogTable.getModel().addTableModelListener(new TableModelListener()
         {
@@ -64,7 +122,7 @@
                 if (e.getType() == TableModelEvent.UPDATE)
                 {
-                    event.message.set(e.getLastRow(), dialogTable.getModel().getValueAt(e.getLastRow(), 0).toString());
-                }
-                if(e.getType() == TableModelEvent.DELETE)
+                    event.message.set(e.getLastRow(), dialogTable.getModel().getValueAt(e.getLastRow(), 1).toString());
+                }
+                if (e.getType() == TableModelEvent.DELETE)
                 {
                     event.message.remove(e.getLastRow());
@@ -72,5 +130,4 @@
             }
         });
-
     }