Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java |
diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java |
similarity index 74% |
rename from third_party/protobuf/java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java |
rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java |
index 5257c5a2352e4ab597e1aabf9096c5524419e94c..30e87911784182956f5353c40c2d79b975ccc1e9 100644 |
--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java |
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java |
@@ -68,42 +68,42 @@ public class UnmodifiableLazyStringList extends AbstractList<String> |
return list.size(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public ByteString getByteString(int index) { |
return list.getByteString(index); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void add(ByteString element) { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void set(int index, ByteString element) { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public boolean addAllByteString(Collection<? extends ByteString> element) { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public byte[] getByteArray(int index) { |
return list.getByteArray(index); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void add(byte[] element) { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void set(int index, byte[] element) { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public boolean addAllByteArray(Collection<byte[]> element) { |
throw new UnsupportedOperationException(); |
} |
@@ -113,47 +113,47 @@ public class UnmodifiableLazyStringList extends AbstractList<String> |
return new ListIterator<String>() { |
ListIterator<String> iter = list.listIterator(index); |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public boolean hasNext() { |
return iter.hasNext(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public String next() { |
return iter.next(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public boolean hasPrevious() { |
return iter.hasPrevious(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public String previous() { |
return iter.previous(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public int nextIndex() { |
return iter.nextIndex(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public int previousIndex() { |
return iter.previousIndex(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void remove() { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void set(String o) { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void add(String o) { |
throw new UnsupportedOperationException(); |
} |
@@ -165,45 +165,45 @@ public class UnmodifiableLazyStringList extends AbstractList<String> |
return new Iterator<String>() { |
Iterator<String> iter = list.iterator(); |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public boolean hasNext() { |
return iter.hasNext(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public String next() { |
return iter.next(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void remove() { |
throw new UnsupportedOperationException(); |
} |
}; |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public List<?> getUnderlyingElements() { |
// The returned value is already unmodifiable. |
return list.getUnderlyingElements(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public void mergeFrom(LazyStringList other) { |
throw new UnsupportedOperationException(); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public List<byte[]> asByteArrayList() { |
return Collections.unmodifiableList(list.asByteArrayList()); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public List<ByteString> asByteStringList() { |
return Collections.unmodifiableList(list.asByteStringList()); |
} |
- //@Override (Java 1.6 override semantics, but we must support 1.5) |
+ @Override |
public LazyStringList getUnmodifiableView() { |
return this; |
} |