From 5724c0c8df28bdf3911f19356806969a3b820b35 Mon Sep 17 00:00:00 2001
From: FearFree <fearfree@cubetown.net>
Date: Thu, 20 Mar 2014 10:54:07 -0500
Subject: Future Java versions may not support _ as identifier.

---
 .../com/earth2me/essentials/geoip/EssentialsGeoIP.java   |  4 ++--
 .../essentials/geoip/EssentialsGeoIPPlayerListener.java  | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'EssentialsGeoIP/src/com/earth2me/essentials')

diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
index 02e901b5b..aced4ccb8 100644
--- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
+++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
@@ -1,6 +1,6 @@
 package com.earth2me.essentials.geoip;
 
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
 import net.ess3.api.IEssentials;
 import java.util.logging.Level;
 import org.bukkit.plugin.PluginManager;
@@ -25,7 +25,7 @@ public class EssentialsGeoIP extends JavaPlugin
 		final IEssentials ess = (IEssentials)pm.getPlugin("Essentials");
 		if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion()))
 		{
-			getLogger().log(Level.WARNING, _("versionMismatchAll"));
+			getLogger().log(Level.WARNING, tl("versionMismatchAll"));
 		}
 		if (!ess.isEnabled()) {
 			this.setEnabled(false);
diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
index 89debe9fe..a6cb28ddc 100644
--- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
+++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.geoip;
 
 import com.earth2me.essentials.EssentialsConf;
-import static com.earth2me.essentials.I18n._;
+import static com.earth2me.essentials.I18n.tl;
 import com.earth2me.essentials.IConf;
 import com.earth2me.essentials.User;
 import net.ess3.api.IEssentials;
@@ -96,7 +96,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IConf
 				User user = ess.getUser(onlinePlayer);
 				if (user.isAuthorized("essentials.geoip.show"))
 				{
-					user.sendMessage(_("geoipJoinFormat", u.getDisplayName(), sb.toString()));
+					user.sendMessage(tl("geoipJoinFormat", u.getDisplayName(), sb.toString()));
 				}
 			}
 		}
@@ -123,7 +123,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IConf
 			}
 			else
 			{
-				logger.log(Level.SEVERE, _("cantFindGeoIpDB"));
+				logger.log(Level.SEVERE, tl("cantFindGeoIpDB"));
 				return;
 			}
 		}
@@ -133,7 +133,7 @@ public class EssentialsGeoIPPlayerListener implements Listener, IConf
 		}
 		catch (IOException ex)
 		{
-			logger.log(Level.SEVERE, _("cantReadGeoIpDB"), ex);
+			logger.log(Level.SEVERE, tl("cantReadGeoIpDB"), ex);
 		}
 	}
 
@@ -152,10 +152,10 @@ public class EssentialsGeoIPPlayerListener implements Listener, IConf
 			}
 			if (url == null || url.isEmpty())
 			{
-				logger.log(Level.SEVERE, _("geoIpUrlEmpty"));
+				logger.log(Level.SEVERE, tl("geoIpUrlEmpty"));
 				return;
 			}
-			logger.log(Level.INFO, _("downloadingGeoIp"));
+			logger.log(Level.INFO, tl("downloadingGeoIp"));
 			URL downloadUrl = new URL(url);
 			URLConnection conn = downloadUrl.openConnection();
 			conn.setConnectTimeout(10000);
@@ -178,12 +178,12 @@ public class EssentialsGeoIPPlayerListener implements Listener, IConf
 		}
 		catch (MalformedURLException ex)
 		{
-			logger.log(Level.SEVERE, _("geoIpUrlInvalid"), ex);
+			logger.log(Level.SEVERE, tl("geoIpUrlInvalid"), ex);
 			return;
 		}
 		catch (IOException ex)
 		{
-			logger.log(Level.SEVERE, _("connectionFailed"), ex);
+			logger.log(Level.SEVERE, tl("connectionFailed"), ex);
 		}
 	}
 }
-- 
cgit v1.2.3