Move from google-collect-1.0-rc1 to google-collect-1.0-rc3.

shubay · shubay · commit 6b047a64060c · 2009-10-28T08:09:54.000Z
diff --git a/build-src/build.properties b/build-src/build.properties
@@ -5,7 +5,7 @@
 servlet-api.jar=../lib/servlet-api-2.4.jar
 
 # You may want to edit the following dependencies if you wish to use your own copy of them.
-google-collect.jar=../lib/google-collect-1.0-rc1.jar
+google-collect.jar=../lib/google-collect-1.0-rc3.jar
 icu4j.jar=../lib/icu4j-4_0_1.jar
 jakarta-commons-lang.jar=../lib/commons-lang-2.4.jar
 opencsv.jar=../lib/opencsv-1.8.jar
diff --git a/lib/google-collect-1.0-rc3.jar b/lib/google-collect-1.0-rc3.jar
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>com.google.collections</groupId>
       <artifactId>google-collections</artifactId>
-      <version>1.0-rc1</version>
+      <version>1.0-rc3</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.icu</groupId>
diff --git a/src/main/java/com/google/visualization/datasource/query/engine/GroupingComparators.java b/src/main/java/com/google/visualization/datasource/query/engine/GroupingComparators.java
@@ -125,7 +125,7 @@ private static class ColumnTitleDynamicComparator
      * @param aggregations The list that gives order to the ColumnAggregations.
      */
     public ColumnTitleDynamicComparator(List<AggregationColumn> aggregations) {
-      aggregationsComparator = Ordering.givenOrder(aggregations);
+      aggregationsComparator = Ordering.explicit(aggregations);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ private static class ColumnTitleDynamicComparator`
`125`	`125`	`* @param aggregations The list that gives order to the ColumnAggregations.`
`126`	`126`	`*/`
`127`	`127`	`public ColumnTitleDynamicComparator(List<AggregationColumn> aggregations) {`
`128`		`- aggregationsComparator = Ordering.givenOrder(aggregations);`
	`128`	`+ aggregationsComparator = Ordering.explicit(aggregations);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`/**`