CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a146cef5 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a146cef5 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a146cef5 Branch: refs/heads/STABLE-4.0 Commit: a146cef5192d668adc6819b340caa0592ee5a285 Parents: 51cc84f Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Aug 29 14:14:30 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Aug 29 14:14:30 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a146cef5/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 56a4c32..0de5067 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,6 +15,7 @@ Date: Bug Fixes: CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu +CAY-2451 Modeler: ObjEntity "Edit" button doesn't open editor for Relationship CAY-2459 Paste function is not working CAY-2464 ClassCastException when returning PRUNED_NODE in expression transformer http://git-wip-us.apache.org/repos/asf/cayenne/blob/a146cef5/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 d9af4ae..b312f87 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 @@ -41,11 +41,12 @@ import org.apache.cayenne.modeler.util.NameGeneratorPreferences; import org.apache.cayenne.util.DeleteRuleUpdater; import org.apache.cayenne.util.Util; -import javax.swing.*; +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.*; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; @@ -701,6 +702,7 @@ public class ObjRelationshipInfo extends CayenneController implements TreeSelect } if (getStartEntity() == null) { + JOptionPane.showMessageDialog(getView(), "Can't map relationship without source DbEntity. Set source DbEntity."); throw new CayenneRuntimeException("Can't map relationship without source DbEntity."); } }
