You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/12/11 13:21:39 UTC
[1/2] cayenne git commit: Fix overlaying of the search results
Repository: cayenne
Updated Branches:
refs/heads/master 60ed69053 -> b8ddcdafa
Fix overlaying of the search results
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/80c848c2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/80c848c2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/80c848c2
Branch: refs/heads/master
Commit: 80c848c205ec0f18b9f4fa7bcf5a85b19d5edd1d
Parents: 1ab1caa
Author: Savva Kolbachev <s....@gmail.com>
Authored: Wed Dec 10 18:24:01 2014 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Wed Dec 10 18:34:39 2014 +0300
----------------------------------------------------------------------
.../cayenne/modeler/dialog/FindDialog.java | 104 +++++++++++--------
1 file changed, 63 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/80c848c2/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
index ac30235..b5d5b83 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
@@ -18,24 +18,6 @@
****************************************************************/
package org.apache.cayenne.modeler.dialog;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.tree.TreePath;
-
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.Attribute;
import org.apache.cayenne.map.DataMap;
@@ -52,6 +34,7 @@ import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectTreeModel;
+import org.apache.cayenne.modeler.ProjectTreeView;
import org.apache.cayenne.modeler.editor.EditorView;
import org.apache.cayenne.modeler.event.AttributeDisplayEvent;
import org.apache.cayenne.modeler.event.EmbeddableAttributeDisplayEvent;
@@ -64,6 +47,23 @@ import org.apache.cayenne.query.AbstractQuery;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.Query;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.tree.TreePath;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* An instance of this class is responsible for displaying search results and navigating
* to the selected entity's representation.
@@ -204,11 +204,17 @@ public class FindDialog extends CayenneController {
o[0] = domain;
o[1] = ((Entity) path).getDataMap();
o[2] = (Entity) path;
+
+ TreePath treePath = buildTreePath(o, editor);
+ ProjectTreeView projectTreeView = editor.getProjectTreeView();
+ if (!projectTreeView.isExpanded(treePath.getParentPath())) {
+ projectTreeView.expandPath(treePath.getParentPath());
+ }
+
/** Make selection in a project tree, open correspondent entity tab */
- editor.getProjectTreeView().getSelectionModel().setSelectionPath(
- buildTreePath(o, editor));
+ projectTreeView.getSelectionModel().setSelectionPath(treePath);
EntityDisplayEvent event = new EntityDisplayEvent(
- editor.getProjectTreeView(),
+ projectTreeView,
(Entity) path,
((Entity) path).getDataMap(),
domain);
@@ -235,11 +241,16 @@ public class FindDialog extends CayenneController {
o[1] = dmForQuery;
o[2] = (Query) path;
+ TreePath treePath = buildTreePath(o, editor);
+ ProjectTreeView projectTreeView = editor.getProjectTreeView();
+ if (!projectTreeView.isExpanded(treePath.getParentPath())) {
+ projectTreeView.expandPath(treePath.getParentPath());
+ }
+
/** Make selection in a project tree, open correspondent entity tab */
- editor.getProjectTreeView().getSelectionModel().setSelectionPath(
- buildTreePath(o, editor));
+ editor.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
QueryDisplayEvent event = new QueryDisplayEvent(
- editor.getProjectTreeView(),
+ projectTreeView,
(Query) path,
(DataMap) dmForQuery,
domain);
@@ -254,11 +265,15 @@ public class FindDialog extends CayenneController {
o[1] = ((Embeddable) path).getDataMap();
o[2] = (Embeddable) path;
+ TreePath treePath = buildTreePath(o, editor);
+ ProjectTreeView projectTreeView = editor.getProjectTreeView();
+ if (!projectTreeView.isExpanded(treePath.getParentPath())) {
+ projectTreeView.expandPath(treePath.getParentPath());
+ }
+
/** Make selection in a project tree, open correspondent entity tab */
- editor.getProjectTreeView().getSelectionModel().setSelectionPath(
- buildTreePath(o, editor));
- EmbeddableDisplayEvent event = new EmbeddableDisplayEvent(editor
- .getProjectTreeView(), (Embeddable) path, ((Embeddable) path)
+ editor.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
+ EmbeddableDisplayEvent event = new EmbeddableDisplayEvent(projectTreeView, (Embeddable) path, ((Embeddable) path)
.getDataMap(), domain);
event.setMainTabFocus(true);
@@ -273,11 +288,16 @@ public class FindDialog extends CayenneController {
o[1] = ((EmbeddableAttribute) path).getEmbeddable().getDataMap();
o[2] = ((EmbeddableAttribute) path).getEmbeddable();
- editor.getProjectTreeView().getSelectionModel().setSelectionPath(
- buildTreePath(o, editor));
+ TreePath treePath = buildTreePath(o, editor);
+ ProjectTreeView projectTreeView = editor.getProjectTreeView();
+ if (!projectTreeView.isExpanded(treePath.getParentPath())) {
+ projectTreeView.expandPath(treePath.getParentPath());
+ }
+
+ editor.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
EmbeddableAttributeDisplayEvent event = new EmbeddableAttributeDisplayEvent(
- editor.getProjectTreeView(),
+ projectTreeView,
((EmbeddableAttribute) path).getEmbeddable(),
(EmbeddableAttribute) path,
((EmbeddableAttribute) path).getEmbeddable().getDataMap(),
@@ -300,28 +320,31 @@ public class FindDialog extends CayenneController {
o[1] = ((Relationship) path).getSourceEntity().getDataMap();
o[2] = ((Relationship) path).getSourceEntity();
}
- editor.getProjectTreeView().getSelectionModel().setSelectionPath(
- buildTreePath(o, editor));
+
+ TreePath treePath = buildTreePath(o, editor);
+ ProjectTreeView projectTreeView = editor.getProjectTreeView();
+ if (!projectTreeView.isExpanded(treePath.getParentPath())) {
+ projectTreeView.expandPath(treePath.getParentPath());
+ }
+
+ projectTreeView.getSelectionModel().setSelectionPath(treePath);
if (path instanceof DbAttribute) {
- AttributeDisplayEvent event = new AttributeDisplayEvent(editor
- .getProjectTreeView(), (Attribute) path, ((Attribute) path)
+ AttributeDisplayEvent event = new AttributeDisplayEvent(projectTreeView, (Attribute) path, ((Attribute) path)
.getEntity(), ((Attribute) path).getEntity().getDataMap(), domain);
event.setMainTabFocus(true);
editor.getDbDetailView().currentDbAttributeChanged(event);
}
if (path instanceof ObjAttribute) {
- AttributeDisplayEvent event = new AttributeDisplayEvent(editor
- .getProjectTreeView(), (Attribute) path, ((Attribute) path)
+ AttributeDisplayEvent event = new AttributeDisplayEvent(projectTreeView, (Attribute) path, ((Attribute) path)
.getEntity(), ((Attribute) path).getEntity().getDataMap(), domain);
event.setMainTabFocus(true);
editor.getObjDetailView().currentObjAttributeChanged(event);
}
if (path instanceof DbRelationship) {
- RelationshipDisplayEvent event = new RelationshipDisplayEvent(editor
- .getProjectTreeView(), (Relationship) path, ((Relationship) path)
+ RelationshipDisplayEvent event = new RelationshipDisplayEvent(projectTreeView, (Relationship) path, ((Relationship) path)
.getSourceEntity(), ((Relationship) path)
.getSourceEntity()
.getDataMap(), domain);
@@ -329,8 +352,7 @@ public class FindDialog extends CayenneController {
editor.getDbDetailView().currentDbRelationshipChanged(event);
}
if (path instanceof ObjRelationship) {
- RelationshipDisplayEvent event = new RelationshipDisplayEvent(editor
- .getProjectTreeView(), (Relationship) path, ((Relationship) path)
+ RelationshipDisplayEvent event = new RelationshipDisplayEvent(projectTreeView, (Relationship) path, ((Relationship) path)
.getSourceEntity(), ((Relationship) path)
.getSourceEntity()
.getDataMap(), domain);
[2/2] cayenne git commit: Merge branch '48'
Posted by aa...@apache.org.
Merge branch '48'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b8ddcdaf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b8ddcdaf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b8ddcdaf
Branch: refs/heads/master
Commit: b8ddcdafaf891e892bf7c014aaebaab01d9124c6
Parents: 60ed690 80c848c
Author: aadamchik <aa...@apache.org>
Authored: Thu Dec 11 15:19:56 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Thu Dec 11 15:19:56 2014 +0300
----------------------------------------------------------------------
.../cayenne/modeler/dialog/FindDialog.java | 104 +++++++++++--------
1 file changed, 63 insertions(+), 41 deletions(-)
----------------------------------------------------------------------