+ javadoc comment to addEntities method, small refactoring
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/51885206 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/51885206 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/51885206 Branch: refs/heads/master Commit: 51885206960971aa8edcd3ab01b77efe5503c5fb Parents: 7215827 Author: Maxim Petrusevich <maks1...@gmail.com> Authored: Fri Apr 7 16:15:40 2017 +0300 Committer: Maxim Petrusevich <maks1...@gmail.com> Committed: Fri Apr 7 16:15:40 2017 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/gen/ClassGenerationAction.java | 13 ++++++++++++- docs/doc/src/main/resources/RELEASE-NOTES.txt | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/51885206/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java ---------------------------------------------------------------------- diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java index 1e37be9..387cabb 100644 --- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java +++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java @@ -21,7 +21,10 @@ package org.apache.cayenne.gen; import org.apache.cayenne.CayenneException; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.map.*; +import org.apache.cayenne.map.DataMap; +import org.apache.cayenne.map.Embeddable; +import org.apache.cayenne.map.ObjEntity; +import org.apache.cayenne.map.QueryDescriptor; import org.apache.commons.logging.Log; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -511,6 +514,14 @@ public class ClassGenerationAction { /** * Adds entities to the internal entity list. */ + + /** + * + * @param entities + * @throws CayenneException + * + * @since 4.0 throws exception + */ public void addEntities(Collection<ObjEntity> entities) throws CayenneException { if (artifactsGenerationMode == ArtifactsGenerationMode.ENTITY || artifactsGenerationMode == ArtifactsGenerationMode.ALL) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/51885206/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 04c5b75..4a716cf 100644 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@ -32,6 +32,7 @@ Bug Fixes: CAY-2077 Bug in CayenneRuntimeException using wrong specified string in Formatter CAY-2094 SelectById query doesn't work from ROP client +CAY-2161 'Not for Client Use' option is ignored at Class Generation CAY-2240 Modeler: issue with cursor rendering for EJBQL query CAY-2243 ObjectContext.getGraphManager().unregisterObject() inconsistencies CAY-2250 Remove: Incorrect text in Confirm Remove message when cursor is set on attribute row @@ -71,7 +72,6 @@ Bug Fixes: CAY-2032 SelectAction: DistinctResultIterator ignores flattened relationships CAY-2137 When generating SQL from EJBQL, use "AND" to separate multiple join conditions -CAY-2161 'Not for Client Use' option is ignored at Class Generation CAY-2174 Change FK attribute name cause ObjAttribute appear after Reverse Engineering CAY-2175 AliasName used in EJBQLQuery is not working if it contains mixed case CAY-2183 Newly created DbRelationship is unexpectedly renamed by the Modeler
