From f9b6126a3070b9203c1597eef4123f67b19754b4 Mon Sep 17 00:00:00 2001 From: kkomyak Date: Wed, 4 Apr 2018 12:06:12 +0300 Subject: [PATCH] CAY-2418 Added reset resolve action on select change from search results. --- .../cayenne/modeler/editor/ObjEntityRelationshipPanel.java | 2 ++ .../modeler/editor/dbentity/DbEntityRelationshipPanel.java | 2 ++ 2 files changed, 4 insertions(+) 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 c25a1a433d..aa3ff2f125 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 @@ -201,6 +201,8 @@ public void selectRelationships(ObjRelationship[] rels) { } table.select(newSel); + parentPanel.getResolve().removeActionListener(getResolver()); + parentPanel.getResolve().addActionListener(getResolver()); } /** 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 0e3a4f5aa3..a68bd93d47 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 @@ -189,6 +189,8 @@ public void selectRelationships(DbRelationship[] rels) { } table.select(newSel); + parentPanel.getResolve().removeActionListener(getResolver()); + parentPanel.getResolve().addActionListener(getResolver()); } /**