From 71ed8abb1f1ee371a463c8e04a82079b638496d3 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 4 Oct 2019 03:48:51 +0200 Subject: [PATCH] Revert "project: Update checkstyle (#1710)" This reverts commit 97df39c5d8bbc2bc9f7cb74ac09e95e9b09d7783. --- build.gradle | 2 +- checkstyle/checkstyle.xml | 2 +- .../runelite/client/plugins/gauntlet/GauntletPlugin.java | 3 +-- .../src/main/java/net/runelite/client/util/SwingUtil.java | 6 ++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 0d6c542e17..29fbc5fc21 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ subprojects { } checkstyle { - toolVersion = '8.25' + toolVersion = '6.4.1' sourceSets = [sourceSets.main] configFile = file("${rootDir}/checkstyle/checkstyle.xml") configProperties = [ "suppressionFile" : file("${rootDir}/checkstyle/suppressions.xml")] diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 26695b1d2d..449e5ab7d9 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -28,8 +28,8 @@ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> + - diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java index 479feb7c2e..9b56c36b6c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java @@ -189,8 +189,7 @@ public class GauntletPlugin extends Plugin if (client.getGameState() != GameState.STARTING && client.getGameState() != GameState.UNKNOWN) { completeStartup = false; - clientThread.invoke(() -> - { + clientThread.invoke(() -> { timer.initStates(); completeStartup = true; }); diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java index c593e7d9e5..1dc821434f 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java +++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java @@ -331,8 +331,7 @@ public class SwingUtil button.setOpaque(true); // Selecting the button option requires us to determine which parent element is the JOptionPane - button.addActionListener(e -> - { + button.addActionListener(e -> { JComponent component = (JComponent) e.getSource(); while (component != null) { @@ -402,8 +401,7 @@ public class SwingUtil dialog.setIconImage(ImageUtil.getResourceStreamFromClass(SwingUtil.class, "/runeliteplus_transparent.png")); // Listen for value changes and close dialog when necessary - pane.addPropertyChangeListener(e -> - { + pane.addPropertyChangeListener(e -> { String prop = e.getPropertyName(); if (dialog.isVisible()