CAY-2418 Modeler: unable to edit entity selected via Search
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c77c8517 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c77c8517 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c77c8517 Branch: refs/heads/STABLE-4.0 Commit: c77c85172cff47deaa5241b169f0c3189d0e0e00 Parents: 8d4c83a Author: Arseni Bulatski <ancars...@gmail.com> Authored: Tue Jul 10 10:46:46 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Tue Jul 10 11:09:53 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../cayenne/modeler/editor/ObjEntityRelationshipPanel.java | 4 ++-- .../modeler/editor/dbentity/DbEntityRelationshipPanel.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 1d85638..df6328f 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -46,6 +46,7 @@ CAY-2392 Modeler: Unable to remove DataNode CAY-2401 Modeler: NPE in ObjEntity sync action CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class +CAY-2418 Modeler: unable to edit entity selected via Search CAY-2420 Modeler: search is not performed for Stored Procedures CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java index c7c3788..b48a68e 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java @@ -45,7 +45,6 @@ import org.apache.cayenne.modeler.util.DbRelationshipPathComboBoxEditor; import org.apache.cayenne.modeler.util.ModelerUtil; import org.apache.cayenne.modeler.util.PanelFactory; import org.apache.cayenne.modeler.util.UIUtil; -import org.apache.cayenne.swing.components.image.FilteredIconFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +69,6 @@ import javax.swing.table.TableColumn; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; -import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collection; @@ -204,6 +202,8 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl } table.select(newSel); + parentPanel.getResolve().removeActionListener(getResolver()); + parentPanel.getResolve().addActionListener(getResolver()); } /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java index ca25022..13122ac 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java @@ -190,6 +190,8 @@ public class DbEntityRelationshipPanel extends JPanel implements DbEntityDisplay } table.select(newSel); + parentPanel.getResolve().removeActionListener(getResolver()); + parentPanel.getResolve().addActionListener(getResolver()); } /**