Skip to content

Commit ea15b8f

Browse files
committed
codestyle: chain setCommand and setArgument usages
1 parent 0a7f208 commit ea15b8f

File tree

11 files changed

+25
-49
lines changed

11 files changed

+25
-49
lines changed

Bukkit/src/main/java/me/fixeddev/commandflow/bukkit/part/PlayerPart.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,8 @@ public List<Player> parseValue(CommandContext context, ArgumentStack stack, Comm
6262
return Collections.singletonList(player);
6363
}
6464

65-
ArgumentParseException exception = new ArgumentParseException(TranslatableComponent.of("player.offline", TextComponent.of(target)));
66-
exception.setArgument(this);
67-
68-
throw exception;
65+
throw new ArgumentParseException(TranslatableComponent.of("player.offline", TextComponent.of(target)))
66+
.setArgument(this);
6967
}
7068
}
7169

Bungee/src/main/java/me/fixeddev/commandflow/bungee/part/ProxiedPlayerPart.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,8 @@ public List<? extends ProxiedPlayer> parseValue(CommandContext context, Argument
7070
proxiedPlayer = ProxyServer.getInstance().getPlayer(target);
7171

7272
if (proxiedPlayer == null) {
73-
ArgumentParseException argumentParseException = new ArgumentParseException(TranslatableComponent.of("player.offline", TextComponent.of(target)));
74-
argumentParseException.setArgument(this);
75-
76-
throw argumentParseException;
73+
throw new ArgumentParseException(TranslatableComponent.of("player.offline", TextComponent.of(target)))
74+
.setArgument(this);
7775
}
7876
}
7977

Discord/src/main/java/me/fixeddev/commandflow/discord/part/MemberPart.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@ public List<? extends Member> parseValue(CommandContext context, ArgumentStack s
5252
}
5353

5454
if (member == null) {
55-
ArgumentParseException exception = new ArgumentParseException(TranslatableComponent.of("unknown.member"));
56-
exception.setArgument(this);
57-
58-
throw exception;
55+
throw new ArgumentParseException(TranslatableComponent.of("unknown.member"))
56+
.setArgument(this);
5957
}
6058

6159
return Collections.singletonList(member);

Discord/src/main/java/me/fixeddev/commandflow/discord/part/TextChannelPart.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,8 @@ public List<? extends TextChannel> parseValue(CommandContext context, ArgumentSt
4848
}
4949

5050
if (channel == null) {
51-
ArgumentParseException exception = new ArgumentParseException(TranslatableComponent.of("unknown.channel"));
52-
exception.setArgument(this);
53-
54-
throw exception;
51+
throw new ArgumentParseException(TranslatableComponent.of("unknown.channel"))
52+
.setArgument(this);
5553
}
5654

5755
return Collections.singletonList(channel);

Discord/src/main/java/me/fixeddev/commandflow/discord/part/UserPart.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,8 @@ public List<? extends User> parseValue(CommandContext context, ArgumentStack sta
4646
}
4747

4848
if (user == null) {
49-
ArgumentParseException exception = new ArgumentParseException(TranslatableComponent.of("unknown.user"));
50-
exception.setArgument(this);
51-
52-
throw exception;
49+
throw new ArgumentParseException(TranslatableComponent.of("unknown.user"))
50+
.setArgument(this);
5351
}
5452

5553
return Collections.singletonList(user);

Universal/src/main/java/me/fixeddev/commandflow/SimpleCommandManager.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,9 @@ public boolean execute(Namespace accessor, List<String> arguments) throws Comman
281281
CommandContext commandContext = optionalContext.get();
282282
ArgumentException e = (ArgumentException) exception;
283283

284-
CommandUsage usage = new CommandUsage(usageBuilder.getUsage(commandContext));
285-
usage.setCommand(commandContext.getCommand());
286-
287-
usage.initCause(e);
288-
289-
exception = usage;
284+
exception = new CommandUsage(usageBuilder.getUsage(commandContext))
285+
.setCommand(commandContext.getCommand());
286+
exception.initCause(e);
290287
}
291288

292289
try {

Universal/src/main/java/me/fixeddev/commandflow/annotated/ReflectionSubCommandHandler.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ public void handle(SubCommandPart.@NotNull HandlerContext context, @NotNull Stri
3333
throw (ArgumentException) cause;
3434
}
3535

36-
ArgumentParseException exception = new ArgumentParseException("Internal error.", cause);
37-
exception.setArgument(context.getPart());
38-
exception.setCommand(context.getContext().getCommand());
39-
40-
throw exception;
36+
throw new ArgumentParseException("Internal error.", cause)
37+
.setArgument(context.getPart())
38+
.setCommand(context.getContext().getCommand());
4139
}
4240
}
4341
}

Universal/src/main/java/me/fixeddev/commandflow/exception/ArgumentException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public ArgumentException setCommand(Command argument) {
3535

3636
public ArgumentException setArgument(CommandPart argument) {
3737
this.argument = argument;
38-
3938
return this;
4039
}
4140

Universal/src/main/java/me/fixeddev/commandflow/executor/DefaultExecutor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ public boolean execute(CommandContext commandContext, UsageBuilder builder) {
1212

1313
if (toExecute != null) {
1414
if (!toExecute.getAction().execute(commandContext)) {
15-
CommandUsage usage = new CommandUsage(builder.getUsage(commandContext));
16-
usage.setCommand(toExecute);
17-
18-
throw usage;
15+
throw new CommandUsage(builder.getUsage(commandContext))
16+
.setCommand(toExecute);
1917
}
2018
} else {
2119
return false;

Universal/src/main/java/me/fixeddev/commandflow/part/defaults/SubCommandPart.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -257,21 +257,17 @@ public void handle(@NotNull HandlerContext context, @NotNull String label, @Null
257257
ArgumentStack stack = context.getStack();
258258

259259
if (command == null) {
260-
InvalidSubCommandException commandException = new InvalidSubCommandException(TranslatableComponent.of("command.subcommand.invalid", TextComponent.of(label)));
261-
commandException.setArgument(context.getPart());
262-
commandException.setCommand(commandContext.getCommand());
263-
264-
throw commandException;
260+
throw new InvalidSubCommandException(TranslatableComponent.of("command.subcommand.invalid", TextComponent.of(label)))
261+
.setArgument(context.getPart())
262+
.setCommand(commandContext.getCommand());
265263
}
266264

267265
// Should be there
268266
CommandManager manager = commandContext.getObject(CommandManager.class, "commandManager");
269267

270268
if (!manager.getAuthorizer().isAuthorized(commandContext, command.getPermission())) {
271-
NoPermissionsException exception = new NoPermissionsException(command.getPermissionMessage());
272-
exception.setCommand(command);
273-
274-
throw exception;
269+
throw new NoPermissionsException(command.getPermissionMessage())
270+
.setCommand(command);
275271
}
276272

277273
FallbackCommandModifiers fallbackModifiers = manager.getCommandModifiers();

0 commit comments

Comments
 (0)