Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bleeding] Cleanup of exceptions org.bukkit.plugin.Invalid*

Browse Source 
Removed throwable and message, because the superclass already stores them
Added message of inner exception to the outer exception to make the first line of the stacktrace more verbose
This commit is contained in:
Zeerix 2012-02-11 02:16:16 +01:00 committed by EvilSeph
parent a1a3f7ffba
commit f0f593c956
2 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
View File

@ -5,16 +5,24 @@ package org.bukkit.plugin;
*/
public class InvalidDescriptionException extends Exception {
private static final long serialVersionUID = 5721389122281775894L;
private final Throwable cause;
private final String message;
/**
* Constructs a new InvalidDescriptionException based on the given Exception
*
* @param message Brief message explaining the cause of the exception
* @param cause Exception that triggered this Exception
*/
public InvalidDescriptionException(final Throwable cause, final String message) {
super(message + (cause != null ? ": " + cause.getMessage() : ""), cause);
}
/**
* Constructs a new InvalidDescriptionException based on the given Exception
*
* @param throwable Exception that triggered this Exception
*/
public InvalidDescriptionException(Throwable throwable) {
this(throwable, "Invalid plugin.yml");
public InvalidDescriptionException(final Throwable cause) {
this(cause, "Invalid plugin.yml");
}
/**
@ -26,36 +34,10 @@ public class InvalidDescriptionException extends Exception {
this(null, message);
}
/**
* Constructs a new InvalidDescriptionException based on the given Exception
*
* @param message Brief message explaining the cause of the exception
* @param throwable Exception that triggered this Exception
*/
public InvalidDescriptionException(final Throwable throwable, final String message) {
this.cause = null;
this.message = message;
}
/**
* Constructs a new InvalidDescriptionException
*/
public InvalidDescriptionException() {
this(null, "Invalid plugin.yml");
}
/**
* If applicable, returns the Exception that triggered this Exception
*
* @return Inner exception, or null if one does not exist
*/
@Override
public Throwable getCause() {
return cause;
}
@Override
public String getMessage() {
return message;
}
}

19
src/main/java/org/bukkit/plugin/InvalidPluginException.java
View File

@ -5,31 +5,20 @@ package org.bukkit.plugin;
*/
public class InvalidPluginException extends Exception {
private static final long serialVersionUID = -8242141640709409542L;
private final Throwable cause;
/**
* Constructs a new InvalidPluginException based on the given Exception
*
* @param throwable Exception that triggered this Exception
* @param cause Exception that triggered this Exception
*/
public InvalidPluginException(Throwable throwable) {
cause = throwable;
public InvalidPluginException(final Throwable cause) {
super("Invalid plugin" + (cause != null ? ": " + cause.getMessage() : ""), cause);
}
/**
* Constructs a new InvalidPluginException
*/
public InvalidPluginException() {
cause = null;
}
/**
* If applicable, returns the Exception that triggered this Exception
*
* @return Inner exception, or null if one does not exist
*/
@Override
public Throwable getCause() {
return cause;
this(null);
}
}