ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "project: Update checkstyle (#1710)"

Browse Source 
This reverts commit 97df39c5d8.
This commit is contained in:
Owain van Brakel
2019-10-04 03:48:51 +02:00
parent 2ed949506e
commit 71ed8abb1f
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -137,7 +137,7 @@ subprojects {
} }
checkstyle { checkstyle {
toolVersion = '8.25' toolVersion = '6.4.1'
sourceSets = [sourceSets.main] sourceSets = [sourceSets.main]
configFile = file("${rootDir}/checkstyle/checkstyle.xml") configFile = file("${rootDir}/checkstyle/checkstyle.xml")
configProperties = [ "suppressionFile" : file("${rootDir}/checkstyle/suppressions.xml")] configProperties = [ "suppressionFile" : file("${rootDir}/checkstyle/suppressions.xml")]

2
checkstyle/checkstyle.xml
View File

@@ -28,8 +28,8 @@
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd"> "https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker"> <module name="Checker">
<module name="SuppressionCommentFilter"/>
<module name="TreeWalker"> <module name="TreeWalker">
<module name="SuppressionCommentFilter"/>
<module name="LeftCurly"> <module name="LeftCurly">
<property name="option" value="nl"/> <property name="option" value="nl"/>
</module> </module>

3
runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java
View File

@@ -189,8 +189,7 @@ public class GauntletPlugin extends Plugin
if (client.getGameState() != GameState.STARTING && client.getGameState() != GameState.UNKNOWN) if (client.getGameState() != GameState.STARTING && client.getGameState() != GameState.UNKNOWN)
{ {
completeStartup = false; completeStartup = false;
clientThread.invoke(() -> clientThread.invoke(() -> {
{
timer.initStates(); timer.initStates();
completeStartup = true; completeStartup = true;
}); });

6
runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
View File

@@ -331,8 +331,7 @@ public class SwingUtil
button.setOpaque(true); button.setOpaque(true);
// Selecting the button option requires us to determine which parent element is the JOptionPane // 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(); JComponent component = (JComponent) e.getSource();
while (component != null) while (component != null)
{ {
@@ -402,8 +401,7 @@ public class SwingUtil
dialog.setIconImage(ImageUtil.getResourceStreamFromClass(SwingUtil.class, "/runeliteplus_transparent.png")); dialog.setIconImage(ImageUtil.getResourceStreamFromClass(SwingUtil.class, "/runeliteplus_transparent.png"));
// Listen for value changes and close dialog when necessary // Listen for value changes and close dialog when necessary
pane.addPropertyChangeListener(e -> pane.addPropertyChangeListener(e -> {
{
String prop = e.getPropertyName(); String prop = e.getPropertyName();
if (dialog.isVisible() if (dialog.isVisible()