Changeset 12748 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2017-09-06T01:08:48+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
r12639 r12748 67 67 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; 68 68 import org.openstreetmap.josm.gui.layer.NativeScaleLayer; 69 import org.openstreetmap.josm.gui.util.GuiHelper;70 69 import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField; 71 70 import org.openstreetmap.josm.gui.widgets.JosmTextField; … … 216 215 // Disable some default JTable shortcuts to use JOSM ones (see #5678, #10458) 217 216 for (KeyStroke ks : new KeyStroke[] { 218 KeyStroke.getKeyStroke(KeyEvent.VK_C, GuiHelper.getMenuShortcutKeyMaskEx()),219 KeyStroke.getKeyStroke(KeyEvent.VK_V, GuiHelper.getMenuShortcutKeyMaskEx()),217 KeyStroke.getKeyStroke(KeyEvent.VK_C, Main.platform.getMenuShortcutKeyMaskEx()), 218 KeyStroke.getKeyStroke(KeyEvent.VK_V, Main.platform.getMenuShortcutKeyMaskEx()), 220 219 KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.SHIFT_DOWN_MASK), 221 220 KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.SHIFT_DOWN_MASK), -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r12663 r12748 50 50 import org.openstreetmap.josm.data.osm.event.DatasetEventManager; 51 51 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode; 52 import org.openstreetmap.josm.data.osm.search.SearchCompiler;53 52 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent; 54 53 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent; … … 57 56 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent; 58 57 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; 58 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 59 59 import org.openstreetmap.josm.gui.MainApplication; 60 60 import org.openstreetmap.josm.gui.MapView; … … 72 72 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener; 73 73 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 74 import org.openstreetmap.josm.gui.util.GuiHelper;75 74 import org.openstreetmap.josm.gui.util.HighlightHelper; 76 75 import org.openstreetmap.josm.gui.widgets.CompileSearchTextDecorator; … … 183 182 // Do not hide copy action because of default JList override (fix #9815) 184 183 displaylist.getActionMap().put("copy", MainApplication.getMenu().copy); 185 displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, GuiHelper.getMenuShortcutKeyMaskEx()), "copy");184 displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, Main.platform.getMenuShortcutKeyMaskEx()), "copy"); 186 185 187 186 updateActionsRelationLists(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r12678 r12748 69 69 import org.openstreetmap.josm.data.osm.OsmPrimitive; 70 70 import org.openstreetmap.josm.data.osm.Tag; 71 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 71 72 import org.openstreetmap.josm.data.osm.search.SearchParseError; 72 73 import org.openstreetmap.josm.data.osm.search.SearchSetting; 73 import org.openstreetmap.josm.data.osm.search.SearchCompiler;74 74 import org.openstreetmap.josm.data.preferences.BooleanProperty; 75 75 import org.openstreetmap.josm.data.preferences.CollectionProperty; … … 810 810 @Override 811 811 public void setContentPane(Container contentPane) { 812 final int commandDownMask = GuiHelper.getMenuShortcutKeyMaskEx();812 final int commandDownMask = Main.platform.getMenuShortcutKeyMaskEx(); 813 813 List<String> lines = new ArrayList<>(); 814 814 Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask).ifPresent(sc -> -
trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
r12644 r12748 66 66 import org.openstreetmap.josm.tools.LanguageInfo; 67 67 import org.openstreetmap.josm.tools.Logging; 68 import org.openstreetmap.josm.tools.PlatformHook; 68 69 import org.openstreetmap.josm.tools.bugreport.BugReport; 69 70 import org.openstreetmap.josm.tools.bugreport.ReportedException; … … 470 471 * @return extended modifier key used as the appropriate accelerator key for menu shortcuts 471 472 * @since 7539 472 */ 473 * @deprecated to be removed end of 2017. Use {@link PlatformHook#getMenuShortcutKeyMaskEx()} instead 474 */ 475 @Deprecated 473 476 public static int getMenuShortcutKeyMaskEx() { 474 477 return Main.isPlatformOsx() ? KeyEvent.META_DOWN_MASK : KeyEvent.CTRL_DOWN_MASK; -
trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
r12695 r12748 3 3 4 4 import java.awt.GraphicsEnvironment; 5 import java.awt.Toolkit; 6 import java.awt.event.KeyEvent; 5 7 import java.io.BufferedReader; 6 8 import java.io.File; … … 242 244 243 245 /** 246 * Returns extended modifier key used as the appropriate accelerator key for menu shortcuts. 247 * It is advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but: 248 * <ul> 249 * <li>it returns KeyEvent.CTRL_MASK instead of KeyEvent.CTRL_DOWN_MASK. We used the extended 250 * modifier for years, and Oracle recommends to use it instead, so it's best to keep it</li> 251 * <li>the method throws a HeadlessException ! So we would need to handle it for unit tests anyway</li> 252 * </ul> 253 * @return extended modifier key used as the appropriate accelerator key for menu shortcuts 254 * @since 12748 (as a replacement to {@code GuiHelper.getMenuShortcutKeyMaskEx()}) 255 */ 256 default int getMenuShortcutKeyMaskEx() { 257 return KeyEvent.CTRL_DOWN_MASK; 258 } 259 260 /** 244 261 * Called when an outdated version of Java is detected at startup. 245 262 * @since 12270 -
trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
r12697 r12748 76 76 } 77 77 checkExpiredJava(callback); 78 } 79 80 @Override 81 public int getMenuShortcutKeyMaskEx() { 82 return KeyEvent.META_DOWN_MASK; 78 83 } 79 84 -
trunk/src/org/openstreetmap/josm/tools/Shortcut.java
r12620 r12748 23 23 24 24 import org.openstreetmap.josm.Main; 25 import org.openstreetmap.josm.gui.util.GuiHelper;26 25 27 26 /** … … 370 369 if (initdone) return; 371 370 initdone = true; 372 int commandDownMask = GuiHelper.getMenuShortcutKeyMaskEx();371 int commandDownMask = Main.platform.getMenuShortcutKeyMaskEx(); 373 372 groups.put(NONE, -1); 374 373 groups.put(MNEMONIC, KeyEvent.ALT_DOWN_MASK);
Note:
See TracChangeset
for help on using the changeset viewer.