Fix Javadoc errors (as seen in Jenkins build)

This commit is contained in:
ljacqu 2017-02-04 11:35:22 +01:00
parent 12c2556277
commit 5ad528d5d9
3 changed files with 18 additions and 17 deletions

View File

@ -17,7 +17,7 @@ public enum MessageKey {
/** AntiBot protection mode is enabled! You have to wait some minutes before joining the server. */ /** AntiBot protection mode is enabled! You have to wait some minutes before joining the server. */
KICK_ANTIBOT("kick_antibot"), KICK_ANTIBOT("kick_antibot"),
/** Can't find the requested user in the database! */ /** This user isn't registered! */
UNKNOWN_USER("unknown_user"), UNKNOWN_USER("unknown_user"),
/** Your quit location was unsafe, you have been teleported to the world's spawnpoint. */ /** Your quit location was unsafe, you have been teleported to the world's spawnpoint. */
@ -26,7 +26,7 @@ public enum MessageKey {
/** You're not logged in! */ /** You're not logged in! */
NOT_LOGGED_IN("not_logged_in"), NOT_LOGGED_IN("not_logged_in"),
/** Usage: /login <password> */ /** Usage: /login <password> */
USAGE_LOGIN("usage_log"), USAGE_LOGIN("usage_log"),
/** Wrong password! */ /** Wrong password! */
@ -56,19 +56,19 @@ public enum MessageKey {
/** An unexpected error occurred, please contact an administrator! */ /** An unexpected error occurred, please contact an administrator! */
ERROR("error"), ERROR("error"),
/** Please, login with the command "/login <password>" */ /** Please, login with the command: /login <password> */
LOGIN_MESSAGE("login_msg"), LOGIN_MESSAGE("login_msg"),
/** Please, register to the server with the command "/register <password> <ConfirmPassword>" */ /** Please, register to the server with the command: /register <password> <ConfirmPassword> */
REGISTER_MESSAGE("reg_msg"), REGISTER_MESSAGE("reg_msg"),
/** You have exceeded the maximum number of registrations (%reg_count/%max_acc %reg_names) for your connection! */ /** You have exceeded the maximum number of registrations (%reg_count/%max_acc %reg_names) for your connection! */
MAX_REGISTER_EXCEEDED("max_reg", "%max_acc", "%reg_count", "%reg_names"), MAX_REGISTER_EXCEEDED("max_reg", "%max_acc", "%reg_count", "%reg_names"),
/** Usage: /register <password> <ConfirmPassword> */ /** Usage: /register <password> <ConfirmPassword> */
USAGE_REGISTER("usage_reg"), USAGE_REGISTER("usage_reg"),
/** Usage: /unregister <password> */ /** Usage: /unregister <password> */
USAGE_UNREGISTER("usage_unreg"), USAGE_UNREGISTER("usage_unreg"),
/** Password changed successfully! */ /** Password changed successfully! */
@ -95,7 +95,7 @@ public enum MessageKey {
/** You're already logged in! */ /** You're already logged in! */
ALREADY_LOGGED_IN_ERROR("logged_in"), ALREADY_LOGGED_IN_ERROR("logged_in"),
/** Logged-out successfully! */ /** Logged out successfully! */
LOGOUT_SUCCESS("logout"), LOGOUT_SUCCESS("logout"),
/** The same username is already playing on the server! */ /** The same username is already playing on the server! */
@ -113,7 +113,7 @@ public enum MessageKey {
/** Login timeout exceeded, you have been kicked from the server, please try again! */ /** Login timeout exceeded, you have been kicked from the server, please try again! */
LOGIN_TIMEOUT_ERROR("timeout"), LOGIN_TIMEOUT_ERROR("timeout"),
/** Usage: /changepassword <oldPassword> <newPassword> */ /** Usage: /changepassword <oldPassword> <newPassword> */
USAGE_CHANGE_PASSWORD("usage_changepassword"), USAGE_CHANGE_PASSWORD("usage_changepassword"),
/** Your username is either too short or too long! */ /** Your username is either too short or too long! */
@ -122,13 +122,13 @@ public enum MessageKey {
/** Your username contains illegal characters. Allowed chars: REG_EX */ /** Your username contains illegal characters. Allowed chars: REG_EX */
INVALID_NAME_CHARACTERS("regex", "REG_EX"), INVALID_NAME_CHARACTERS("regex", "REG_EX"),
/** Please add your email to your account with the command "/email add <yourEmail> <confirmEmail>" */ /** Please add your email to your account with the command: /email add <yourEmail> <confirmEmail> */
ADD_EMAIL_MESSAGE("add_email"), ADD_EMAIL_MESSAGE("add_email"),
/** Forgot your password? Please use the command "/email recovery <yourEmail>" */ /** Forgot your password? Please use the command: /email recovery <yourEmail> */
FORGOT_PASSWORD_MESSAGE("recovery_email"), FORGOT_PASSWORD_MESSAGE("recovery_email"),
/** To login you have to solve a captcha code, please use the command "/captcha <theCaptcha>" */ /** To login you have to solve a captcha code, please use the command: /captcha <theCaptcha> */
USAGE_CAPTCHA("usage_captcha", "<theCaptcha>"), USAGE_CAPTCHA("usage_captcha", "<theCaptcha>"),
/** Wrong captcha, please type "/captcha THE_CAPTCHA" into the chat! */ /** Wrong captcha, please type "/captcha THE_CAPTCHA" into the chat! */
@ -143,13 +143,13 @@ public enum MessageKey {
/** The server is full, try again later! */ /** The server is full, try again later! */
KICK_FULL_SERVER("kick_fullserver"), KICK_FULL_SERVER("kick_fullserver"),
/** Usage: /email add &lt;email> &lt;confirmEmail> */ /** Usage: /email add &lt;email&gt; &lt;confirmEmail&gt; */
USAGE_ADD_EMAIL("usage_email_add"), USAGE_ADD_EMAIL("usage_email_add"),
/** Usage: /email change &lt;oldEmail> &lt;newEmail> */ /** Usage: /email change &lt;oldEmail&gt; &lt;newEmail&gt; */
USAGE_CHANGE_EMAIL("usage_email_change"), USAGE_CHANGE_EMAIL("usage_email_change"),
/** Usage: /email recovery &lt;Email> */ /** Usage: /email recovery &lt;Email&gt; */
USAGE_RECOVER_EMAIL("usage_email_recovery"), USAGE_RECOVER_EMAIL("usage_email_recovery"),
/** Invalid new email, try again! */ /** Invalid new email, try again! */
@ -224,7 +224,7 @@ public enum MessageKey {
/** A recovery code to reset your password has been sent to your email. */ /** A recovery code to reset your password has been sent to your email. */
RECOVERY_CODE_SENT("recovery_code_sent"), RECOVERY_CODE_SENT("recovery_code_sent"),
/** The recovery code is not correct! Use /email recovery [email] to generate a new one */ /** The recovery code is not correct! Use "/email recovery [email]" to generate a new one */
INCORRECT_RECOVERY_CODE("recovery_code_incorrect"); INCORRECT_RECOVERY_CODE("recovery_code_incorrect");
private String key; private String key;

View File

@ -28,7 +28,7 @@ public class WrappedTagReplacer<T, A> {
* @param allTags all available tags * @param allTags all available tags
* @param items the items to apply the replacements on * @param items the items to apply the replacements on
* @param stringGetter getter of the String property to adapt on the items * @param stringGetter getter of the String property to adapt on the items
* @param itemCreator a function of signature (T, String) -> T: the original item and the adapted String are passed * @param itemCreator a function taking (T, String): the original item and the adapted String, returning a new item
*/ */
public WrappedTagReplacer(Collection<Tag<A>> allTags, public WrappedTagReplacer(Collection<Tag<A>> allTags,
Collection<T> items, Collection<T> items,

View File

@ -45,6 +45,7 @@ public class AddJavaDocToMessageEnumTask implements AutoToolTask {
return configuration.getString(key.getKey()) return configuration.getString(key.getKey())
.replaceAll("&[0-9a-f]", "") .replaceAll("&[0-9a-f]", "")
.replace("&", "&amp;") .replace("&", "&amp;")
.replace("<", "&lt;"); .replace("<", "&lt;")
.replace(">", "&gt;");
} }
} }