Remove some 1.7isms.

cgruber · cgruber · commit b849f547e76e · 2014-07-17T13:55:47.000-07:00
------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=68833477
diff --git a/src/main/java/com/google/testing/compile/TreeDifference.java b/src/main/java/com/google/testing/compile/TreeDifference.java
@@ -89,7 +89,7 @@ String getDiffReport() {
    * corresponding entries in the report.
    */
   String getDiffReport(@Nullable TreeContext expectedContext, @Nullable TreeContext actualContext) {
-    ImmutableList.Builder<String> reportLines = new ImmutableList.Builder<>();
+    ImmutableList.Builder<String> reportLines = new ImmutableList.Builder<String>();
     if (!extraExpectedNodes.isEmpty()) {
       reportLines.add(String.format("Found %s unmatched nodes in the expected tree. %n",
               extraExpectedNodes.size()));
@@ -165,9 +165,9 @@ static final class Builder {
     private final ImmutableList.Builder<TwoWayDiff> differingNodesBuilder;
 
     Builder() {
-      this.extraExpectedNodesBuilder = new ImmutableList.Builder<>();
-      this.extraActualNodesBuilder = new ImmutableList.Builder<>();
-      this.differingNodesBuilder = new ImmutableList.Builder<>();
+      this.extraExpectedNodesBuilder = new ImmutableList.Builder<OneWayDiff>();
+      this.extraActualNodesBuilder = new ImmutableList.Builder<OneWayDiff>();
+      this.differingNodesBuilder = new ImmutableList.Builder<TwoWayDiff>();
     }
 
     /** Logs an extra node on the expected tree in the {@code TreeDifference} being built. */
@@ -266,4 +266,4 @@ String getDetails() {
       return details;
     }
   }
-}
+}
diff --git a/src/test/java/com/google/testing/compile/TreeDifferTest.java b/src/test/java/com/google/testing/compile/TreeDifferTest.java
@@ -110,12 +110,14 @@ public void scan_differingCompilationUnits() {
     ASSERT.that(diff.getExtraExpectedNodes().isEmpty()).isTrue();
     ASSERT.that(diff.getExtraActualNodes().size()).isEqualTo(extraNodesExpected.size());
 
-    ImmutableList.Builder<SimplifiedDiff> extraNodesFound = new ImmutableList.Builder<>();
+    ImmutableList.Builder<SimplifiedDiff> extraNodesFound =
+        new ImmutableList.Builder<SimplifiedDiff>();
     for (TreeDifference.OneWayDiff extraNode : diff.getExtraActualNodes()) {
       extraNodesFound.add(SimplifiedDiff.create(extraNode));
     }
     ASSERT.that(extraNodesExpected).iteratesAs(extraNodesFound.build());
-    ImmutableList.Builder<SimplifiedDiff> differingNodesFound = new ImmutableList.Builder<>();
+    ImmutableList.Builder<SimplifiedDiff> differingNodesFound =
+        new ImmutableList.Builder<SimplifiedDiff>();
     for (TreeDifference.TwoWayDiff differingNode : diff.getDifferingNodes()) {
       differingNodesFound.add(SimplifiedDiff.create(differingNode));
     }
@@ -204,4 +206,4 @@ public boolean equals(Object o) {
       return otherDiff.kind.equals(this.kind) && otherDiff.details.equals(this.details);
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,14 @@ public void scan_differingCompilationUnits() {`
`110`	`110`	`ASSERT.that(diff.getExtraExpectedNodes().isEmpty()).isTrue();`
`111`	`111`	`ASSERT.that(diff.getExtraActualNodes().size()).isEqualTo(extraNodesExpected.size());`
`112`	`112`
`113`		`- ImmutableList.Builder<SimplifiedDiff> extraNodesFound = new ImmutableList.Builder<>();`
	`113`	`+ ImmutableList.Builder<SimplifiedDiff> extraNodesFound =`
	`114`	`+ new ImmutableList.Builder<SimplifiedDiff>();`
`114`	`115`	`for (TreeDifference.OneWayDiff extraNode : diff.getExtraActualNodes()) {`
`115`	`116`	`extraNodesFound.add(SimplifiedDiff.create(extraNode));`
`116`	`117`	`}`
`117`	`118`	`ASSERT.that(extraNodesExpected).iteratesAs(extraNodesFound.build());`
`118`		`- ImmutableList.Builder<SimplifiedDiff> differingNodesFound = new ImmutableList.Builder<>();`
	`119`	`+ ImmutableList.Builder<SimplifiedDiff> differingNodesFound =`
	`120`	`+ new ImmutableList.Builder<SimplifiedDiff>();`
`119`	`121`	`for (TreeDifference.TwoWayDiff differingNode : diff.getDifferingNodes()) {`
`120`	`122`	`differingNodesFound.add(SimplifiedDiff.create(differingNode));`
`121`	`123`	`}`
`@@ -204,4 +206,4 @@ public boolean equals(Object o) {`
`204`	`206`	`return otherDiff.kind.equals(this.kind) && otherDiff.details.equals(this.details);`
`205`	`207`	`}`
`206`	`208`	`}`
`207`		`-}`
	`209`	`+}`