diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java b/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java index 6fb356055..4bf5291ae 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java @@ -79,11 +79,11 @@ public class DecreeParameter { } public Object getDefaultValue() throws DecreeParsingException, DecreeWhichException { - return param.defaultValue().equals(Param.REQUIRED) ? null : getHandler().parse(param.defaultValue()); + return param.defaultValue().trim().isEmpty() ? null : getHandler().parse(param.defaultValue().trim()); } public boolean hasDefault() { - return !param.defaultValue().equals(Param.REQUIRED); + return !param.defaultValue().trim().isEmpty(); } public String example() { diff --git a/src/main/java/com/volmit/iris/util/decree/annotations/Param.java b/src/main/java/com/volmit/iris/util/decree/annotations/Param.java index 529eb7266..aba076a73 100644 --- a/src/main/java/com/volmit/iris/util/decree/annotations/Param.java +++ b/src/main/java/com/volmit/iris/util/decree/annotations/Param.java @@ -28,8 +28,6 @@ import java.lang.annotation.Target; public @interface Param { String DEFAULT_DESCRIPTION = "No Description Provided"; - String REQUIRED = "Required"; - /** * The main name of this command.
* Required parameter.
@@ -49,7 +47,7 @@ public @interface Param { * Which indicates the variable MUST be defined by the person running the command.
* If you define this, the variable automatically becomes non-required, but can still be set. */ - String defaultValue() default REQUIRED; + String defaultValue() default ""; /** * The aliases of this parameter (instead of just the {@link #name() name} (if specified) or Method Name (name of method))