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 2016/12/15 17:12:09 UTC
cayenne git commit: @Override
Repository: cayenne
Updated Branches:
refs/heads/master d8b17c100 -> 84f7f2dfa
@Override
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/84f7f2df
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/84f7f2df
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/84f7f2df
Branch: refs/heads/master
Commit: 84f7f2dfafb81998f1dd29bf2121c7999fcd949a
Parents: d8b17c1
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Thu Dec 15 20:11:51 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Thu Dec 15 20:11:51 2016 +0300
----------------------------------------------------------------------
.../cayenne/ashwood/AshwoodEntitySorter.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/84f7f2df/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
index 2eba171..a2b4077 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
@@ -19,14 +19,6 @@
package org.apache.cayenne.ashwood;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
@@ -49,6 +41,14 @@ import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.reflect.ClassDescriptor;
import org.apache.commons.collections.comparators.ReverseComparator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* Implements dependency sorting algorithms for ObjEntities, DbEntities and
* DataObjects. Presently it works for acyclic database schemas with possible
@@ -339,6 +339,7 @@ public class AshwoodEntitySorter implements EntitySorter {
private final class ObjEntityComparator implements Comparator<ObjEntity> {
+ @Override
public int compare(ObjEntity o1, ObjEntity o2) {
if (o1 == o2)
return 0;
@@ -350,6 +351,7 @@ public class AshwoodEntitySorter implements EntitySorter {
private final class DbEntityComparator implements Comparator<DbEntity> {
+ @Override
public int compare(DbEntity t1, DbEntity t2) {
if (t1 == t2)