This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit a818ab0834f1d892ee90155b0fe11f48d812240e Author: Nikita Timofeev <stari...@gmail.com> AuthorDate: Thu Dec 9 13:22:58 2021 +0300 CAY-2724 Duplicating relationship after editing its name --- RELEASE-NOTES.txt | 1 + .../apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 246675d..e781423 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -39,6 +39,7 @@ CAY-2646 Wrong target path selection logic in cgen config CAY-2647 Modeler: project upgrade from 4.0.B2 to 4.1.RC2 failure CAY-2653 No methods for queries with qualifier parameters generated CAY-2654 Exception in dbimport when relationships should be imported, but no explicit configuration exists +CAY-2724 Duplicating relationship after editing its name ---------------------------------- Release: 4.1.RC2 diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java index b956020..3037cf3 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java @@ -268,7 +268,7 @@ public class ObjRelationshipInfo extends CayenneController implements TreeSelect } } - if (configureRelationShip()) { + if (configureRelationship()) { mediator.fireObjRelationshipEvent(new RelationshipEvent(Application.getFrame(), getRelationship(), getRelationship().getSourceEntity())); } @@ -514,7 +514,7 @@ public class ObjRelationshipInfo extends CayenneController implements TreeSelect /** * Stores current state of the model in the internal ObjRelationship. */ - public boolean configureRelationShip() { + public boolean configureRelationship() { boolean hasChanges = false; boolean oldToMany = relationship.isToMany();