Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 5579 invoked from network); 29 Jun 2006 01:43:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Jun 2006 01:43:10 -0000 Received: (qmail 70539 invoked by uid 500); 29 Jun 2006 01:43:09 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 70508 invoked by uid 500); 29 Jun 2006 01:43:09 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 70497 invoked by uid 99); 29 Jun 2006 01:43:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jun 2006 18:43:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jun 2006 18:43:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B89121A9842; Wed, 28 Jun 2006 18:42:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r417916 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util: Arrays.java Collections.java Date: Thu, 29 Jun 2006 01:42:48 -0000 To: harmony-commits@incubator.apache.org From: ndbeyer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060629014248.B89121A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ndbeyer Date: Wed Jun 28 18:42:47 2006 New Revision: 417916 URL: http://svn.apache.org/viewvc?rev=417916&view=rev Log: Add override, suppress warnings annotations and misc code cleanup. Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java?rev=417916&r1=417915&r2=417916&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Arrays.java Wed Jun 28 18:42:47 2006 @@ -39,6 +39,7 @@ a = storage; } + @Override public boolean contains(Object object) { if (object != null) { for (E element : a) { @@ -56,6 +57,7 @@ return false; } + @Override public E get(int location) { try { return a[location]; @@ -64,6 +66,7 @@ } } + @Override public int indexOf(Object object) { if (object != null) { for (int i = 0; i < a.length; i++) { @@ -81,6 +84,7 @@ return -1; } + @Override public int lastIndexOf(Object object) { if (object != null) { for (int i = a.length - 1; i >= 0; i--) { @@ -98,6 +102,7 @@ return -1; } + @Override public E set(int location, E object) { try { E result = a[location]; @@ -110,14 +115,17 @@ } } + @Override public int size() { return a.length; } + @Override public Object[] toArray() { return a.clone(); } + @Override @SuppressWarnings("unchecked") public T[] toArray(T[] contents) { int size = size(); @@ -344,8 +352,9 @@ * not implement Comparable, or cannot be compared to each * other */ + @SuppressWarnings("unchecked") public static int binarySearch(Object[] array, Object object) { - Comparable key = (Comparable) object; + Comparable key = (Comparable) object; int low = 0, mid = 0, high = array.length - 1, result = 0; while (low <= high) { mid = (low + high) >> 1; @@ -2176,6 +2185,7 @@ } } + @SuppressWarnings("unchecked") private static void sort(int start, int end, Object[] array) { int middle = (start + end) / 2; if (start + 1 < middle) { @@ -2188,7 +2198,7 @@ return; // this case can only happen when this method is called by } // the user - if (((Comparable) array[middle - 1]).compareTo(array[middle]) <= 0) { + if (((Comparable) array[middle - 1]).compareTo(array[middle]) <= 0) { return; } if (start + 2 == end) { @@ -2200,7 +2210,7 @@ int i1 = start, i2 = middle, i3 = 0; Object[] merge = new Object[end - start]; while (i1 < middle && i2 < end) { - merge[i3++] = ((Comparable) array[i1]).compareTo(array[i2]) <= 0 ? array[i1++] + merge[i3++] = ((Comparable) array[i1]).compareTo(array[i2]) <= 0 ? array[i1++] : array[i2++]; } if (i1 < middle) { Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java?rev=417916&r1=417915&r2=417916&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Collections.java Wed Jun 28 18:42:47 2006 @@ -58,7 +58,8 @@ } } - private static final class EmptyList extends AbstractList implements + @SuppressWarnings("unchecked") + private static final class EmptyList extends AbstractList implements Serializable { private static final long serialVersionUID = 8842843931221139166L; @@ -75,7 +76,8 @@ } } - private static final class EmptySet extends AbstractSet implements + @SuppressWarnings("unchecked") + private static final class EmptySet extends AbstractSet implements Serializable { private static final long serialVersionUID = 1582296315990362920L; @@ -104,7 +106,8 @@ } } - private static final class EmptyMap extends AbstractMap implements + @SuppressWarnings("unchecked") + private static final class EmptyMap extends AbstractMap implements Serializable { private static final long serialVersionUID = 6428348081105594320L; @@ -133,11 +136,14 @@ } } + @SuppressWarnings("unchecked") public static final List EMPTY_LIST = new EmptyList(); - public static final Set EMPTY_SET = new EmptySet(); + @SuppressWarnings("unchecked") + public static final Set EMPTY_SET = new EmptySet(); - public static final Map EMPTY_MAP = new EmptyMap(); + @SuppressWarnings("unchecked") + public static final Map EMPTY_MAP = new EmptyMap(); private static final class ReverseComparator implements Comparator, Serializable { private static final long serialVersionUID = 7207038068494060240L;