X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FPlatformTest.java;h=470e64d0420fdbe1283421891e6314f195f2429f;hb=dcdf54b52932630bbc230a6e553db0a7482a2cb4;hp=307f4507e3c96ce0133fe0033556289b1dc691cb;hpb=37e53fb916ef469eda6fd042701e116d56ff3c0b;p=jalview.git diff --git a/test/jalview/util/PlatformTest.java b/test/jalview/util/PlatformTest.java index 307f450..470e64d 100644 --- a/test/jalview/util/PlatformTest.java +++ b/test/jalview/util/PlatformTest.java @@ -26,7 +26,7 @@ import static org.testng.Assert.assertTrue; import jalview.gui.JvOptionPane; import java.awt.Button; -import java.awt.Event; +import java.awt.event.InputEvent; import java.awt.event.MouseEvent; import org.testng.annotations.BeforeClass; @@ -61,11 +61,11 @@ public class PlatformTest assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.CTRL_MASK; + mods = InputEvent.CTRL_DOWN_MASK; assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.META_MASK; + mods = InputEvent.META_DOWN_MASK; assertTrue(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); @@ -97,11 +97,12 @@ public class PlatformTest assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.CTRL_MASK; + mods = InputEvent.CTRL_DOWN_MASK; assertTrue(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.CTRL_MASK | Event.SHIFT_MASK | Event.ALT_MASK; + mods = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK + | InputEvent.ALT_DOWN_MASK; clickCount = 2; buttonNo = 2; isPopupTrigger = true;