Repository: cayenne
Updated Branches:
  refs/heads/master 9dce81b8b -> e1b6b6372


CAY-2418
Added reset resolve action on select change from search results.


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f9b6126a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f9b6126a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f9b6126a

Branch: refs/heads/master
Commit: f9b6126a3070b9203c1597eef4123f67b19754b4
Parents: 67aad8a
Author: kkomyak <const1...@gmail.com>
Authored: Wed Apr 4 12:06:12 2018 +0300
Committer: kkomyak <const1...@gmail.com>
Committed: Mon Apr 9 15:11:52 2018 +0300

----------------------------------------------------------------------
 .../apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java  | 2 ++
 .../cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/f9b6126a/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 c25a1a4..aa3ff2f 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 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/f9b6126a/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 0e3a4f5..a68bd93 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 class DbEntityRelationshipPanel extends JPanel 
implements DbEntityDisplay
         }
 
         table.select(newSel);
+        parentPanel.getResolve().removeActionListener(getResolver());
+        parentPanel.getResolve().addActionListener(getResolver());
     }
 
     /**

Reply via email to