ChomeNS/brigadier
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed unneeded field from contextbuilder

Browse source
This commit is contained in:
Nathan Adams 2017-08-10 13:22:58 +02:00
parent 9c5af32afa
commit c282b26b60
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/com/mojang/brigadier/context/CommandContextBuilder.java
View file

@ -11,7 +11,6 @@ public class CommandContextBuilder<S> {
private final Map<String, ParsedArgument<S, ?>> arguments = Maps.newLinkedHashMap(); private final Map<String, ParsedArgument<S, ?>> arguments = Maps.newLinkedHashMap();
private final Map<CommandNode<S>, String> nodes = Maps.newLinkedHashMap(); private final Map<CommandNode<S>, String> nodes = Maps.newLinkedHashMap();
private final CommandDispatcher<S> dispatcher; private final CommandDispatcher<S> dispatcher;
private final StringBuilder input = new StringBuilder();
private S source; private S source;
private Command<S> command; private Command<S> command;
private CommandContext<S> parent; private CommandContext<S> parent;
@ -45,11 +44,7 @@ public class CommandContextBuilder<S> {
} }
public CommandContextBuilder<S> withNode(final CommandNode<S> node, final String raw) { public CommandContextBuilder<S> withNode(final CommandNode<S> node, final String raw) {
if (!nodes.isEmpty()) {
input.append(CommandDispatcher.ARGUMENT_SEPARATOR);
}
nodes.put(node, raw); nodes.put(node, raw);
input.append(raw);
return this; return this;
} }
@ -58,7 +53,6 @@ public class CommandContextBuilder<S> {
copy.command = command; copy.command = command;
copy.arguments.putAll(arguments); copy.arguments.putAll(arguments);
copy.nodes.putAll(nodes); copy.nodes.putAll(nodes);
copy.input.append(input);
copy.parent = parent; copy.parent = parent;
return copy; return copy;
} }
@ -75,7 +69,19 @@ public class CommandContextBuilder<S> {
} }
public String getInput() { public String getInput() {
return input.toString(); final StringBuilder result = new StringBuilder();
boolean first = true;
for (final String node : nodes.values()) {
if (first) {
if (!node.isEmpty()) {
first = false;
}
} else {
result.append(CommandDispatcher.ARGUMENT_SEPARATOR);
}
result.append(node);
}
return result.toString();
} }
public Map<CommandNode<S>, String> getNodes() { public Map<CommandNode<S>, String> getNodes() {
@ -83,7 +89,7 @@ public class CommandContextBuilder<S> {
} }
public CommandContext<S> build() { public CommandContext<S> build() {
return new CommandContext<>(source, arguments, command, nodes, input.toString(), parent); return new CommandContext<>(source, arguments, command, nodes, getInput(), parent);
} }
public CommandDispatcher<S> getDispatcher() { public CommandDispatcher<S> getDispatcher() {

4
src/test/java/com/mojang/brigadier/CommandDispatcherTest.java
View file

@ -176,12 +176,12 @@ public class CommandDispatcherTest {
final ParseResults<Object> parse = subject.parse("redirected redirected actual", source); final ParseResults<Object> parse = subject.parse("redirected redirected actual", source);
assertThat(parse.getContext().getInput(), equalTo("actual")); assertThat(parse.getContext().getInput(), equalTo("actual"));
assertThat(parse.getContext().getNodes().size(), is(1)); assertThat(parse.getContext().getNodes().size(), is(2));
final CommandContext<Object> parent1 = parse.getContext().getParent(); final CommandContext<Object> parent1 = parse.getContext().getParent();
assertThat(parent1, is(notNullValue())); assertThat(parent1, is(notNullValue()));
assertThat(parent1.getInput(), equalTo("redirected")); assertThat(parent1.getInput(), equalTo("redirected"));
assertThat(parent1.getNodes().size(), is(1)); assertThat(parent1.getNodes().size(), is(2));
final CommandContext<Object> parent2 = parent1.getParent(); final CommandContext<Object> parent2 = parent1.getParent();
assertThat(parent2, is(notNullValue())); assertThat(parent2, is(notNullValue()));