You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/04/11 11:50:36 UTC

[1/3] cayenne git commit: CAY-2418 Added reset resolve action on select change from search results.

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 <co...@gmail.com>
Authored: Wed Apr 4 12:06:12 2018 +0300
Committer: kkomyak <co...@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());
     }
 
     /**


[3/3] cayenne git commit: CAY-2418 release notes

Posted by nt...@apache.org.
CAY-2418 release notes


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

Branch: refs/heads/master
Commit: e1b6b63722b81d46968add4b2822369750cacc6d
Parents: 3a337d5
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 11 14:50:04 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 11 14:50:04 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1b6b637/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index ade19f2..440b028 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -48,6 +48,7 @@ CAY-2397 Modeler: Unable to set enum:value as Entity qualifier
 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-2419 Modeler: Not changing highlight on selecting search results within one entity
 CAY-2420 Modeler: search is not performed for Stored Procedures
 


[2/3] cayenne git commit: Merge PR #285

Posted by nt...@apache.org.
Merge PR #285


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

Branch: refs/heads/master
Commit: 3a337d5d86490bf314927ad00e27e7ff08bba48b
Parents: 9dce81b f9b6126
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 11 14:48:20 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 11 14:48:20 2018 +0300

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