TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-03 19:15:44 +00:00
Code Issues Projects Releases Wiki Activity

Switch to the new I18n class and format cleanup of all classes

Browse source
This commit is contained in:
snowleo 2011-11-21 02:55:26 +01:00
parent 19f5a2340d
commit 220d68f375
207 changed files with 1247 additions and 1306 deletions
Download patch file Download diff file Expand all files Collapse all files

37
EssentialsUpdate/nbproject/project.properties
View file

@ -4,6 +4,43 @@ annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=EssentialsUpdate
application.vendor=essentialsteam
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=*
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateImportGroups=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:

10
EssentialsUpdate/src/com/earth2me/essentials/update/AbstractWorkListener.java
View file

@ -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);
}

9
EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsHelp.java
View file

@ -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;

4
EssentialsUpdate/src/com/earth2me/essentials/update/EssentialsUpdate.java
View file

@ -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);

6
EssentialsUpdate/src/com/earth2me/essentials/update/GetFile.java
View file

@ -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;

4
EssentialsUpdate/src/com/earth2me/essentials/update/UpdateFile.java
View file

@ -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)

2
EssentialsUpdate/src/com/earth2me/essentials/update/VersionInfo.java
View file

@ -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

6
EssentialsUpdate/src/com/earth2me/essentials/update/chat/AbstractFileCommand.java
View file

@ -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;

10
EssentialsUpdate/src/com/earth2me/essentials/update/chat/ConfigCommand.java
View file

@ -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);

5
EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
View file

@ -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);
}

2
EssentialsUpdate/src/com/earth2me/essentials/update/states/InstallationFinishedEvent.java
View file

@ -8,5 +8,5 @@ public class InstallationFinishedEvent extends Event
public InstallationFinishedEvent()
{
super(Type.CUSTOM_EVENT);
}
}
}

2
EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
View file

@ -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;

7
EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java
View file

@ -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;

2
EssentialsUpdate/src/com/earth2me/essentials/update/tasks/InstallModule.java
View file

@ -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;

6
EssentialsUpdate/src/com/earth2me/essentials/update/tasks/SelfUpdate.java
View file

@ -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
}
});
}
}

4
EssentialsUpdate/src/org/jibble/pircbot/InputThread.java
View file

@ -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

3
EssentialsUpdate/src/org/jibble/pircbot/OutputThread.java
View file

@ -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.

13
EssentialsUpdate/src/org/jibble/pircbot/PircBot.java
View file

@ -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;

6
EssentialsUpdate/src/org/jibble/pircbot/User.java
View file

@ -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);
}

1
EssentialsUpdate/test/com/earth2me/essentials/update/VersionTest.java
View file

@ -4,7 +4,6 @@ import com.earth2me.essentials.update.Version.Type;
import java.util.TreeSet;
import junit.framework.TestCase;
import org.junit.Test;
import static org.junit.Assert.*;
public class VersionTest extends TestCase