You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/06/24 19:59:14 UTC
svn commit: r788100 - in /incubator/pivot/trunk:
core/src/org/apache/pivot/collections/ArrayList.java
core/src/org/apache/pivot/collections/EnumList.java
wtk/src/org/apache/pivot/wtk/LocalManifest.java
Author: gbrown
Date: Wed Jun 24 17:59:13 2009
New Revision: 788100
URL: http://svn.apache.org/viewvc?rev=788100&view=rev
Log:
Fix bug in ArrayList#toArray().
Modified:
incubator/pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java
incubator/pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java?rev=788100&r1=788099&r2=788100&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/collections/ArrayList.java Wed Jun 24 17:59:13 2009
@@ -332,11 +332,8 @@
}
@SuppressWarnings("unchecked")
- public T[] toArray() {
- Object[] array = new Object[length];
- System.arraycopy(items, 0, array, 0, length);
-
- return (T[])array;
+ public T[] toArray(Class<? extends T[]> type) {
+ return Arrays.copyOf(items, length, type);
}
public Comparator<T> getComparator() {
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java?rev=788100&r1=788099&r2=788100&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/collections/EnumList.java Wed Jun 24 17:59:13 2009
@@ -17,6 +17,7 @@
package org.apache.pivot.collections;
import java.io.Serializable;
+import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -112,10 +113,7 @@
@SuppressWarnings("unchecked")
public E[] toArray() {
- Object[] array = new Object[items.length];
- System.arraycopy(items, 0, array, 0, items.length);
-
- return (E[])array;
+ return Arrays.copyOf(items, items.length);
}
public Comparator<E> getComparator() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java?rev=788100&r1=788099&r2=788100&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/LocalManifest.java Wed Jun 24 17:59:13 2009
@@ -183,7 +183,7 @@
}
public DataFlavor[] getTransferDataFlavors() {
- return transferDataFlavors.toArray();
+ return transferDataFlavors.toArray(DataFlavor[].class);
}
public boolean isDataFlavorSupported(DataFlavor dataFlavor) {