You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/09/13 19:51:37 UTC

svn commit: r1523035 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/ framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/

Author: aadamchik
Date: Fri Sep 13 17:51:37 2013
New Revision: 1523035

URL: http://svn.apache.org/r1523035
Log:
CAY-1869 ResultIterator from cayenne-client dependency is subclassed from org.apache.cayenne.access.ResultIterator which is present only in cayenne-server dependency

Removed:
    cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/access/ResultIterator.java
Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/ResultIterator.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1523035&r1=1523034&r2=1523035&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri Sep 13 17:51:37 2013
@@ -34,6 +34,7 @@ CAY-1834 Exception: ToManyList cannot be
 CAY-1857 Problem with hotkeys 
 CAY-1859 NullPointerException when importing EOModel 
 CAY-1866 Change in General Modeler Preferences reverts old settings to default value
+CAY-1869 ResultIterator from cayenne-client dependency is subclassed from org.apache.cayenne.access.ResultIterator which is present only in cayenne-server dependency 
 
 ----------------------------------
 Release: 3.2M1

Modified: cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/ResultIterator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/ResultIterator.java?rev=1523035&r1=1523034&r2=1523035&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/ResultIterator.java (original)
+++ cayenne/main/trunk/framework/cayenne-core-unpublished/src/main/java/org/apache/cayenne/ResultIterator.java Fri Sep 13 17:51:37 2013
@@ -31,7 +31,7 @@ import java.util.List;
  * Result "rows", depending on the query, may be represented as scalar values,
  * DataRows, or Object[] arrays containing a mix of scalars and DataRows.
  */
-public interface ResultIterator<T> extends org.apache.cayenne.access.ResultIterator<T>, Iterable<T> {
+public interface ResultIterator<T> extends Iterable<T> {
 
     /**
      * Returns all yet unread rows from ResultSet without closing it.