commit 0df3ddbdc289af97ffd2fb98197548f21b2c69a9
author Jonathan Bluett-Duncan <jbluettduncan@gmail.com> Wed Aug 09 11:13:54 2017 +0200
committer Marcel Hlopko <hlopko@google.com> Wed Aug 09 11:36:05 2017 +0200
tree 58d3c44e42955f4fdc4f86a500cb45076d9ec2f7
parent 9e18b0a4f45c775bb58ee578a2f4ac0118e36275

Polishing

- Use Java 8 idioms more consistently.
- Use newer Guava idioms more consistently.
- Apply some IntelliJ IDEA refactoring suggestions.
- Other changes made for readability and/or brevity.

Closes #3462.

PiperOrigin-RevId: 164700946

src/main/java/com/google/devtools/common/options/OptionsUsage.java

diff --git a/src/main/java/com/google/devtools/common/options/OptionsUsage.java b/src/main/java/com/google/devtools/common/options/OptionsUsage.java
index 5f7c48a..6971e27 100644
--- a/src/main/java/com/google/devtools/common/options/OptionsUsage.java
+++ b/src/main/java/com/google/devtools/common/options/OptionsUsage.java
@@ -21,7 +21,6 @@
 import java.lang.reflect.Field;
 import java.text.BreakIterator;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -43,7 +42,7 @@
   static void getUsage(Class<? extends OptionsBase> optionsClass, StringBuilder usage) {
     OptionsData data = OptionsParser.getOptionsDataInternal(optionsClass);
     List<Field> optionFields = new ArrayList<>(data.getFieldsForClass(optionsClass));
-    Collections.sort(optionFields, BY_NAME);
+    optionFields.sort(BY_NAME);
     for (Field optionField : optionFields) {
       getUsage(optionField, usage, OptionsParser.HelpVerbosity.LONG, null);
     }
@@ -119,7 +118,7 @@
     String flagName = getFlagName(optionField);
     String typeDescription = getTypeDescription(optionField);
     Option annotation = optionField.getAnnotation(Option.class);
-    usage.append("  --" + flagName);
+    usage.append("  --").append(flagName);
     if (helpVerbosity == OptionsParser.HelpVerbosity.SHORT) { // just the name
       usage.append('\n');
       return;
@@ -128,7 +127,7 @@
       usage.append(" [-").append(annotation.abbrev()).append(']');
     }
     if (!typeDescription.equals("")) {
-      usage.append(" (" + typeDescription + "; ");
+      usage.append(" (").append(typeDescription).append("; ");
       if (annotation.allowMultiple()) {
         usage.append("may be used multiple times");
       } else {
@@ -137,7 +136,7 @@
         if (OptionsParserImpl.isSpecialNullDefault(defaultValueString, optionField)) {
           usage.append("default: see description");
         } else {
-          usage.append("default: \"" + defaultValueString + "\"");
+          usage.append("default: \"").append(defaultValueString).append("\"");
         }
       }
       usage.append(")");