Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
r8509 r8510 144 144 final JButton b = new JButton(spec.text); 145 145 b.setIcon(spec.icon); 146 b.setToolTipText(spec.tooltipText == null ? "" : spec.tooltipText);146 b.setToolTipText(spec.tooltipText == null ? "" : spec.tooltipText); 147 147 if (helpTopic != null) { 148 148 HelpUtil.setHelpContext(b, helpTopic); … … 220 220 JButton defaultButton = null; 221 221 if (options != null && defaultOption != null) { 222 for (int i =0; i< options.length; i++) {222 for (int i = 0; i < options.length; i++) { 223 223 if (options[i] == defaultOption) { 224 224 defaultButton = buttons.get(i); … … 261 261 if (defaultOption != null && options != null && options.length > 0) { 262 262 int i; 263 for (i =0; i<options.length;i++) {263 for (i = 0; i < options.length; i++) { 264 264 if (options[i] == defaultOption) { 265 265 break; … … 275 275 } 276 276 }); 277 dialog.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "close"); 277 dialog.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( 278 KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "close"); 278 279 dialog.getRootPane().getActionMap().put("close", new AbstractAction() { 279 280 @Override … … 285 286 286 287 if (options != null) { 287 for (int i =0; i < options.length;i++) {288 for (int i = 0; i < options.length; i++) { 288 289 final DefaultAction action = new DefaultAction(dialog, pane, i); 289 290 buttons.get(i).addActionListener(action); 290 buttons.get(i).getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");291 buttons.get(i).getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter"); 291 292 buttons.get(i).getActionMap().put("enter", action); 292 293 } … … 294 295 final DefaultAction action = new DefaultAction(dialog, pane, 0); 295 296 buttons.get(0).addActionListener(action); 296 buttons.get(0).getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");297 buttons.get(0).getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter"); 297 298 buttons.get(0).getActionMap().put("enter", action); 298 299 } … … 304 305 } 305 306 dialog.setVisible(true); 306 return (Integer) pane.getValue();307 return (Integer) pane.getValue(); 307 308 } 308 309
Note:
See TracChangeset
for help on using the changeset viewer.