diff options
author | Jon Brandvein <brandjon@google.com> | 2017-03-17 19:58:04 +0000 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-03-22 09:55:58 -0700 |
commit | 0c23cbe005a84a9c4cccbcf527c415835e3df3d0 (patch) | |
tree | 304ecae2ad99bf2f25950bd18087937db03414b6 /java/com/google/devtools/common/options/OptionsUsage.java | |
parent | c1cd3d1d1c4893c58f97479af51b1fff180e9d82 (diff) | |
download | desugar-0c23cbe005a84a9c4cccbcf527c415835e3df3d0.tar.gz |
Refactor options converter logic
Moved default converters from parser implementation to Converters. Moved other helpers to OptionsData. Also factored out new function getFieldSingularType.
--
PiperOrigin-RevId: 150473455
MOS_MIGRATED_REVID=150473455
GitOrigin-RevId: 097e64c412c6a4162a22880fd435ef4632878406
Change-Id: Ife5702b6f39415a7df3fd8b44c1867145a6ac466
Diffstat (limited to 'java/com/google/devtools/common/options/OptionsUsage.java')
-rw-r--r-- | java/com/google/devtools/common/options/OptionsUsage.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/java/com/google/devtools/common/options/OptionsUsage.java b/java/com/google/devtools/common/options/OptionsUsage.java index b8c19df..f3ee4d3 100644 --- a/java/com/google/devtools/common/options/OptionsUsage.java +++ b/java/com/google/devtools/common/options/OptionsUsage.java @@ -13,14 +13,11 @@ // limitations under the License. package com.google.devtools.common.options; -import static com.google.devtools.common.options.OptionsParserImpl.findConverter; - import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.escape.Escaper; - import java.lang.reflect.Field; import java.text.BreakIterator; import java.util.Collections; @@ -138,8 +135,7 @@ class OptionsUsage { Option annotation = optionField.getAnnotation(Option.class); usage.append("<dt><code><a name=\"flag--").append(plainFlagName).append("\"></a>--"); usage.append(flagName); - if (OptionsParserImpl.isBooleanField(optionField) - || OptionsParserImpl.isVoidField(optionField)) { + if (OptionsData.isBooleanField(optionField) || OptionsData.isVoidField(optionField)) { // Nothing for boolean, tristate, boolean_or_enum, or void options. } else if (!valueDescription.isEmpty()) { usage.append("=").append(escaper.escape(valueDescription)); @@ -157,7 +153,7 @@ class OptionsUsage { } else { // Don't call the annotation directly (we must allow overrides to certain defaults). String defaultValueString = OptionsParserImpl.getDefaultOptionString(optionField); - if (OptionsParserImpl.isVoidField(optionField)) { + if (OptionsData.isVoidField(optionField)) { // Void options don't have a default. } else if (OptionsParserImpl.isSpecialNullDefault(defaultValueString, optionField)) { usage.append(" default: see description"); @@ -259,12 +255,12 @@ class OptionsUsage { }; private static String getTypeDescription(Field optionsField) { - return findConverter(optionsField).getTypeDescription(); + return OptionsData.findConverter(optionsField).getTypeDescription(); } static String getFlagName(Field field) { String name = field.getAnnotation(Option.class).name(); - return OptionsParserImpl.isBooleanField(field) ? "[no]" + name : name; + return OptionsData.isBooleanField(field) ? "[no]" + name : name; } } |