X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=0087a5fbdc676e5ce305f29394ff5ce5891d89a8;hb=832101caf0bd7b01d0103879875a724078ea118f;hp=fee68c8ef114aac64020899490c85df5b6571e33;hpb=3027bfb4b1b13af8686abcd419888e03141bd672;p=jalview.git

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index fee68c8..0087a5f 100644
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -42,6 +42,7 @@ import jalview.structure.VamsasSource;
 import jalview.util.Comparison;
 import jalview.util.MappingUtils;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 import jalview.viewmodel.AlignmentViewport;
 
 import java.awt.BorderLayout;
@@ -499,9 +500,7 @@ 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 ((evt.getModifiersEx()
-            & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK
-            && !av.MAC)
+    if (Platform.isWinMiddleButton(evt))
     {
       mouseWheelPressed = true;
       return;
@@ -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
@@ -773,7 +772,7 @@ public class SeqPanel extends Panel implements MouseMotionListener,
   @Override
   public void updateColours(SequenceI seq, int index)
   {
-    System.out.println("update the seqPanel colours");
+    jalview.bin.Console.outPrintln("update the seqPanel colours");
     // repaint();
   }
 
@@ -908,7 +907,8 @@ public class SeqPanel extends Panel implements MouseMotionListener,
    */
   List<SequenceFeature> findFeaturesAtColumn(SequenceI sequence, int column)
   {
-    return seqCanvas.getFeatureRenderer().findFeaturesAtColumn(sequence, column);
+    return seqCanvas.getFeatureRenderer().findFeaturesAtColumn(sequence,
+            column);
   }
 
   Tooltip tooltip;
@@ -1196,9 +1196,9 @@ public class SeqPanel extends Panel implements MouseMotionListener,
         {
           if (sg.getSize() == av.getAlignment().getHeight())
           {
-            if ((av.hasHiddenColumns() && startres < av.getAlignment()
-                    .getHiddenColumns()
-                    .getNextHiddenBoundary(false, startres)))
+            if ((av.hasHiddenColumns()
+                    && startres < av.getAlignment().getHiddenColumns()
+                            .getNextHiddenBoundary(false, startres)))
             {
               endEditing();
               return;
@@ -1817,9 +1817,11 @@ public class SeqPanel extends Panel implements MouseMotionListener,
       {
         if (av.getAlignment() == null)
         {
-          System.out.println("Selection message: alignviewport av SeqSetId="
-                  + av.getSequenceSetId() + " ViewId=" + av.getViewId()
-                  + " 's alignment is NULL! returning immediatly.");
+          jalview.bin.Console.outPrintln(
+                  "Selection message: alignviewport av SeqSetId="
+                          + av.getSequenceSetId() + " ViewId="
+                          + av.getViewId()
+                          + " 's alignment is NULL! returning immediatly.");
           return;
         }
         sgroup = seqsel.intersect(av.getAlignment(),
@@ -1869,7 +1871,7 @@ public class SeqPanel extends Panel implements MouseMotionListener,
     if (copycolsel && av.hasHiddenColumns()
             && (av.getColumnSelection() == null))
     {
-      System.err.println("Bad things");
+      jalview.bin.Console.errPrintln("Bad things");
     }
     if (repaint)
     {