Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed use of @Nullable in ParametricCallable.

Browse Source
This commit is contained in:
sk89q 2014-06-27 20:24:02 -07:00
parent de0f283656
commit ec28cd626c
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java
View File

@ -19,31 +19,15 @@
package com.sk89q.worldedit.util.command.parametric; package com.sk89q.worldedit.util.command.parametric;
import com.sk89q.minecraft.util.commands.*;
import com.sk89q.worldedit.util.command.*;
import com.sk89q.worldedit.util.command.binding.Switch;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.SuggestionContext;
import com.sk89q.minecraft.util.commands.WrappedCommandException;
import com.sk89q.worldedit.util.command.CommandCallable;
import com.sk89q.worldedit.util.command.InvalidUsageException;
import com.sk89q.worldedit.util.command.MissingParameterException;
import com.sk89q.worldedit.util.command.Parameter;
import com.sk89q.worldedit.util.command.SimpleDescription;
import com.sk89q.worldedit.util.command.UnconsumedParameterException;
import com.sk89q.worldedit.util.command.binding.Switch;
/** /**
* The implementation of a {@link CommandCallable} for the {@link ParametricBuilder}. * The implementation of a {@link CommandCallable} for the {@link ParametricBuilder}.
@ -103,8 +87,6 @@ class ParametricCallable implements CommandCallable {
for (Annotation annotation : annotations[i]) { for (Annotation annotation : annotations[i]) {
if (annotation instanceof Switch) { if (annotation instanceof Switch) {
parameter.setFlag(((Switch) annotation).value(), type != boolean.class); parameter.setFlag(((Switch) annotation).value(), type != boolean.class);
} else if (annotation instanceof Nullable) {
parameter.setOptional(true);
} else if (annotation instanceof Optional) { } else if (annotation instanceof Optional) {
parameter.setOptional(true); parameter.setOptional(true);
String[] value = ((Optional) annotation).value(); String[] value = ((Optional) annotation).value();
@ -481,14 +463,14 @@ class ParametricCallable implements CommandCallable {
* Get any unused flag arguments. * Get any unused flag arguments.
* *
* @param context the command context * @param context the command context
* @param parameters the list of parameters
*/ */
private String getUnusedFlags(CommandContext context) { private String getUnusedFlags(CommandContext context) {
Set<Character> unusedFlags = null; Set<Character> unusedFlags = null;
for (char flag : context.getFlags()) { for (char flag : context.getFlags()) {
boolean found = false; boolean found = false;
for (int i = 0; i < parameters.length; i++) {
Character paramFlag = parameters[i].getFlag(); for (ParameterData parameter : parameters) {
Character paramFlag = parameter.getFlag();
if (paramFlag != null && flag == paramFlag) { if (paramFlag != null && flag == paramFlag) {
found = true; found = true;
break; break;