Index: src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 8489)
+++ src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(working copy)
@@ -147,19 +147,7 @@
     * @since 5653
     */
     public void editTag(final int row, boolean focusOnKey) {
-        changedKey = null;
-        sel = Main.main.getInProgressSelection();
-        if (sel == null || sel.isEmpty()) return;
-
-        String key = tagData.getValueAt(row, 0).toString();
-        objKey=key;
-
-        @SuppressWarnings("unchecked")
-        final EditTagDialog editDialog = new EditTagDialog(key,
-                (Map<String, Integer>) tagData.getValueAt(row, 1), focusOnKey);
-        editDialog.showDialog();
-        if (editDialog.getValue() != 1) return;
-        editDialog.performTagEdit();
+        String inputValue = JOptionPane.showInputDialog("Please input a value");
     }
 
     /**
Index: src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
===================================================================
--- src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(revision 8489)
+++ src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java	(working copy)
@@ -77,24 +77,6 @@
      * Register this object as AWTEventListener
      */
     public void register() {
-        try {
-            Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
-        } catch (SecurityException ex) {
-            Main.warn(ex);
-        }
-        timer = new Timer(0, new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                timer.stop();
-                if (set.remove(releaseEvent.getKeyCode()) && enabled) {
-                    if (isFocusInMainWindow()) {
-                        for (KeyPressReleaseListener q: keyListeners) {
-                            q.doKeyReleased(releaseEvent);
-                        }
-                    }
-                }
-            }
-        });
     }
 
     /**
@@ -102,19 +84,6 @@
      * lists of listeners are not cleared!
      */
     public void unregister() {
-        timer.stop();
-        set.clear();
-        if (!keyListeners.isEmpty()) {
-            Main.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), keyListeners.toString());
-        }
-        if (!modifierListeners.isEmpty()) {
-            Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());
-        }
-        try {
-            Toolkit.getDefaultToolkit().removeAWTEventListener(this);
-        } catch (SecurityException ex) {
-            Main.warn(ex);
-        }
     }
 
     private void processKeyEvent(KeyEvent e) {