From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Mon, 21 Jan 2019 16:46:54 +0000 (-0600)
Subject: removing indirect references to Platform.isAMac()
X-Git-Tag: Release_2_11_4_0~45^2~18^2~307
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=26c6c742815123a3985d9f9fa77372d439ef9263;p=jalview.git

removing indirect references to Platform.isAMac()
---

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 262948d..9004457 100644
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -55,8 +55,6 @@ public class AlignViewport extends AlignmentViewport
 
   public jalview.bin.JalviewLite applet;
 
-  boolean MAC = false;
-
   private AnnotationColumnChooser annotationColumnSelectionState;
 
   public AlignViewport(AlignmentI al, JalviewLite applet)
@@ -120,8 +118,6 @@ public class AlignViewport extends AlignmentViewport
     }
     setFont(font, true);
 
-    MAC = new jalview.util.Platform().isAMac();
-
     if (applet != null)
     {
       setShowJVSuffix(
diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index e07dae6..291ab02 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;
@@ -501,7 +502,7 @@ public class SeqPanel extends Panel implements MouseMotionListener,
     // As the Button2_mask always seems to be true
     if ((evt.getModifiers()
             & InputEvent.BUTTON2_MASK) == InputEvent.BUTTON2_MASK
-            && !av.MAC)
+            && !Platform.isAMac())
     {
       mouseWheelPressed = true;
       return;