From 8c380ffca36399fec35a84f13677efc751650a9a Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 30 Aug 2017 08:11:26 +0200 Subject: [PATCH] CmdLineParser: Remove unused prefix argument Change-Id: I52718b3b1552164d2b262c099f5864392c4f7699 --- .../java/com/google/gerrit/util/cli/CmdLineParser.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java index 0a75bfc233..f2d07eda66 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java @@ -395,7 +395,7 @@ public class CmdLineParser { MyParser(Object bean) { super(bean); - parseAdditionalOptions("", bean, new HashSet<>()); + parseAdditionalOptions(bean, new HashSet<>()); ensureOptionsInitialized(); } @@ -433,7 +433,7 @@ public class CmdLineParser { } } - private void parseAdditionalOptions(String prefix, Object bean, Set parsedBeans) { + private void parseAdditionalOptions(Object bean, Set parsedBeans) { for (Class c = bean.getClass(); c != null; c = c.getSuperclass()) { for (Field f : c.getDeclaredFields()) { if (f.isAnnotationPresent(Options.class)) { @@ -443,8 +443,7 @@ public class CmdLineParser { } catch (IllegalAccessException e) { throw new IllegalAnnotationError(e); } - parseWithPrefix( - prefix + f.getAnnotation(Options.class).prefix(), additionalBean, parsedBeans); + parseWithPrefix(f.getAnnotation(Options.class).prefix(), additionalBean, parsedBeans); } } }