diff options
Diffstat (limited to 'EssentialsUpdate/src/com/earth2me')
14 files changed, 32 insertions, 43 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 } }); } - - } |