Author: aadamchik
Date: Wed Mar 12 07:45:16 2014
New Revision: 1576618
URL: http://svn.apache.org/r1576618
Log:
java 6 annotations
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java?rev=1576618&r1=1576617&r2=1576618&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/CollectionResultIterator.java
Wed Mar 12 07:45:16 2014
@@ -36,11 +36,13 @@ class CollectionResultIterator<T> implem
this.iterator = c.iterator();
}
+ @Override
public Iterator<T> iterator() {
checkIterator();
return iterator;
}
+ @Override
public List<T> allRows() {
List<T> list = new ArrayList<T>();
@@ -51,21 +53,25 @@ class CollectionResultIterator<T> implem
return list;
}
+ @Override
public boolean hasNextRow() {
checkIterator();
return iterator.hasNext();
}
+ @Override
public T nextRow() {
checkIterator();
return iterator.next();
}
+ @Override
public void skipRow() {
checkIterator();
iterator.next();
}
+ @Override
public void close() {
iterator = null;
}
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java?rev=1576618&r1=1576617&r2=1576618&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataContext.java
Wed Mar 12 07:45:16 2014
@@ -799,10 +799,12 @@ public class DataContext extends BaseCon
final ObjectResolver resolver = new ObjectResolver(this,
descriptor, true);
return new ResultIterator<T>() {
+ @Override
public Iterator<T> iterator() {
return new ResultIteratorIterator<T>(this);
}
+ @Override
public List<T> allRows() {
List<T> list = new ArrayList<T>();
@@ -813,10 +815,12 @@ public class DataContext extends BaseCon
return list;
}
+ @Override
public boolean hasNextRow() {
return rows.hasNextRow();
}
+ @Override
public T nextRow() {
DataRow row = rows.nextRow();
List<T> objects = (List<T>) resolver
@@ -824,10 +828,12 @@ public class DataContext extends BaseCon
return (T) objects.get(0);
}
+ @Override
public void skipRow() {
rows.skipRow();
}
+ @Override
public void close() {
rows.close();
}
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java?rev=1576618&r1=1576617&r2=1576618&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/TransactionResultIteratorDecorator.java
Wed Mar 12 07:45:16 2014
@@ -42,6 +42,7 @@ final class TransactionResultIteratorDec
this.tx = tx;
}
+ @Override
public Iterator<T> iterator() {
return result.iterator();
}
@@ -49,6 +50,7 @@ final class TransactionResultIteratorDec
/**
* Closes the result and commits the transaction.
*/
+ @Override
public void close() {
try {
@@ -71,6 +73,7 @@ final class TransactionResultIteratorDec
/**
* @since 3.0
*/
+ @Override
public List<T> allRows() {
List<T> list = new ArrayList<T>();
@@ -81,6 +84,7 @@ final class TransactionResultIteratorDec
return list;
}
+ @Override
public boolean hasNextRow() {
return result.hasNextRow();
}
@@ -88,6 +92,7 @@ final class TransactionResultIteratorDec
/**
* @since 3.0
*/
+ @Override
public T nextRow() {
return result.nextRow();
}
@@ -95,6 +100,7 @@ final class TransactionResultIteratorDec
/**
* @since 3.0
*/
+ @Override
public void skipRow() {
result.skipRow();
}
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java?rev=1576618&r1=1576617&r2=1576618&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DistinctResultIterator.java
Wed Mar 12 07:45:16 2014
@@ -76,13 +76,15 @@ public class DistinctResultIterator<T> i
/**
* @since 3.2
*/
+ @Override
public Iterator<T> iterator() {
return new ResultIteratorIterator<T>(this);
}
/**
- * CLoses underlying ResultIterator.
+ * Closes underlying ResultIterator.
*/
+ @Override
public void close() {
delegate.close();
}
@@ -90,6 +92,7 @@ public class DistinctResultIterator<T> i
/**
* @since 3.0
*/
+ @Override
public List<T> allRows() {
List<T> list = new ArrayList<T>();
@@ -99,10 +102,12 @@ public class DistinctResultIterator<T> i
return list;
}
+ @Override
public boolean hasNextRow() {
return nextDataRow != null;
}
+ @Override
public T nextRow() {
if (!hasNextRow()) {
throw new NoSuchElementException("An attempt to read uninitialized
row or past the end of the iterator.");
@@ -118,6 +123,7 @@ public class DistinctResultIterator<T> i
/**
* @since 3.0
*/
+ @Override
public void skipRow() {
if (!hasNextRow()) {
throw new NoSuchElementException("An attempt to read uninitialized
row or past the end of the iterator.");
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java?rev=1576618&r1=1576617&r2=1576618&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/LimitResultIterator.java
Wed Mar 12 07:45:16 2014
@@ -58,6 +58,7 @@ public class LimitResultIterator<T> impl
/**
* @since 3.2
*/
+ @Override
public Iterator<T> iterator() {
return new ResultIteratorIterator<T>(this);
}
@@ -77,6 +78,7 @@ public class LimitResultIterator<T> impl
}
}
+ @Override
public void close() {
delegate.close();
}
@@ -84,6 +86,7 @@ public class LimitResultIterator<T> impl
/**
* @since 3.0
*/
+ @Override
public List<T> allRows() {
List<T> list = new ArrayList<T>();
@@ -95,6 +98,7 @@ public class LimitResultIterator<T> impl
return list;
}
+ @Override
public boolean hasNextRow() {
return nextRow;
}
@@ -102,6 +106,7 @@ public class LimitResultIterator<T> impl
/**
* @since 3.0
*/
+ @Override
public T nextRow() {
if (!hasNextRow()) {
throw new NoSuchElementException("An attempt to read uninitialized
row or past the end of the iterator.");
@@ -115,6 +120,7 @@ public class LimitResultIterator<T> impl
/**
* @since 3.0
*/
+ @Override
public void skipRow() {
delegate.skipRow();
}
