Revision: 6626
Author: [email protected]
Date: Tue Nov 3 14:18:11 2009
Log: Merge trunk r6625 was into this branch
Avoid Arrays.copyOf since that was added in JDK1.6.
svn merge --ignore-ancestry -c6625 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6626
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/dev/core/src/com/google/gwt/dev/GwtVersion.java
=======================================
--- /releases/2.0/branch-info.txt Tue Nov 3 13:26:55 2009
+++ /releases/2.0/branch-info.txt Tue Nov 3 14:18:11 2009
@@ -233,3 +233,8 @@
tr...@6580 was merged into this branch
Implement a -standardsMode flag for junit tests
svn merge --ignore-ancestry -c 6580
http://google-web-toolkit.googlecode.com/svn/trunk/ .
+
+tr...@6625 was merged into this branch
+ Avoid Arrays.copyOf since that was added in JDK1.6.
+ svn merge --ignore-ancestry -c6625 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/dev/core/src/com/google/gwt/dev/GwtVersion.java Tue Nov
3 13:06:00 2009
+++ /releases/2.0/dev/core/src/com/google/gwt/dev/GwtVersion.java Tue Nov
3 14:18:11 2009
@@ -92,7 +92,10 @@
* @return a copy of the array of version components, always exactly
length 3.
*/
public int[] getComponents() {
- return Arrays.copyOf(components, COMPONENT_COUNT);
+ // Avoid Arrays.copyOf since it was added in JDK1.6
+ int[] returnVal = new int[COMPONENT_COUNT];
+ System.arraycopy(components, 0, returnVal, 0, COMPONENT_COUNT);
+ return returnVal;
}
/**
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
