summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2012-01-30 11:41:13 -0800
committerBrian Carlstrom <bdc@google.com>2013-04-30 14:52:21 -0700
commit04b2ff92ae27b3acd82148d9252253573638ccc6 (patch)
tree85f2f3ae36769f84ff205f407d377458ce774357
parent0b42772c20d87d468bb095205c5461dacbbe9cea (diff)
downloadlibcore-04b2ff92ae27b3acd82148d9252253573638ccc6.zip
libcore-04b2ff92ae27b3acd82148d9252253573638ccc6.tar.gz
libcore-04b2ff92ae27b3acd82148d9252253573638ccc6.tar.bz2
Add missing @Override annotations
Change-Id: I4c5772c9549375beeb0e4f269bd61d623fca7e35 (cherry picked from commit 49992f5003aac55e1b1cf54769abc93630ccde93)
-rw-r--r--dex/src/main/java/com/android/dex/TypeList.java2
-rw-r--r--luni/src/main/java/java/nio/ByteBuffer.java10
2 files changed, 6 insertions, 6 deletions
diff --git a/dex/src/main/java/com/android/dex/TypeList.java b/dex/src/main/java/com/android/dex/TypeList.java
index aa1bf58..6e321fb 100644
--- a/dex/src/main/java/com/android/dex/TypeList.java
+++ b/dex/src/main/java/com/android/dex/TypeList.java
@@ -34,7 +34,7 @@ public final class TypeList implements Comparable<TypeList> {
return types;
}
- public int compareTo(TypeList other) {
+ @Override public int compareTo(TypeList other) {
for (int i = 0; i < types.length && i < other.types.length; i++) {
if (types[i] != other.types[i]) {
return Unsigned.compare(types[i], other.types[i]);
diff --git a/luni/src/main/java/java/nio/ByteBuffer.java b/luni/src/main/java/java/nio/ByteBuffer.java
index cd39a53..324369a 100644
--- a/luni/src/main/java/java/nio/ByteBuffer.java
+++ b/luni/src/main/java/java/nio/ByteBuffer.java
@@ -125,7 +125,7 @@ public abstract class ByteBuffer extends Buffer implements Comparable<ByteBuffer
* @exception UnsupportedOperationException
* if this buffer is not based on an array.
*/
- public final byte[] array() {
+ @Override public final byte[] array() {
return protectedArray();
}
@@ -142,7 +142,7 @@ public abstract class ByteBuffer extends Buffer implements Comparable<ByteBuffer
* @exception UnsupportedOperationException
* if this buffer is not based on an array.
*/
- public final int arrayOffset() {
+ @Override public final int arrayOffset() {
return protectedArrayOffset();
}
@@ -290,7 +290,7 @@ public abstract class ByteBuffer extends Buffer implements Comparable<ByteBuffer
* @exception ClassCastException
* if {@code other} is not a byte buffer.
*/
- public int compareTo(ByteBuffer otherBuffer) {
+ @Override public int compareTo(ByteBuffer otherBuffer) {
int compareRemaining = (remaining() < otherBuffer.remaining()) ? remaining()
: otherBuffer.remaining();
int thisPos = position;
@@ -592,7 +592,7 @@ public abstract class ByteBuffer extends Buffer implements Comparable<ByteBuffer
*/
public abstract short getShort(int index);
- public final boolean hasArray() {
+ @Override public final boolean hasArray() {
return protectedHasArray();
}
@@ -617,7 +617,7 @@ public abstract class ByteBuffer extends Buffer implements Comparable<ByteBuffer
*
* @return {@code true} if this buffer is direct, {@code false} otherwise.
*/
- public abstract boolean isDirect();
+ @Override public abstract boolean isDirect();
/**
* Returns the byte order used by this buffer when converting bytes from/to