Repository: cayenne Updated Branches: refs/heads/master 39b70d1bf -> 9422b9802
CAY-2116 Split schema synchronization code in a separate module * naming classes cleanup and docs Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9422b980 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9422b980 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9422b980 Branch: refs/heads/master Commit: 9422b9802aa125ef6ce329d6ed83fd751dc30119 Parents: 39b70d1 Author: Andrus Adamchik <[email protected]> Authored: Sun Oct 2 16:04:12 2016 +0300 Committer: Andrus Adamchik <[email protected]> Committed: Sun Oct 2 21:51:07 2016 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/dbsync/naming/CallbackNameBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/9422b980/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/CallbackNameBuilder.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/CallbackNameBuilder.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/CallbackNameBuilder.java index 655841c..7f01eb8 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/CallbackNameBuilder.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/CallbackNameBuilder.java @@ -39,11 +39,11 @@ class CallbackNameBuilder extends NameBuilder { ? this.baseName : "onEvent"; - return new DeduplicationVisitor(namingContext, baseName, dupesPattern).resolve(new DeduplicationVisitor.Predicate() { + return new DeduplicationVisitor(parent, baseName, dupesPattern).resolve(new DeduplicationVisitor.Predicate() { @Override public boolean isNameInUse(String name) { - ObjEntity entity = (ObjEntity) namingContext; + ObjEntity entity = (ObjEntity) parent; if (entity.getCallbackMethods().contains(name)) { return true;
