Ticket #11209: ButTheBugIsStillPresent3.patch
| File ButTheBugIsStillPresent3.patch, 2.9 KB (added by , 11 years ago) |
|---|
-
src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
35 35 import javax.swing.AbstractAction; 36 36 import javax.swing.JComponent; 37 37 import javax.swing.JLabel; 38 import javax.swing.JOptionPane; 38 39 import javax.swing.JPanel; 39 40 import javax.swing.JPopupMenu; 40 41 import javax.swing.JScrollPane; … … 1030 1031 if (!isEnabled()) 1031 1032 return; 1032 1033 if (tagTable.getSelectedRowCount() == 1) { 1033 int row = tagTable.getSelectedRow(); 1034 editHelper.editTag(row, false); 1034 String inputValue = JOptionPane.showInputDialog("Please input a value"); 1035 1035 } else if (membershipTable.getSelectedRowCount() == 1) { 1036 1036 int row = membershipTable.getSelectedRow(); 1037 1037 editMembership(row); -
src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
77 77 * Register this object as AWTEventListener 78 78 */ 79 79 public void register() { 80 try {81 Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);82 } catch (SecurityException ex) {83 Main.warn(ex);84 }85 timer = new Timer(0, new ActionListener() {86 @Override87 public void actionPerformed(ActionEvent e) {88 timer.stop();89 if (set.remove(releaseEvent.getKeyCode()) && enabled) {90 if (isFocusInMainWindow()) {91 for (KeyPressReleaseListener q: keyListeners) {92 q.doKeyReleased(releaseEvent);93 }94 }95 }96 }97 });98 80 } 99 81 100 82 /** … … 102 84 * lists of listeners are not cleared! 103 85 */ 104 86 public void unregister() { 105 timer.stop();106 set.clear();107 if (!keyListeners.isEmpty()) {108 Main.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), keyListeners.toString());109 }110 if (!modifierListeners.isEmpty()) {111 Main.warn(tr("Some of the key modifier listeners forgot to remove themselves: {0}"), modifierListeners.toString());112 }113 try {114 Toolkit.getDefaultToolkit().removeAWTEventListener(this);115 } catch (SecurityException ex) {116 Main.warn(ex);117 }118 87 } 119 88 120 89 private void processKeyEvent(KeyEvent e) {
