Author: aadamchik
Date: Thu Jul 5 20:08:16 2012
New Revision: 1357860
URL: http://svn.apache.org/viewvc?rev=1357860&view=rev
Log:
CAY-1718 Remove everything deprecated in 3.1
in progress
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java?rev=1357860&r1=1357859&r2=1357860&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
Thu Jul 5 20:08:16 2012
@@ -37,7 +37,6 @@ import org.apache.cayenne.ashwood.graph.
import org.apache.cayenne.ashwood.graph.IndegreeTopologicalSort;
import org.apache.cayenne.ashwood.graph.MapDigraph;
import org.apache.cayenne.ashwood.graph.StrongConnection;
-import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbJoin;
@@ -74,16 +73,6 @@ public class AshwoodEntitySorter impleme
}
/**
- * @deprecated since 3.1. Use {@link #AshwoodEntitySorter()} constructor
together with
- * {@link #setDataMaps(Collection)} instead.
- */
- @Deprecated
- public AshwoodEntitySorter(Collection<DataMap> dataMaps) {
- this();
- setDataMaps(dataMaps);
- }
-
- /**
* Reindexes internal sorter in a thread-safe manner.
*/
protected void indexSorter() {
@@ -188,17 +177,6 @@ public class AshwoodEntitySorter impleme
}
/**
- * @since 1.1
- * @deprecated since 3.1, {@link #setEntityResolver(EntityResolver)} is
used instead.
- */
- @Deprecated
- public void setDataMaps(Collection<DataMap> dataMaps) {
- setEntityResolver(new EntityResolver(dataMaps != null
- ? dataMaps
- : Collections.EMPTY_LIST));
- }
-
- /**
* @since 3.1
*/
public void setEntityResolver(EntityResolver entityResolver) {
@@ -291,7 +269,7 @@ public class AshwoodEntitySorter impleme
Persistent masterCandidate = persistent.get(j);
for (Object master : masters) {
-// if (masterCandidate.equals(master)) {
+ // if (masterCandidate.equals(master)) {
if (masterCandidate == master) {
objectDependencyGraph.putArc(
masterCandidate,
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java?rev=1357860&r1=1357859&r2=1357860&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntitySorter.java
Thu Jul 5 20:08:16 2012
@@ -19,7 +19,6 @@
package org.apache.cayenne.map;
-import java.util.Collection;
import java.util.List;
/**
@@ -30,15 +29,6 @@ import java.util.List;
public interface EntitySorter {
/**
- * Initializes a list of DataMaps used by the sorter.
- *
- * @deprecated since 3.1 {@link #setEntityResolver(EntityResolver)} is
used, and this
- * method is never called.
- */
- @Deprecated
- void setDataMaps(Collection<DataMap> dataMaps);
-
- /**
* Sets EntityResolver for this sorter. All entities present in the
resolver will be
* used to determine sort ordering.
*
