Author: aadamchik
Date: Fri Jul 6 19:44:00 2012
New Revision: 1358371
URL: http://svn.apache.org/viewvc?rev=1358371&view=rev
Log:
CAY-1718 Remove everything deprecated in 3.1
in progress
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java?rev=1358371&r1=1358370&r2=1358371&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java
Fri Jul 6 19:44:00 2012
@@ -34,12 +34,6 @@ import org.apache.cayenne.util.Util;
public class PrefetchSelectQuery extends SelectQuery {
/**
- * @deprecated since 3.1 unused
- */
- @Deprecated
- protected SelectQuery parentQuery;
-
- /**
* The relationship path from root objects to the objects being prefetched.
*/
protected String prefetchPath;
@@ -55,7 +49,7 @@ public class PrefetchSelectQuery extends
/**
* Creates a new disjoint prefetch select query.
- *
+ *
* @since 3.1
*/
public PrefetchSelectQuery(String prefetchPath, ObjRelationship
lastPrefetchHint) {
@@ -65,24 +59,6 @@ public class PrefetchSelectQuery extends
}
/**
- * Creates a new disjoint prefetch select query.
- *
- * @since 1.2
- * @deprecated Since 3.1 use another constructor without parentQuery
parameter
- * instead.
- */
- @Deprecated
- public PrefetchSelectQuery(SelectQuery parentQuery, String prefetchPath,
- ObjRelationship lastPrefetchHint) {
-
- setRoot(lastPrefetchHint.getTargetEntity());
- setStatementFetchSize(parentQuery.getStatementFetchSize());
- this.parentQuery = parentQuery;
- this.prefetchPath = prefetchPath;
- this.lastPrefetchHint = lastPrefetchHint;
- }
-
- /**
* Overrides super implementation to suppress disjoint prefetch routing,
as the parent
* query should take care of that.
*
@@ -110,25 +86,7 @@ public class PrefetchSelectQuery extends
}
/**
- * @since 1.1
- * @deprecated since 3.1
- */
- @Deprecated
- public SelectQuery getParentQuery() {
- return parentQuery;
- }
-
- /**
- * @since 1.1
- * @deprecated since 3.1
- */
- @Deprecated
- public void setParentQuery(SelectQuery parentQuery) {
- this.parentQuery = parentQuery;
- }
-
- /**
- * Retunrs last incoming ObjRelationship in the prefetch relationship
chain.
+ * Returns last incoming ObjRelationship in the prefetch relationship
chain.
*
* @since 1.1
*/
