Repository: cayenne Updated Branches: refs/heads/STABLE-3.1 e7bff0cb3 -> a9ca65abe
CAY-2049 | Changing the Relationship name in ObjRelationship Inspector has no effect Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/172a48c8 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/172a48c8 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/172a48c8 Branch: refs/heads/STABLE-3.1 Commit: 172a48c8a914be0ff21e0fd3f06a7beb1b9180b9 Parents: e7bff0c Author: Savva Kolbachev <[email protected]> Authored: Wed Jan 20 13:14:40 2016 +0300 Committer: Savva Kolbachev <[email protected]> Committed: Wed Jan 20 13:14:40 2016 +0300 ---------------------------------------------------------------------- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + .../dialog/objentity/ObjRelationshipInfo.java | 39 +++++++++----------- 2 files changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/172a48c8/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 0ec1605..b6d43c7 100644 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@ -21,6 +21,7 @@ CAY-1964 Fix convertAdditionalDataMaps() in CayenneGeneratorMojo.java CAY-1973 error while generating classes CAY-1978 ESCAPE clause should be included in LIKE parenthesis CAY-1979 Prefetches on Many-to-Many Relationships with Longvarchar +CAY-2049 Changing the Relationship name in ObjRelationship Inspector has no effect ---------------------------------- Release: 3.1-final http://git-wip-us.apache.org/repos/asf/cayenne/blob/172a48c8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java ---------------------------------------------------------------------- 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 0985cfb..d60962f 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 @@ -18,21 +18,6 @@ ****************************************************************/ package org.apache.cayenne.modeler.dialog.objentity; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Vector; - -import javax.swing.JOptionPane; -import javax.swing.WindowConstants; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.TreePath; - import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.map.Attribute; import org.apache.cayenne.map.DbEntity; @@ -55,6 +40,20 @@ import org.apache.cayenne.util.DeleteRuleUpdater; import org.apache.cayenne.util.NamedObjectFactory; import org.apache.cayenne.util.Util; +import javax.swing.JOptionPane; +import javax.swing.WindowConstants; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.TreePath; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Vector; + public class ObjRelationshipInfo extends CayenneController implements TreeSelectionListener { @@ -72,7 +71,6 @@ public class ObjRelationshipInfo extends CayenneController implements protected List<ObjEntity> objectTargets; protected List<String> targetCollections; protected List<String> mapKeys; - protected String relationshipName; protected String targetCollection; protected String mapKey; protected ObjRelationshipInfoView view; @@ -100,8 +98,7 @@ public class ObjRelationshipInfo extends CayenneController implements setObjectTarget(target); view.sourceEntityLabel.setText(relationship.getSourceEntity().getName()); this.relationship = relationship; - this.relationshipName = relationship.getName(); - view.relationshipName.setText(relationshipName); + this.view.getRelationshipName().setText(relationship.getName()); this.mapKey = relationship.getMapKey(); this.targetCollection = relationship.getCollectionType(); if (targetCollection == null) { @@ -536,12 +533,11 @@ public class ObjRelationshipInfo extends CayenneController implements } public String getRelationshipName() { - return relationshipName; + return view.getRelationshipName().getText(); } public void setRelationshipName(String relationshipName) { - view.relationshipName.setText(relationshipName); - this.relationshipName = relationshipName; + view.getRelationshipName().setText(relationshipName); } /** @@ -576,6 +572,7 @@ public class ObjRelationshipInfo extends CayenneController implements boolean oldToMany = relationship.isToMany(); + String relationshipName = getRelationshipName(); if (!Util.nullSafeEquals(relationship.getName(), relationshipName)) { hasChanges = true; relationship.setName(relationshipName);
