Skip to content

Commit a374c04

Browse files
thurkathurka
committed
use SwingUtilities.isLeftMouseButton to detect left mouse button
1 parent 99cc067 commit a374c04

File tree

11 files changed

+16
-15
lines changed

11 files changed

+16
-15
lines changed

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/ResultsPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void mousePressed(MouseEvent mouseEvent) {
116116
}
117117

118118
public void mouseClicked(MouseEvent mouseEvent) {
119-
if ((mouseEvent.getModifiers() == InputEvent.BUTTON1_MASK) && (!internalCornerButtonClick)) {
119+
if (SwingUtilities.isLeftMouseButton(mouseEvent) && (!internalCornerButtonClick)) {
120120
showColumnSelectionPopup(headerPopup, cornerButton);
121121
}
122122
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JTitledPanel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import javax.swing.JLabel;
6161
import javax.swing.JPanel;
6262
import javax.swing.JToggleButton;
63+
import javax.swing.SwingUtilities;
6364
import javax.swing.UIManager;
6465
import javax.swing.border.BevelBorder;
6566
import javax.swing.border.Border;
@@ -145,7 +146,7 @@ private class DoubleClickListener extends MouseAdapter {
145146
//~ Methods --------------------------------------------------------------------------------------------------------------
146147

147148
public void mouseClicked(MouseEvent e) {
148-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (e.getClickCount() == 2)) {
149+
if (SwingUtilities.isLeftMouseButton(e) && (e.getClickCount() == 2)) {
149150
if (isMaximized()) {
150151
restore();
151152
} else {

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/JTreeTable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ private class TableHeaderListener extends MouseAdapter implements MouseMotionLis
185185
* If new sorting column is selected, the appropriate sorting order for column's datatype is set.
186186
*/
187187
public void mouseClicked(MouseEvent e) {
188-
if (e.getModifiers() == InputEvent.BUTTON1_MASK) {
188+
if (SwingUtilities.isLeftMouseButton(e)) {
189189
int column = tableHeader.columnAtPoint(e.getPoint());
190190
int sortingColumn = headerRenderer.getSortingColumn();
191191

@@ -229,7 +229,7 @@ public void mouseMoved(MouseEvent e) {
229229
* Here the active header button is programatically pressed
230230
*/
231231
public void mousePressed(MouseEvent e) {
232-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (tableHeader.getResizingColumn() == null)) {
232+
if (SwingUtilities.isLeftMouseButton(e) && (tableHeader.getResizingColumn() == null)) {
233233
headerRenderer.setPressedColumn(tableHeader.columnAtPoint(e.getPoint()));
234234
tableHeader.repaint();
235235
}
@@ -239,7 +239,7 @@ public void mousePressed(MouseEvent e) {
239239
* Here the active header button is programatically released
240240
*/
241241
public void mouseReleased(MouseEvent e) {
242-
if (e.getModifiers() == InputEvent.BUTTON1_MASK) {
242+
if (SwingUtilities.isLeftMouseButton(e)) {
243243
headerRenderer.setPressedColumn(-1);
244244
tableHeader.repaint();
245245
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/table/SortableTableModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private class HeaderListener extends MouseAdapter implements MouseMotionListener
5959
* If new sorting column is selected, the appropriate sorting order for column's datatype is set.
6060
*/
6161
public void mouseClicked(MouseEvent e) {
62-
if (e.getModifiers() == InputEvent.BUTTON1_MASK) {
62+
if (SwingUtilities.isLeftMouseButton(e)) {
6363
int column = tableHeader.columnAtPoint(e.getPoint());
6464
int sortingColumn = headerRenderer.getSortingColumn();
6565

@@ -97,7 +97,7 @@ public void mouseMoved(MouseEvent e) {
9797
* Here the active header button is programatically pressed
9898
*/
9999
public void mousePressed(MouseEvent e) {
100-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (tableHeader.getResizingColumn() == null)) {
100+
if (SwingUtilities.isLeftMouseButton(e) && (tableHeader.getResizingColumn() == null)) {
101101
headerRenderer.setPressedColumn(tableHeader.columnAtPoint(e.getPoint()));
102102
tableHeader.repaint();
103103
}
@@ -107,7 +107,7 @@ public void mousePressed(MouseEvent e) {
107107
* Here the active header button is programatically released
108108
*/
109109
public void mouseReleased(MouseEvent e) {
110-
if (e.getModifiers() == InputEvent.BUTTON1_MASK) {
110+
if (SwingUtilities.isLeftMouseButton(e)) {
111111
headerRenderer.setPressedColumn(-1);
112112
tableHeader.repaint();
113113
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CCTDisplay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ public void mouseClicked(MouseEvent e) {
603603
if (popupPath != null) {
604604
treeTable.getTree().setSelectionPath(popupPath);
605605

606-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (e.getClickCount() == 2)) {
606+
if (SwingUtilities.isLeftMouseButton(e) && (e.getClickCount() == 2)) {
607607
if (treeTableModel.isLeaf(popupPath.getPath()[popupPath.getPath().length - 1])) {
608608
showSourceForMethod(popupPath);
609609
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/FlatProfilePanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ public void mouseClicked(MouseEvent e) {
886886
resTable.getSelectionModel().setSelectionInterval(line, line);
887887
methodId = flatProfileContainer.getMethodIdAtRow(line);
888888

889-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (e.getClickCount() == 2)) {
889+
if (SwingUtilities.isLeftMouseButton(e) && (e.getClickCount() == 2)) {
890890
showSourceForMethod(methodId);
891891
}
892892
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/ReverseCallGraphPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ public void mouseClicked(MouseEvent e) {
546546

547547
if (popupPath != null) {
548548
treeTable.getTree().setSelectionPath(popupPath);
549-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (e.getClickCount() == 2)) {
549+
if (SwingUtilities.isLeftMouseButton(e) && (e.getClickCount() == 2)) {
550550
if (treeTableModel.isLeaf(popupPath.getPath()[popupPath.getPath().length - 1])) {
551551
showSourceForMethod(popupPath);
552552
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/SubtreeCallGraphPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ public void mouseClicked(MouseEvent e) {
547547

548548
if (popupPath != null) {
549549
treeTable.getTree().setSelectionPath(popupPath);
550-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (e.getClickCount() == 2)) {
550+
if (SwingUtilities.isLeftMouseButton(e) && (e.getClickCount() == 2)) {
551551
if (treeTableModel.isLeaf(popupPath.getPath()[popupPath.getPath().length - 1])) {
552552
showSourceForMethod(popupPath);
553553
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/LiveReverseMemCallGraphPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ public void mouseClicked(MouseEvent e) {
307307

308308
if (treePath != null) {
309309
treeTable.getTree().setSelectionPath(treePath);
310-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (e.getClickCount() == 2)) {
310+
if (SwingUtilities.isLeftMouseButton(e) && (e.getClickCount() == 2)) {
311311
if (treeTableModel.isLeaf(treePath.getPath()[treePath.getPath().length - 1])) {
312312
performDefaultAction(treePath);
313313
}

‎visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/memory/MemoryResultsPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public void mouseClicked(MouseEvent e) {
248248
//selectedClassId = sortedClassIds[clickedLine];
249249
selectedClassId = sortedClassIds[((Integer) filteredToFullIndexes.get(clickedLine)).intValue()];
250250

251-
if ((e.getModifiers() == InputEvent.BUTTON1_MASK) && (e.getClickCount() == 2)) {
251+
if (SwingUtilities.isLeftMouseButton(e) && (e.getClickCount() == 2)) {
252252
performDefaultAction(selectedClassId);
253253
}
254254
}

0 commit comments

Comments
 (0)