From 5724c0c8df28bdf3911f19356806969a3b820b35 Mon Sep 17 00:00:00 2001 From: FearFree Date: Thu, 20 Mar 2014 10:54:07 -0500 Subject: Future Java versions may not support _ as identifier. --- .../src/com/earth2me/essentials/chat/EssentialsChat.java | 4 ++-- .../essentials/chat/EssentialsChatPlayerListenerNormal.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'EssentialsChat/src/com/earth2me/essentials/chat') diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java index db1d0066c..3ce515f3b 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.chat; -import static com.earth2me.essentials.I18n._; +import static com.earth2me.essentials.I18n.tl; import net.ess3.api.IEssentials; import java.util.Collections; import java.util.HashMap; @@ -23,7 +23,7 @@ public class EssentialsChat extends JavaPlugin final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials"); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) { - LOGGER.log(Level.WARNING, _("versionMismatchAll")); + LOGGER.log(Level.WARNING, tl("versionMismatchAll")); } if (!ess.isEnabled()) { diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java index 284da0a9b..07e81d9d4 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.chat; -import static com.earth2me.essentials.I18n._; +import static com.earth2me.essentials.I18n.tl; import com.earth2me.essentials.User; import static com.earth2me.essentials.chat.EssentialsChatPlayer.logger; import net.ess3.api.IEssentials; @@ -63,14 +63,14 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer final StringBuilder format = new StringBuilder(); format.append(chatStore.getType()).append("Format"); event.setMessage(event.getMessage().substring(1)); - event.setFormat(_(format.toString(), event.getFormat())); + event.setFormat(tl(format.toString(), event.getFormat())); return; } final StringBuilder errorMsg = new StringBuilder(); errorMsg.append("notAllowedTo").append(chatStore.getType().substring(0, 1).toUpperCase(Locale.ENGLISH)).append(chatStore.getType().substring(1)); - user.sendMessage(_(errorMsg.toString())); + user.sendMessage(tl(errorMsg.toString())); event.setCancelled(true); return; } @@ -100,9 +100,9 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer } final String format = event.getFormat(); - event.setFormat(_("chatTypeLocal").concat(event.getFormat())); + event.setFormat(tl("chatTypeLocal").concat(event.getFormat())); - logger.info(_("localFormat", user.getName(), event.getMessage())); + logger.info(tl("localFormat", user.getName(), event.getMessage())); final Iterator it = outList.iterator(); while (it.hasNext()) @@ -137,7 +137,7 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer } if (outList.size() < 2) { - user.sendMessage(_("localNoOne")); + user.sendMessage(tl("localNoOne")); } LocalChatSpyEvent spyEvent = new LocalChatSpyEvent(event.isAsynchronous(), event.getPlayer(), format, event.getMessage(), spyList); -- cgit v1.2.3