Global cleanup change.

--
PiperOrigin-RevId: 150886657
MOS_MIGRATED_REVID=150886657

3 files changed, 28 insertions, 38 deletions

diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
index b292a65bd1..6b54c87394 100644
--- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
+++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlistMerging.java
@@ -14,6 +14,12 @@
 
 package com.google.devtools.build.xcode.plmerge;
 
+import com.dd.plist.BinaryPropertyListWriter;
+import com.dd.plist.NSDictionary;
+import com.dd.plist.NSObject;
+import com.dd.plist.NSString;
+import com.dd.plist.PropertyListFormatException;
+import com.dd.plist.PropertyListParser;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -26,16 +32,6 @@ import com.google.devtools.build.xcode.plmerge.proto.PlMergeProtos.Control;
 import com.google.devtools.build.xcode.util.Equaling;
 import com.google.devtools.build.xcode.util.Mapping;
 import com.google.devtools.build.xcode.util.Value;
-
-import com.dd.plist.BinaryPropertyListWriter;
-import com.dd.plist.NSDictionary;
-import com.dd.plist.NSObject;
-import com.dd.plist.NSString;
-import com.dd.plist.PropertyListFormatException;
-import com.dd.plist.PropertyListParser;
-
-import org.xml.sax.SAXException;
-
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -47,12 +43,13 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.text.ParseException;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
-
 import javax.xml.parsers.ParserConfigurationException;
+import org.xml.sax.SAXException;
 
 /**
  * Utility code for merging project files.
@@ -89,7 +86,7 @@ public class PlistMerging extends Value<PlistMerging> {
    * one of these formats: ASCII, Binary, or XML) that contains an NSDictionary.
    */
   @VisibleForTesting
-  static NSDictionary merge(Iterable<? extends Path> sourceFilePaths) throws IOException {
+  static NSDictionary merge(Collection<? extends Path> sourceFilePaths) throws IOException {
     NSDictionary result = new NSDictionary();
     for (Path sourceFilePath : sourceFilePaths) {
       result.putAll(readPlistFile(sourceFilePath));
diff --git a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/AggregateReferenceType.java b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/AggregateReferenceType.java
index 3a123e0d5f..b945184ce0 100644
--- a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/AggregateReferenceType.java
+++ b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/AggregateReferenceType.java
@@ -14,18 +14,17 @@
 
 package com.google.devtools.build.xcode.xcodegen;
 
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.SetMultimap;
-
 import com.facebook.buck.apple.xcode.xcodeproj.PBXFileReference;
 import com.facebook.buck.apple.xcode.xcodeproj.PBXReference;
 import com.facebook.buck.apple.xcode.xcodeproj.PBXReference.SourceTree;
 import com.facebook.buck.apple.xcode.xcodeproj.PBXVariantGroup;
 import com.facebook.buck.apple.xcode.xcodeproj.XCVersionGroup;
-
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.SetMultimap;
 import java.nio.file.Path;
+import java.util.Collection;
 
 /**
  * An aggregate reference is a kind of PBXReference that contains one or more files, grouped by some
@@ -113,10 +112,8 @@ public enum AggregateReferenceType {
 
   public abstract Path pathInAggregate(Path path);
 
-  /**
-   * Groups a sequence of items according to their {@link #aggregateKey(Path)}.
-   */
-  public SetMultimap<AggregateKey, Path> aggregates(Iterable<Path> paths) {
+  /** Groups a sequence of items according to their {@link #aggregateKey(Path)}. */
+  public SetMultimap<AggregateKey, Path> aggregates(Collection<Path> paths) {
     ImmutableSetMultimap.Builder<AggregateKey, Path> result =
         new ImmutableSetMultimap.Builder<>();
     for (Path path : paths) {
diff --git a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/PBXBuildFiles.java b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/PBXBuildFiles.java
index d7007f84c3..4fd27518f4 100644
--- a/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/PBXBuildFiles.java
+++ b/src/objc_tools/xcodegen/java/com/google/devtools/build/xcode/xcodegen/PBXBuildFiles.java
@@ -14,20 +14,18 @@
 
 package com.google.devtools.build.xcode.xcodegen;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.SetMultimap;
-import com.google.devtools.build.xcode.util.Mapping;
-
 import com.facebook.buck.apple.xcode.xcodeproj.PBXBuildFile;
 import com.facebook.buck.apple.xcode.xcodeproj.PBXFileReference;
 import com.facebook.buck.apple.xcode.xcodeproj.PBXReference;
 import com.facebook.buck.apple.xcode.xcodeproj.PBXReference.SourceTree;
 import com.facebook.buck.apple.xcode.xcodeproj.PBXVariantGroup;
 import com.facebook.buck.apple.xcode.xcodeproj.XCVersionGroup;
-
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.SetMultimap;
+import com.google.devtools.build.xcode.util.Mapping;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -109,11 +107,11 @@ final class PBXBuildFiles implements HasProjectNavigatorFiles {
   /**
    * Returns new or cached instances of PBXBuildFiles corresponding to files that may or may not
    * belong to an aggregate reference (see {@link AggregateReferenceType}). Files specified by the
-   * {@code paths} argument are grouped into individual PBXBuildFiles using the given
-   * {@link AggregateReferenceType}. Files that are standalone are not put in an aggregate
-   * reference, but are put in a standalone PBXBuildFile in the returned sequence.
+   * {@code paths} argument are grouped into individual PBXBuildFiles using the given {@link
+   * AggregateReferenceType}. Files that are standalone are not put in an aggregate reference, but
+   * are put in a standalone PBXBuildFile in the returned sequence.
    */
-  public Iterable<PBXBuildFile> get(AggregateReferenceType type, Iterable<Path> paths) {
+  public Iterable<PBXBuildFile> get(AggregateReferenceType type, Collection<Path> paths) {
     ImmutableList.Builder<PBXBuildFile> result = new ImmutableList.Builder<>();
     SetMultimap<AggregateKey, Path> keyedPaths = type.aggregates(paths);
     for (Map.Entry<AggregateKey, Collection<Path>> aggregation : keyedPaths.asMap().entrySet()) {
@@ -144,10 +142,8 @@ final class PBXBuildFiles implements HasProjectNavigatorFiles {
     return buildFile;
   }
 
-  /**
-   * Applies {@link #fileReference(Path)} to each item in the sequence.
-   */
-  private final Iterable<PBXFileReference> fileReferences(Iterable<Path> paths) {
+  /** Applies {@link #fileReference(Path)} to each item in the sequence. */
+  private final Iterable<PBXFileReference> fileReferences(Collection<Path> paths) {
     ImmutableList.Builder<PBXFileReference> result = new ImmutableList.Builder<>();
     for (Path path : paths) {
       result.add(fileReference(path));