From 8080abacd6fc379acba4136d0b854d780f262f4e Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 28 Jan 2012 14:17:27 +0000 Subject: More general cleanup. --- EssentialsGeoIP/src/com/maxmind/geoip/DatabaseInfo.java | 2 +- EssentialsGeoIP/src/com/maxmind/geoip/regionName.java | 2 +- EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/EssentialsGeoIP/src/com/maxmind/geoip/DatabaseInfo.java b/EssentialsGeoIP/src/com/maxmind/geoip/DatabaseInfo.java index 939259ebb..dac8c33a1 100644 --- a/EssentialsGeoIP/src/com/maxmind/geoip/DatabaseInfo.java +++ b/EssentialsGeoIP/src/com/maxmind/geoip/DatabaseInfo.java @@ -70,7 +70,7 @@ private static SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); } public int getType() { - if (info == null || info.equals("")) { + if (info == null || info.isEmpty()) { return COUNTRY_EDITION; } else { diff --git a/EssentialsGeoIP/src/com/maxmind/geoip/regionName.java b/EssentialsGeoIP/src/com/maxmind/geoip/regionName.java index da261ca15..3755acf35 100644 --- a/EssentialsGeoIP/src/com/maxmind/geoip/regionName.java +++ b/EssentialsGeoIP/src/com/maxmind/geoip/regionName.java @@ -5,7 +5,7 @@ static public String regionNameByCode(String country_code,String region_code) { String name = null; int region_code2 = -1; if (region_code == null) { return null; } - if (region_code.equals("")) { return null; } + if (region_code.isEmpty()) { return null; } if ( ((region_code.charAt(0) >= 48 ) && ( region_code.charAt(0) < ( 48 + 10 ))) && ((region_code.charAt(1) >= 48 ) && ( region_code.charAt(1) < ( 48 + 10 ))) diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java index 9f040518a..067950e96 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java @@ -11,7 +11,6 @@ import java.util.Locale; import java.util.Map; import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.event.Event.Priority; import org.bukkit.event.EventPriority; -- cgit v1.2.3