Repository: cayenne Updated Branches: refs/heads/master 35833cde0 -> 67c947e0b
CAY-2057 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/01b0414d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/01b0414d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/01b0414d Branch: refs/heads/master Commit: 01b0414da4d1733cdfb5e5d50153bb44bd800d64 Parents: 8f3ac8b Author: Anton Dreka <drek...@gmail.com> Authored: Wed Apr 12 11:25:54 2017 +0300 Committer: Anton Dreka <drek...@gmail.com> Committed: Wed Apr 12 11:25:54 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/cayenne/query/Ordering.java | 6 +----- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + modeler/cayenne-modeler-mac/pom.xml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/01b0414d/cayenne-server/src/main/java/org/apache/cayenne/query/Ordering.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/Ordering.java b/cayenne-server/src/main/java/org/apache/cayenne/query/Ordering.java index e6d2464..95c0b01 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/query/Ordering.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/query/Ordering.java @@ -66,11 +66,7 @@ public class Ordering implements Comparator<Object>, Serializable, XMLSerializab } /** - * Orders a given list of objects, using a List of Orderings applied - * according the default iteration order of the Orderings list. I.e. each - * Ordering with lower index is more significant than any other Ordering - * with higher index. List being ordered is modified in place. - * + * Return the sorted list of objects. * @since 4.0 */ public static <E> List<E> orderedList(Collection<E> objects, List<? extends Ordering> orderings) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/01b0414d/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt index 694e754..4b4bb68 100644 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@ -14,6 +14,7 @@ Date: Changes/New Features: CAY-1873 Move DataDomain cache configuration from the Modeler and into DI +CAY-2057 Clean up OS X Modeler CAY-2109 cayenne-crypto: add value authentication (HMAC) CAY-2210 Query cache: incorrect cache key for queries with custom value objects CAY-2255 ObjectSelect improvement: columns as full entities http://git-wip-us.apache.org/repos/asf/cayenne/blob/01b0414d/modeler/cayenne-modeler-mac/pom.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml index 6c72c92..998210e 100644 --- a/modeler/cayenne-modeler-mac/pom.xml +++ b/modeler/cayenne-modeler-mac/pom.xml @@ -104,7 +104,7 @@ <icon>src/japplication/resources/CayenneModeler.icns</icon> <os>mac</os> <jvm>1.7+</jvm> - <jvmOptions>-Xmx500m -Dapple.laf.useScreenMenuBar=true</jvmOptions> + <jvmOptions>-Xmx500m -Dapple.laf.useScreenMenuBar=true -Xdock:name=CayenneModeler</jvmOptions> </configuration> <executions> <execution>
