diff --git a/runelite-client/src/main/java/net/runelite/client/input/MouseAdapter.java b/runelite-client/src/main/java/net/runelite/client/input/MouseAdapter.java new file mode 100644 index 0000000000..0b2274ccc3 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/input/MouseAdapter.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2018, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.input; + +import java.awt.event.MouseEvent; + +public abstract class MouseAdapter implements MouseListener +{ + @Override + public MouseEvent mouseClicked(MouseEvent mouseEvent) + { + return mouseEvent; + } + + @Override + public MouseEvent mousePressed(MouseEvent mouseEvent) + { + return mouseEvent; + } + + @Override + public MouseEvent mouseReleased(MouseEvent mouseEvent) + { + return mouseEvent; + } + + @Override + public MouseEvent mouseEntered(MouseEvent mouseEvent) + { + return mouseEvent; + } + + @Override + public MouseEvent mouseExited(MouseEvent mouseEvent) + { + return mouseEvent; + } + + @Override + public MouseEvent mouseDragged(MouseEvent mouseEvent) + { + return mouseEvent; + } + + @Override + public MouseEvent mouseMoved(MouseEvent mouseEvent) + { + return mouseEvent; + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/input/MouseListener.java b/runelite-client/src/main/java/net/runelite/client/input/MouseListener.java index cf686e9bc6..91547bded8 100644 --- a/runelite-client/src/main/java/net/runelite/client/input/MouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/input/MouseListener.java @@ -26,40 +26,19 @@ package net.runelite.client.input; import java.awt.event.MouseEvent; -public abstract class MouseListener +public interface MouseListener { - public MouseEvent mouseClicked(MouseEvent mouseEvent) - { - return mouseEvent; - } + MouseEvent mouseClicked(MouseEvent mouseEvent); - public MouseEvent mousePressed(MouseEvent mouseEvent) - { - return mouseEvent; - } + MouseEvent mousePressed(MouseEvent mouseEvent); - public MouseEvent mouseReleased(MouseEvent mouseEvent) - { - return mouseEvent; - } + MouseEvent mouseReleased(MouseEvent mouseEvent); - public MouseEvent mouseEntered(MouseEvent mouseEvent) - { - return mouseEvent; - } + MouseEvent mouseEntered(MouseEvent mouseEvent); - public MouseEvent mouseExited(MouseEvent mouseEvent) - { - return mouseEvent; - } + MouseEvent mouseExited(MouseEvent mouseEvent); - public MouseEvent mouseDragged(MouseEvent mouseEvent) - { - return mouseEvent; - } + MouseEvent mouseDragged(MouseEvent mouseEvent); - public MouseEvent mouseMoved(MouseEvent mouseEvent) - { - return mouseEvent; - } + MouseEvent mouseMoved(MouseEvent mouseEvent); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java index 34a3c1499f..c2533d59e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java @@ -31,11 +31,11 @@ import javax.swing.SwingUtilities; import net.runelite.api.Client; import net.runelite.api.MenuEntry; import net.runelite.client.input.KeyListener; -import net.runelite.client.input.MouseListener; +import net.runelite.client.input.MouseAdapter; import static net.runelite.client.plugins.grandexchange.GrandExchangePlugin.SEARCH_GRAND_EXCHANGE; import net.runelite.client.util.Text; -public class GrandExchangeInputListener extends MouseListener implements KeyListener +public class GrandExchangeInputListener extends MouseAdapter implements KeyListener { private final Client client; private final GrandExchangePlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java index 12924221eb..61c09a3c37 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java @@ -30,9 +30,9 @@ import java.awt.event.MouseEvent; import javax.inject.Inject; import javax.swing.SwingUtilities; import net.runelite.client.input.KeyListener; -import net.runelite.client.input.MouseListener; +import net.runelite.client.input.MouseAdapter; -public class GroundItemInputListener extends MouseListener implements KeyListener +public class GroundItemInputListener extends MouseAdapter implements KeyListener { private static final int HOTKEY = KeyEvent.VK_ALT; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java index 62ea0e40c1..ae75a638ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java @@ -31,10 +31,10 @@ import java.awt.event.MouseWheelEvent; import javax.inject.Inject; import javax.swing.SwingUtilities; import net.runelite.client.input.KeyListener; -import net.runelite.client.input.MouseListener; +import net.runelite.client.input.MouseAdapter; import net.runelite.client.input.MouseWheelListener; -public class InstanceMapInputListener extends MouseListener implements KeyListener, MouseWheelListener +public class InstanceMapInputListener extends MouseAdapter implements KeyListener, MouseWheelListener { @Inject private InstanceMapPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java index 45ad954fcd..e00114041d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java @@ -26,9 +26,9 @@ package net.runelite.client.plugins.screenmarkers; import java.awt.event.MouseEvent; import javax.swing.SwingUtilities; -import net.runelite.client.input.MouseListener; +import net.runelite.client.input.MouseAdapter; -public class ScreenMarkerMouseListener extends MouseListener +public class ScreenMarkerMouseListener extends MouseAdapter { private final ScreenMarkerPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java index addfa6963c..403fa6bb24 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedfixedmode/TranslateMouseListener.java @@ -33,7 +33,7 @@ import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.client.input.MouseListener; -public class TranslateMouseListener extends MouseListener +public class TranslateMouseListener implements MouseListener { private final Client client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraListener.java index d69362e3d0..8d298deb85 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraListener.java @@ -35,9 +35,9 @@ import net.runelite.api.GameState; import net.runelite.api.VarClientStr; import net.runelite.client.callback.ClientThread; import net.runelite.client.input.KeyListener; -import net.runelite.client.input.MouseListener; +import net.runelite.client.input.MouseAdapter; -class WASDCameraListener extends MouseListener implements KeyListener +class WASDCameraListener extends MouseAdapter implements KeyListener { @Inject private WASDCameraPlugin plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 8fbfac119d..e0763a1031 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -45,11 +45,11 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; -import net.runelite.client.input.MouseListener; +import net.runelite.client.input.MouseAdapter; import net.runelite.client.input.MouseManager; @Singleton -public class OverlayRenderer extends MouseListener implements KeyListener +public class OverlayRenderer extends MouseAdapter implements KeyListener { private static final int BORDER = 5; private static final int BORDER_TOP = BORDER + 15; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java index 3ba2d3819b..ebca05deb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/worldmap/WorldMapOverlayMouseListener.java @@ -36,10 +36,10 @@ import net.runelite.api.RenderOverview; import net.runelite.api.coords.WorldPoint; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.input.MouseListener; +import net.runelite.client.input.MouseAdapter; @Singleton -public class WorldMapOverlayMouseListener extends MouseListener +public class WorldMapOverlayMouseListener extends MouseAdapter { private final Client client; private final WorldMapPointManager worldMapPointManager;