From 454ceb318a90e84380c9eefe13c1427861939012 Mon Sep 17 00:00:00 2001 From: jmp Date: Sat, 10 Oct 2020 03:00:19 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Only=20print=20flags=20once=20in?= =?UTF-8?q?=20command=20syntax?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardCommandSyntaxFormatter.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java b/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java index 7fadc043..332d532b 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/StandardCommandSyntaxFormatter.java @@ -59,18 +59,15 @@ public class StandardCommandSyntaxFormatter implements CommandSyntaxFormatter final CommandArgument commandArgument = iterator.next(); if (commandArgument instanceof StaticArgument) { formattingInstance.appendLiteral((StaticArgument) commandArgument); + } else if (commandArgument instanceof CompoundArgument) { + formattingInstance.appendCompound((CompoundArgument) commandArgument); + } else if (commandArgument instanceof FlagArgument) { + formattingInstance.appendFlag((FlagArgument) commandArgument); } else { - if (commandArgument instanceof CompoundArgument) { - formattingInstance.appendCompound((CompoundArgument) commandArgument); + if (commandArgument.isRequired()) { + formattingInstance.appendRequired(commandArgument); } else { - if (commandArgument instanceof FlagArgument) { - formattingInstance.appendFlag((FlagArgument) commandArgument); - } - if (commandArgument.isRequired()) { - formattingInstance.appendRequired(commandArgument); - } else { - formattingInstance.appendOptional(commandArgument); - } + formattingInstance.appendOptional(commandArgument); } } if (iterator.hasNext()) {