X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=776e9ad6b90787c4d8334e0eff415f6d54f16c15;hb=6200addf078b7f7ace90597dc056dafc7fc602c1;hp=ed3d8faac300c520dd281579627e2891ab587eab;hpb=4b1c969e87feaefd4fb9c49ba3d6b828b3ce1a9c;p=jalview.git diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java index ed3d8fa..776e9ad 100644 --- a/src/jalview/appletgui/SeqPanel.java +++ b/src/jalview/appletgui/SeqPanel.java @@ -500,7 +500,6 @@ public class SeqPanel extends Panel implements MouseMotionListener, // For now, ignore the mouseWheel font resizing on Macs // As the Button2_mask always seems to be true - if (Platform.isWinMiddleButton(evt)) { mouseWheelPressed = true; @@ -744,7 +743,7 @@ public class SeqPanel extends Panel implements MouseMotionListener, } @Override - public void highlightSequence(SearchResultsI results) + public String highlightSequence(SearchResultsI results) { if (av.isFollowHighlight()) { @@ -761,7 +760,7 @@ public class SeqPanel extends Panel implements MouseMotionListener, } setStatusMessage(results); seqCanvas.highlightSearchResults(results); - + return null; } @Override @@ -820,8 +819,7 @@ public class SeqPanel extends Panel implements MouseMotionListener, { if (av.getAlignment().isNucleotide()) { - String base = ResidueProperties.nucleotideName - .get(String.valueOf(ch)); // BH 2020.04.07 just Eclipse warning + String base = ResidueProperties.nucleotideName.get(ch); text.append(" Nucleotide: ").append(base == null ? ch : base); } else @@ -1433,8 +1431,8 @@ public class SeqPanel extends Panel implements MouseMotionListener, } // DETECT RIGHT MOUSE BUTTON IN AWT - if ((evt.getModifiers() - & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK) + if ((evt.getModifiersEx() + & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) { List allFeatures = findFeaturesAtColumn(sequence, sequence.findPosition(column + 1));