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

Merge pull request #7659 from Nightfirecat/isempty

Browse Source 
client: Use isEmpty() for all Collection emptiness checks
This commit is contained in:
Tomas Slusny
2019-02-02 11:08:50 +00:00
committed by GitHub
parent fc7ff38e26 a5e72ea610
commit a0a86a9f78
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java
View File

@@ -126,7 +126,7 @@ public class ChatboxInputManager
isDone = true; isDone = true;
break; break;
case '\b': case '\b':
if (str.length() > 0) if (!str.isEmpty())
{ {
str = str.substring(0, str.length() - 1); str = str.substring(0, str.length() - 1);
} }

2
runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java
View File

@@ -274,7 +274,7 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse
leftText.setOriginalHeight(h); leftText.setOriginalHeight(h);
leftText.revalidate(); leftText.revalidate();
if (mt.length() > 0) if (!mt.isEmpty())
{ {
cursor.setTextColor(0x113399); cursor.setTextColor(0x113399);
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
View File

@@ -274,7 +274,7 @@ public class DiaryRequirementsPlugin extends Plugin
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
b.append("<col=ffffff>("); b.append("<col=ffffff>(");
assert req.getRequirements().size() > 0; assert !req.getRequirements().isEmpty();
for (Requirement ireq : req.getRequirements()) for (Requirement ireq : req.getRequirements())
{ {
boolean satifisfied = satisfiesRequirement(ireq); boolean satifisfied = satisfiesRequirement(ireq);

2
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java
View File

@@ -284,7 +284,7 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
{ {
this.location = null; this.location = null;
if (digLocations.size() == 0) if (digLocations.isEmpty())
{ {
digLocations.addAll(Arrays.asList(HotColdLocation.values())); digLocations.addAll(Arrays.asList(HotColdLocation.values()));
} }

8
runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
View File

@@ -159,7 +159,7 @@ public class DemonicGorillaPlugin extends Plugin
final DemonicGorilla.AttackStyle... protectedStyles) final DemonicGorilla.AttackStyle... protectedStyles)
{ {
if (gorilla.getAttacksUntilSwitch() <= 0 || if (gorilla.getAttacksUntilSwitch() <= 0 ||
gorilla.getNextPosibleAttackStyles().size() == 0) gorilla.getNextPosibleAttackStyles().isEmpty())
{ {
gorilla.setNextPosibleAttackStyles(Arrays gorilla.setNextPosibleAttackStyles(Arrays
.stream(DemonicGorilla.ALL_REGULAR_ATTACK_STYLES) .stream(DemonicGorilla.ALL_REGULAR_ATTACK_STYLES)
@@ -259,7 +259,7 @@ public class DemonicGorillaPlugin extends Plugin
.filter(x -> x == attackStyle) .filter(x -> x == attackStyle)
.collect(Collectors.toList())); .collect(Collectors.toList()));
if (gorilla.getNextPosibleAttackStyles().size() == 0) if (gorilla.getNextPosibleAttackStyles().isEmpty())
{ {
// Sometimes the gorilla can switch attack style before it's supposed to // Sometimes the gorilla can switch attack style before it's supposed to
// if someone was fighting it earlier and then left, so we just // if someone was fighting it earlier and then left, so we just
@@ -381,7 +381,7 @@ public class DemonicGorillaPlugin extends Plugin
// so we assume it was the gorilla who shot it // so we assume it was the gorilla who shot it
onGorillaAttack(gorilla, DemonicGorilla.AttackStyle.BOULDER); onGorillaAttack(gorilla, DemonicGorilla.AttackStyle.BOULDER);
} }
else if (mp.getRecentHitsplats().size() > 0) else if (!mp.getRecentHitsplats().isEmpty())
{ {
// It wasn't any of the three other attacks, // It wasn't any of the three other attacks,
// but the player took damage, so we assume // but the player took damage, so we assume
@@ -581,7 +581,7 @@ public class DemonicGorillaPlugin extends Plugin
// Player went out of memory, so assume the hit was a 0 // Player went out of memory, so assume the hit was a 0
shouldDecreaseCounter = true; shouldDecreaseCounter = true;
} }
else if (target.getRecentHitsplats().size() == 0) else if (target.getRecentHitsplats().isEmpty())
{ {
// No hitsplats was applied. This may happen in some cases // No hitsplats was applied. This may happen in some cases
// where the player was out of memory while the // where the player was out of memory while the

2
runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
View File

@@ -278,7 +278,7 @@ class WidgetInspector extends JFrame
static WidgetInfo getWidgetInfo(int packedId) static WidgetInfo getWidgetInfo(int packedId)
{ {
if (widgetIdMap.size() == 0) if (widgetIdMap.isEmpty())
{ {
//Initialize map here so it doesn't create the index //Initialize map here so it doesn't create the index
//until it's actually needed. //until it's actually needed.

2
runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
View File

@@ -302,7 +302,7 @@ public class FairyRingPlugin extends Plugin
String code = Text.removeTags(c.getDescription().getName()).replaceAll(" ", ""); String code = Text.removeTags(c.getDescription().getName()).replaceAll(" ", "");
String tags = null; String tags = null;
if (code.length() > 0) if (!code.isEmpty())
{ {
try try
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
View File

@@ -133,7 +133,7 @@ class KourendLibraryOverlay extends Overlay
Color color = bookIsKnown ? Color.ORANGE : Color.WHITE; Color color = bookIsKnown ? Color.ORANGE : Color.WHITE;
// Render the poly on the floor // Render the poly on the floor
if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || possible.size() > 0)) if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || !possible.isEmpty()))
{ {
Polygon poly = getCanvasTilePoly(client, localBookcase); Polygon poly = getCanvasTilePoly(client, localBookcase);
if (poly != null) if (poly != null)