Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolved deprecated KeyEvents from Java 9 and 10. #2809

Merged
merged 2 commits into from
Apr 30, 2021
Merged

Resolved deprecated KeyEvents from Java 9 and 10. #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4477a66
Resolved deprecated Swing KeyEvent to Java11 KeyEvent types.
HoneySkull Apr 30, 2021
aef9142
Merge branch 'master' into warning_KeyEvents
HoneySkull Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions megamek/src/megamek/client/ui/swing/AccessibilityWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ private void processAccessibleGUI() {
Integer.parseInt(args[2]) - 1);
// Why don't constants work here?
// Cursor over the hex.
gui.bv.mouseAction(selectedTarget, 3, InputEvent.BUTTON1_MASK);
gui.bv.mouseAction(selectedTarget, 3, InputEvent.BUTTON1_DOWN_MASK);
// Click.
((BoardView1) gui.getBoardView()).mouseAction(selectedTarget, 1, InputEvent.BUTTON1_MASK);
((BoardView1) gui.getBoardView()).mouseAction(selectedTarget, 1, InputEvent.BUTTON1_DOWN_MASK);
}
}

Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/client/ui/swing/BoardEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public void hexMoused(BoardViewEvent b) {
boolean isALT = (b.getModifiers() & ActionEvent.ALT_MASK) != 0;
boolean isSHIFT = (b.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
boolean isCTRL = (b.getModifiers() & ActionEvent.CTRL_MASK) != 0;
boolean isLMB = (b.getModifiers() & InputEvent.BUTTON1_MASK) != 0;
boolean isLMB = (b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) != 0;

// Raise/Lower Terrain is selected
if (buttonUpDn.isSelected()) {
Expand Down
18 changes: 9 additions & 9 deletions megamek/src/megamek/client/ui/swing/CommonMenuBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public CommonMenuBar() {
fileGameNew.addActionListener(this);
fileGameNew.setActionCommand(ClientGUI.FILE_GAME_NEW);
fileGameNew.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
submenu.add(fileGameNew);
fileGameOpen = new JMenuItem(Messages.getString("CommonMenuBar.fileGameOpen")); //$NON-NLS-1$
fileGameOpen.addActionListener(this);
Expand Down Expand Up @@ -355,7 +355,7 @@ public CommonMenuBar() {
viewMekDisplay.setActionCommand(ClientGUI.VIEW_MEK_DISPLAY);
viewMekDisplay.setMnemonic(KeyEvent.VK_D);
viewMekDisplay.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_D,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
menu.add(viewMekDisplay);

viewAccessibilityWindow = new JMenuItem(Messages.getString("CommonMenuBar.viewAccessibilityWindow"));
Expand Down Expand Up @@ -393,14 +393,14 @@ public CommonMenuBar() {
viewMiniMap.setActionCommand(ClientGUI.VIEW_MINI_MAP);
viewMiniMap.setMnemonic(KeyEvent.VK_M);
viewMiniMap.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
menu.add(viewMiniMap);
viewUnitOverview = new JMenuItem(Messages.getString("CommonMenuBar.viewUnitOverview")); //$NON-NLS-1$
viewUnitOverview.addActionListener(this);
viewUnitOverview.setActionCommand(ClientGUI.VIEW_UNIT_OVERVIEW);
viewUnitOverview.setMnemonic(KeyEvent.VK_U);
viewUnitOverview.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_U,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
menu.add(viewUnitOverview);
viewZoomIn = new JMenuItem(Messages
.getString("CommonMenuBar.viewZoomIn")); //$NON-NLS-1$
Expand Down Expand Up @@ -455,14 +455,14 @@ public CommonMenuBar() {
viewMovementEnvelope.setActionCommand(ClientGUI.VIEW_MOVE_ENV);
viewMovementEnvelope.setMnemonic(KeyEvent.VK_Q);
viewMovementEnvelope.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
menu.add(viewMovementEnvelope);
viewMovModEnvelope = new JMenuItem(Messages.getString("CommonMenuBar.movementModEnvelope")); //$NON-NLS-1$
viewMovModEnvelope.addActionListener(this);
viewMovModEnvelope.setActionCommand(ClientGUI.VIEW_MOVE_MOD_ENV);
viewMovModEnvelope.setMnemonic(KeyEvent.VK_W);
viewMovModEnvelope.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
menu.add(viewMovModEnvelope);
viewChangeTheme = new JMenuItem(Messages.getString("CommonMenuBar.viewChangeTheme")); //$NON-NLS-1$
viewChangeTheme.addActionListener(this);
Expand All @@ -474,7 +474,7 @@ public CommonMenuBar() {
viewRoundReport.setActionCommand(ClientGUI.VIEW_ROUND_REPORT);
viewRoundReport.setMnemonic(KeyEvent.VK_R);
viewRoundReport.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_R,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
menu.add(viewRoundReport);
menu.addSeparator();
viewGameOptions = new JMenuItem(Messages.getString("CommonMenuBar.viewGameOptions")); //$NON-NLS-1$
Expand All @@ -491,7 +491,7 @@ public CommonMenuBar() {
viewLOSSetting.setActionCommand(ClientGUI.VIEW_LOS_SETTING);
viewLOSSetting.setMnemonic(KeyEvent.VK_L);
viewLOSSetting.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_L,
getToolkit().getMenuShortcutKeyMask()));
getToolkit().getMenuShortcutKeyMaskEx()));
menu.add(viewLOSSetting);
viewPlayerSettings = new JMenuItem(Messages.getString("CommonMenuBar.viewPlayerSettings")); //$NON-NLS-1$
viewPlayerSettings.setActionCommand(ClientGUI.VIEW_PLAYER_SETTINGS);
Expand Down Expand Up @@ -807,7 +807,7 @@ public CommonMenuBar() {
private JMenuItem createMenuItem(JMenu m, String label, String command, int shortcut) {
JMenuItem mi = createMenuItem(m, label, command);
mi.setMnemonic(shortcut);
mi.setAccelerator(KeyStroke.getKeyStroke(shortcut, getToolkit().getMenuShortcutKeyMask()));
mi.setAccelerator(KeyStroke.getKeyStroke(shortcut, getToolkit().getMenuShortcutKeyMaskEx()));
return mi;
}

Expand Down
16 changes: 8 additions & 8 deletions megamek/src/megamek/client/ui/swing/CommonSettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,16 +1132,16 @@ private void update() {
}
int modifiers = 0;
if (txtModifiers.getText().contains(
KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK))){
modifiers |= KeyEvent.SHIFT_MASK;
KeyEvent.getModifiersExText(KeyEvent.SHIFT_DOWN_MASK))){
modifiers |= KeyEvent.SHIFT_DOWN_MASK;
}
if (txtModifiers.getText().contains(
KeyEvent.getKeyModifiersText(KeyEvent.ALT_MASK))){
modifiers |= KeyEvent.ALT_MASK;
KeyEvent.getModifiersExText(KeyEvent.ALT_DOWN_MASK))){
modifiers |= KeyEvent.ALT_DOWN_MASK;
}
if (txtModifiers.getText().contains(
KeyEvent.getKeyModifiersText(KeyEvent.CTRL_MASK))){
modifiers |= KeyEvent.CTRL_MASK;
KeyEvent.getModifiersExText(KeyEvent.CTRL_DOWN_MASK))){
modifiers |= KeyEvent.CTRL_DOWN_MASK;
}

if (kcb.modifiers != modifiers){
Expand Down Expand Up @@ -1750,7 +1750,7 @@ private JPanel getKeyBindPanel() {
gbc.anchor = GridBagConstraints.CENTER;

final JTextField modifiers = new JTextField(10);
modifiers.setText(KeyEvent.getKeyModifiersText(kcb.modifiers));
modifiers.setText(KeyEvent.getModifiersExText(kcb.modifiers));
for (KeyListener kl : modifiers.getKeyListeners()){
modifiers.removeKeyListener(kl);
}
Expand All @@ -1760,7 +1760,7 @@ private JPanel getKeyBindPanel() {
@Override
public void keyPressed(KeyEvent evt) {
modifiers.setText(
KeyEvent.getKeyModifiersText(evt.getModifiers()));
KeyEvent.getModifiersExText(evt.getModifiersEx()));
evt.consume();
}

Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/client/ui/swing/DeployMinefieldDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ public void hexMoused(BoardViewEvent b) {

// ignore buttons other than 1
if (!clientgui.getClient().isMyTurn()
|| ((b.getModifiers() & InputEvent.BUTTON1_MASK) == 0)) {
|| ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) == 0)) {
return;
}

Expand Down
8 changes: 4 additions & 4 deletions megamek/src/megamek/client/ui/swing/DeploymentDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,19 +494,19 @@ public void hexMoused(BoardViewEvent b) {

// ignore buttons other than 1
if (!clientgui.getClient().isMyTurn() || (ce() == null)
|| ((b.getModifiers() & InputEvent.BUTTON1_MASK) == 0)) {
|| ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) == 0)) {
return;
}

// control pressed means a line of sight check.
// added ALT_MASK by kenn
if (((b.getModifiers() & InputEvent.CTRL_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_MASK) != 0)) {
if (((b.getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0)) {
return;
}

// check for shifty goodness
boolean shiftheld = (b.getModifiers() & InputEvent.SHIFT_MASK) != 0;
boolean shiftheld = (b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0;

// check for a deployment
Coords moveto = b.getCoords();
Expand Down
10 changes: 5 additions & 5 deletions megamek/src/megamek/client/ui/swing/FiringDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2033,18 +2033,18 @@ public void hexMoused(BoardViewEvent b) {

// ignore buttons other than 1
if (!clientgui.getClient().isMyTurn()
|| ((b.getModifiers() & InputEvent.BUTTON1_MASK) == 0)) {
|| ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) == 0)) {
return;
}
// control pressed means a line of sight check.
// added ALT_MASK by kenn
if (((b.getModifiers() & InputEvent.CTRL_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_MASK) != 0)) {
if (((b.getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0)) {
return;
}
// check for shifty goodness
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_MASK) != 0;
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0;
}

if (b.getType() == BoardViewEvent.BOARD_HEX_DRAGGED) {
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/client/ui/swing/MapMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,9 +1376,9 @@ void plotCourse(ActionEvent e) {
((MovementDisplay) currentPanel).actionPerformed(e);

// Cursor over the hex.
((BoardView1) gui.bv).mouseAction(coords, BoardViewEvent.BOARD_HEX_CURSOR, InputEvent.BUTTON1_MASK);
((BoardView1) gui.bv).mouseAction(coords, BoardViewEvent.BOARD_HEX_CURSOR, InputEvent.BUTTON1_DOWN_MASK);
// Click
((BoardView1) gui.bv).mouseAction(coords, BoardViewEvent.BOARD_HEX_CLICKED, InputEvent.BUTTON1_MASK);
((BoardView1) gui.bv).mouseAction(coords, BoardViewEvent.BOARD_HEX_CLICKED, InputEvent.BUTTON1_DOWN_MASK);
}

Targetable decodeTargetInfo(String info) {
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/client/ui/swing/MiniMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,7 +1724,7 @@ void processMouseClick(int x, int y, MouseEvent me) {
|| (y > (getSize().height - topMargin - 14))) {
return;
}
if ((me.getModifiers() & InputEvent.CTRL_MASK) != 0) {
if ((me.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0) {
m_bview.checkLOS(translateCoords(x - leftMargin, y - topMargin));
} else {
m_bview.centerOnPointRel(
Expand Down
10 changes: 5 additions & 5 deletions megamek/src/megamek/client/ui/swing/MovementDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,18 +1741,18 @@ public synchronized void hexMoused(BoardViewEvent b) {

// ignore buttons other than 1
if (!clientgui.getClient().isMyTurn()
|| ((b.getModifiers() & InputEvent.BUTTON1_MASK) == 0)) {
|| ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) == 0)) {
return;
}
// control pressed means a line of sight check.
// added ALT_MASK by kenn
if (((b.getModifiers() & InputEvent.CTRL_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_MASK) != 0)) {
if (((b.getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0)) {
return;
}
// check for shifty goodness
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_MASK) != 0;
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0;
}
Coords currPosition = cmd != null ? cmd.getFinalCoords()
: ce != null ? ce.getPosition() : null;
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/client/ui/swing/PhysicalDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,11 +1476,11 @@ public void hexMoused(BoardViewEvent b) {
}

// control pressed means a line of sight check.
if ((b.getModifiers() & InputEvent.CTRL_MASK) != 0) {
if ((b.getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0) {
return;
}
if (clientgui.getClient().isMyTurn()
&& ((b.getModifiers() & InputEvent.BUTTON1_MASK) != 0)) {
&& ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) != 0)) {
if (b.getType() == BoardViewEvent.BOARD_HEX_DRAGGED) {
if (!b.getCoords().equals(
clientgui.getBoardView().getLastCursor())) {
Expand Down
10 changes: 5 additions & 5 deletions megamek/src/megamek/client/ui/swing/PointblankShotDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,18 +923,18 @@ public void hexMoused(BoardViewEvent b) {

// ignore buttons other than 1
if (!clientgui.isProcessingPointblankShot()
|| ((b.getModifiers() & InputEvent.BUTTON1_MASK) == 0)) {
|| ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) == 0)) {
return;
}
// control pressed means a line of sight check.
// added ALT_MASK by kenn
if (((b.getModifiers() & InputEvent.CTRL_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_MASK) != 0)) {
if (((b.getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0)) {
return;
}
// check for shifty goodness
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_MASK) != 0;
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0;
}

if (b.getType() == BoardViewEvent.BOARD_HEX_DRAGGED) {
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/client/ui/swing/Ruler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ private LosEffects.AttackInfo buildAttackInfo(Coords c1, Coords c2, int h1,
}

public void hexMoused(BoardViewEvent b) {
if ((b.getModifiers() & InputEvent.ALT_MASK) != 0) {
if ((b.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0) {
if (b.getType() == BoardViewEvent.BOARD_HEX_CLICKED) {
addPoint(b.getCoords());
}
Expand Down
2 changes: 1 addition & 1 deletion megamek/src/megamek/client/ui/swing/SelectArtyAutoHitHexDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public void hexMoused(BoardViewEvent b) {

// ignore buttons other than 1
if (!clientgui.getClient().isMyTurn()
|| ((b.getModifiers() & InputEvent.BUTTON1_MASK) == 0)) {
|| ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) == 0)) {
return;
}

Expand Down
10 changes: 5 additions & 5 deletions megamek/src/megamek/client/ui/swing/TargetingPhaseDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,18 +1295,18 @@ public void hexMoused(BoardViewEvent b) {

// ignore buttons other than 1
if (!clientgui.getClient().isMyTurn()
|| ((b.getModifiers() & InputEvent.BUTTON1_MASK) == 0)) {
|| ((b.getModifiers() & InputEvent.BUTTON1_DOWN_MASK) == 0)) {
return;
}
// control pressed means a line of sight check.
// added ALT_MASK by kenn
if (((b.getModifiers() & InputEvent.CTRL_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_MASK) != 0)) {
if (((b.getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0)
|| ((b.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0)) {
return;
}
// check for shifty goodness
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_MASK) != 0;
if (shiftheld != ((b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0)) {
shiftheld = (b.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0;
}

if (b.getType() == BoardViewEvent.BOARD_HEX_DRAGGED) {
Expand Down
16 changes: 8 additions & 8 deletions megamek/src/megamek/client/ui/swing/boardview/BoardView1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ public void mouseDragged(MouseEvent e) {
// only scroll when we should
if (!shouldScroll) {
mouseAction(getCoordsAt(point), BOARD_HEX_DRAG,
e.getModifiers());
e.getModifiersEx());
return;
}
// if we have not yet been dragging, set the var so popups don't
Expand Down Expand Up @@ -4836,7 +4836,7 @@ public void mousePressed(MouseEvent me) {
}

if (me.isPopupTrigger() && !dragging) {
mouseAction(getCoordsAt(point), BOARD_HEX_POPUP, me.getModifiers());
mouseAction(getCoordsAt(point), BOARD_HEX_POPUP, me.getModifiersEx());
return;
}
for (int i = 0; i < displayables.size(); i++) {
Expand All @@ -4856,14 +4856,14 @@ public void mousePressed(MouseEvent me) {
return;
}
}
mouseAction(getCoordsAt(point), BOARD_HEX_DRAG, me.getModifiers());
mouseAction(getCoordsAt(point), BOARD_HEX_DRAG, me.getModifiersEx());
}

public void mouseReleased(MouseEvent me) {
// don't show the popup if we are drag-scrolling
if (me.isPopupTrigger() && !dragging) {
mouseAction(getCoordsAt(me.getPoint()), BOARD_HEX_POPUP,
me.getModifiers());
me.getModifiersEx());
// stop scrolling
shouldScroll = false;
return;
Expand All @@ -4887,10 +4887,10 @@ public void mouseReleased(MouseEvent me) {

if (me.getClickCount() == 1) {
mouseAction(getCoordsAt(me.getPoint()), BOARD_HEX_CLICK,
me.getModifiers());
me.getModifiersEx());
} else {
mouseAction(getCoordsAt(me.getPoint()), BOARD_HEX_DOUBLECLICK,
me.getModifiers());
me.getModifiersEx());
}
}

Expand Down Expand Up @@ -5127,7 +5127,7 @@ public void mouseAction(int x, int y, int mtype, int modifiers) {
Coords c = new Coords(x, y);
switch (mtype) {
case BOARD_HEX_CLICK:
if ((modifiers & java.awt.event.InputEvent.CTRL_MASK) != 0) {
if ((modifiers & java.awt.event.InputEvent.CTRL_DOWN_MASK) != 0) {
checkLOS(c);
} else {
processBoardViewEvent(new BoardViewEvent(this, c, null,
Expand Down Expand Up @@ -5945,7 +5945,7 @@ public String getHexTooltip(MouseEvent e) {
if (foundPlayer) txt.append("<BR>"); //$NON-NLS-1$

// Add a hint with keybind that the zones can be shown graphically
String keybindText = KeyEvent.getKeyModifiersText(KeyCommandBind.getBindByCmd("autoArtyDeployZone").modifiers);
String keybindText = KeyEvent.getModifiersExText(KeyCommandBind.getBindByCmd("autoArtyDeployZone").modifiers);
if (!keybindText.isEmpty()) keybindText += "+";
keybindText += KeyEvent.getKeyText(KeyCommandBind.getBindByCmd("autoArtyDeployZone").key);
txt.append(Messages.getString("BoardView1.Tooltip.ArtyAutoHint", keybindText));
Expand Down
Loading