summaryrefslogtreecommitdiffstats
path: root/EssentialsUpdate/src
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-21 02:55:26 +0100
committersnowleo <schneeleo@gmail.com>2011-11-21 02:55:26 +0100
commit220d68f375bd117587c91f9478434eee517a33d7 (patch)
tree6344f983d195a4c8d091afffc9d2f8bdbca929bb /EssentialsUpdate/src
parent19f5a2340d9fdb3902f5c388f463fd569943db07 (diff)
downloadEssentials-220d68f375bd117587c91f9478434eee517a33d7.tar
Essentials-220d68f375bd117587c91f9478434eee517a33d7.tar.gz
Essentials-220d68f375bd117587c91f9478434eee517a33d7.tar.lz
Essentials-220d68f375bd117587c91f9478434eee517a33d7.tar.xz
Essentials-220d68f375bd117587c91f9478434eee517a33d7.zip
Switch to the new I18n class and format cleanup of all classes
Diffstat (limited to 'EssentialsUpdate/src')
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java10
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java9
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java4
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java6
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java4
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java2
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java6
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java10
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java5
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java2
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java2
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java7
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java2
-rw-r--r--EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java6
-rwxr-xr-xEssentialsUpdate/src/org/jibble/pircbot/InputThread.java4
-rwxr-xr-xEssentialsUpdate/src/org/jibble/pircbot/OutputThread.java3
-rwxr-xr-xEssentialsUpdate/src/org/jibble/pircbot/PircBot.java13
-rwxr-xr-xEssentialsUpdate/src/org/jibble/pircbot/User.java6
18 files changed, 46 insertions, 55 deletions
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java b/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java
index 487e372c8..d2cbb8a64 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java
@@ -13,13 +13,15 @@ public abstract class AbstractWorkListener
private final transient Plugin plugin;
private final transient VersionInfo newVersionInfo;
- public final void onWorkAbort() {
+ public final void onWorkAbort()
+ {
onWorkAbort(null);
}
-
+
public abstract void onWorkAbort(String message);
-
- public final void onWorkDone() {
+
+ public final void onWorkDone()
+ {
onWorkDone(null);
}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java b/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java
index ec62566ca..4ed1df602 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java
@@ -1,13 +1,6 @@
package com.earth2me.essentials.update;
-import com.earth2me.essentials.update.chat.Command;
-import com.earth2me.essentials.update.chat.ConfigCommand;
-import com.earth2me.essentials.update.chat.ErrorsCommand;
-import com.earth2me.essentials.update.chat.HelpCommand;
-import com.earth2me.essentials.update.chat.IrcBot;
-import com.earth2me.essentials.update.chat.ListCommand;
-import com.earth2me.essentials.update.chat.StartupCommand;
-import com.earth2me.essentials.update.chat.UsernameUtil;
+import com.earth2me.essentials.update.chat.*;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java b/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java
index 98dbeb2ef..be6e42ce9 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java
@@ -1,6 +1,5 @@
package com.earth2me.essentials.update;
-import com.earth2me.essentials.update.UpdateCheck.CheckResult;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -16,7 +15,8 @@ public class EssentialsUpdate extends JavaPlugin
@Override
public void onEnable()
{
- if (!getDataFolder().exists() && !getDataFolder().mkdirs() ) {
+ if (!getDataFolder().exists() && !getDataFolder().mkdirs())
+ {
Bukkit.getLogger().log(Level.SEVERE, "Could not create data folder: {0}", getDataFolder().getPath());
}
essentialsHelp = new EssentialsHelp(this);
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java b/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java
index b48d95dd2..06b414e93 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java
@@ -1,10 +1,6 @@
package com.earth2me.essentials.update;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
import java.math.BigInteger;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java
index 95ef5e64e..3d465e2e8 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java
@@ -15,8 +15,8 @@ import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
public class UpdateFile
@@ -66,7 +66,7 @@ public class UpdateFile
getFile = new GetFile(UPDATE_URL);
getFile.saveTo(file);
plugin.getConfig().set("lastupdate", System.currentTimeMillis());
- plugin.getConfig().save(new File(plugin.getDataFolder(),"config.yml"));
+ plugin.getConfig().save(new File(plugin.getDataFolder(), "config.yml"));
return true;
}
catch (IOException ex)
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java b/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java
index c34e40ae5..b9cddc38c 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java
@@ -1,10 +1,10 @@
package com.earth2me.essentials.update;
-import org.bukkit.configuration.Configuration;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.bukkit.configuration.Configuration;
public class VersionInfo
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java
index 824383285..7c99d28f6 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java
@@ -1,11 +1,7 @@
package com.earth2me.essentials.update.chat;
import com.earth2me.essentials.update.PastieUpload;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.*;
import java.nio.charset.Charset;
import org.bukkit.plugin.Plugin;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java
index 5fda07106..de2c6a830 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java
@@ -26,12 +26,16 @@ public class ConfigCommand extends AbstractFileCommand implements Command
do
{
final String line = page.readLine();
- if (line == null) {
+ if (line == null)
+ {
break;
- } else {
+ }
+ else
+ {
input.append(line).append("\n");
}
- } while (true);
+ }
+ while (true);
page.close();
final String message = "Essentials config.yml: " + uploadToPastie(input);
player.sendMessage("§6" + ircBot.getNick() + ": §7" + message);
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
index 7478d81b7..2c85c39fd 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
@@ -26,9 +26,8 @@ public abstract class AbstractState
catch (Exception ex)
{
/*
- * This should never happen.
- * All states that are added to the map automatically,
- * have to have a Constructor that accepts the StateMap.
+ * This should never happen. All states, that are added to the map automatically, have to have a
+ * Constructor that accepts the StateMap.
*/
throw new RuntimeException(ex);
}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java
index cb88cc642..930a31bda 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java
@@ -8,5 +8,5 @@ public class InstallationFinishedEvent extends Event
public InstallationFinishedEvent()
{
super(Type.CUSTOM_EVENT);
- }
+ }
}
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
index 6db8734e7..6ce926f92 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials.update.states;
-import com.earth2me.essentials.update.UpdateCheck;
import com.earth2me.essentials.update.AbstractWorkListener;
+import com.earth2me.essentials.update.UpdateCheck;
import java.util.Iterator;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java
index 5671275f0..6b48f90be 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java
@@ -8,17 +8,18 @@ public class UpdateOrInstallation extends AbstractState
{
private final transient UpdateCheck updateCheck;
private transient boolean update = false;
-
+
public UpdateOrInstallation(final StateMap stateMap, final UpdateCheck updateCheck)
{
super(stateMap);
this.updateCheck = updateCheck;
}
-
+
@Override
public boolean guessAnswer()
{
- if (getUpdateCheck().isEssentialsInstalled()) {
+ if (getUpdateCheck().isEssentialsInstalled())
+ {
update = true;
}
return update;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java b/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java
index 66eeb380d..778f5172f 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java
@@ -1,9 +1,9 @@
package com.earth2me.essentials.update.tasks;
+import com.earth2me.essentials.update.AbstractWorkListener;
import com.earth2me.essentials.update.GetFile;
import com.earth2me.essentials.update.ModuleInfo;
import com.earth2me.essentials.update.VersionInfo;
-import com.earth2me.essentials.update.AbstractWorkListener;
import java.io.File;
import java.net.URL;
import java.util.logging.Level;
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java
index 777e42517..3baf86be7 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java
@@ -43,8 +43,8 @@ public class SelfUpdate extends AbstractWorkListener implements Task, Runnable
@Override
public void run()
{
- Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), new Runnable() {
-
+ Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), new Runnable()
+ {
@Override
public void run()
{
@@ -52,6 +52,4 @@ public class SelfUpdate extends AbstractWorkListener implements Task, Runnable
}
});
}
-
-
}
diff --git a/EssentialsUpdate/src/org/jibble/pircbot/InputThread.java b/EssentialsUpdate/src/org/jibble/pircbot/InputThread.java
index 1c30ad815..a24815210 100755
--- a/EssentialsUpdate/src/org/jibble/pircbot/InputThread.java
+++ b/EssentialsUpdate/src/org/jibble/pircbot/InputThread.java
@@ -15,8 +15,8 @@ found at http://www.jibble.org/licenses/
package org.jibble.pircbot;
import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.net.Socket;
+import java.util.StringTokenizer;
/**
* A Thread which reads lines from the IRC server. It then
diff --git a/EssentialsUpdate/src/org/jibble/pircbot/OutputThread.java b/EssentialsUpdate/src/org/jibble/pircbot/OutputThread.java
index 86ac404d2..7eddee873 100755
--- a/EssentialsUpdate/src/org/jibble/pircbot/OutputThread.java
+++ b/EssentialsUpdate/src/org/jibble/pircbot/OutputThread.java
@@ -14,8 +14,7 @@ found at http://www.jibble.org/licenses/
package org.jibble.pircbot;
-import java.io.*;
-import java.net.*;
+import java.io.BufferedWriter;
/**
* A Thread which is responsible for sending messages to the IRC server.
diff --git a/EssentialsUpdate/src/org/jibble/pircbot/PircBot.java b/EssentialsUpdate/src/org/jibble/pircbot/PircBot.java
index a5f049cde..acdf01b46 100755
--- a/EssentialsUpdate/src/org/jibble/pircbot/PircBot.java
+++ b/EssentialsUpdate/src/org/jibble/pircbot/PircBot.java
@@ -15,7 +15,8 @@ found at http://www.jibble.org/licenses/
package org.jibble.pircbot;
import java.io.*;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.Socket;
import java.util.*;
/**
@@ -2558,7 +2559,7 @@ public abstract class PircBot implements ReplyConstants {
* @see #onUserList(String,User[]) onUserList
*/
public final User[] getUsers(String channel) {
- channel = channel.toLowerCase();
+ channel = channel.toLowerCase(Locale.ENGLISH);
User[] userArray = new User[0];
synchronized (_channels) {
Hashtable users = (Hashtable) _channels.get(channel);
@@ -2631,7 +2632,7 @@ public abstract class PircBot implements ReplyConstants {
* Overwrite the existing entry if it exists.
*/
private final void addUser(String channel, User user) {
- channel = channel.toLowerCase();
+ channel = channel.toLowerCase(Locale.ENGLISH);
synchronized (_channels) {
Hashtable users = (Hashtable) _channels.get(channel);
if (users == null) {
@@ -2647,7 +2648,7 @@ public abstract class PircBot implements ReplyConstants {
* Remove a user from the specified channel in our memory.
*/
private final User removeUser(String channel, String nick) {
- channel = channel.toLowerCase();
+ channel = channel.toLowerCase(Locale.ENGLISH);
User user = new User("", nick);
synchronized (_channels) {
Hashtable users = (Hashtable) _channels.get(channel);
@@ -2695,7 +2696,7 @@ public abstract class PircBot implements ReplyConstants {
* Removes an entire channel from our memory of users.
*/
private final void removeChannel(String channel) {
- channel = channel.toLowerCase();
+ channel = channel.toLowerCase(Locale.ENGLISH);
synchronized (_channels) {
_channels.remove(channel);
}
@@ -2713,7 +2714,7 @@ public abstract class PircBot implements ReplyConstants {
private final void updateUser(String channel, int userMode, String nick) {
- channel = channel.toLowerCase();
+ channel = channel.toLowerCase(Locale.ENGLISH);
synchronized (_channels) {
Hashtable users = (Hashtable) _channels.get(channel);
User newUser = null;
diff --git a/EssentialsUpdate/src/org/jibble/pircbot/User.java b/EssentialsUpdate/src/org/jibble/pircbot/User.java
index cb2bfa051..37f981b19 100755
--- a/EssentialsUpdate/src/org/jibble/pircbot/User.java
+++ b/EssentialsUpdate/src/org/jibble/pircbot/User.java
@@ -13,6 +13,8 @@ found at http://www.jibble.org/licenses/
package org.jibble.pircbot;
+import java.util.Locale;
+
/**
* This class is used to represent a user on an IRC server.
* Instances of this class are returned by the getUsers method
@@ -38,7 +40,7 @@ public class User {
User(String prefix, String nick) {
_prefix = prefix;
_nick = nick;
- _lowerNick = nick.toLowerCase();
+ _lowerNick = nick.toLowerCase(Locale.ENGLISH);
}
@@ -109,7 +111,7 @@ public class User {
* @return true if the nicks are identical (case insensitive).
*/
public boolean equals(String nick) {
- return nick.toLowerCase().equals(_lowerNick);
+ return nick.toLowerCase(Locale.ENGLISH).equals(_lowerNick);
}