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/02/07 12:18:09 UTC
[1/3] cayenne git commit: Brain methods of classes BaseGraphBuilder
and ProjectTreeView automatically refactored with Bandago
Repository: cayenne
Updated Branches:
refs/heads/master 383cfb0d0 -> c11adead8
Brain methods of classes BaseGraphBuilder and ProjectTreeView
automatically refactored with Bandago
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/221bed68
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/221bed68
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/221bed68
Branch: refs/heads/master
Commit: 221bed687134243da14e220daa8df3686bdb183d
Parents: 750d3d5
Author: Santiago Vidal <sa...@192.168.0.104>
Authored: Mon Feb 5 10:33:49 2018 -0300
Committer: Santiago Vidal <sa...@192.168.0.104>
Committed: Mon Feb 5 10:33:49 2018 -0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/ProjectTreeView.java | 76 +++++++++--------
.../cayenne/modeler/graph/BaseGraphBuilder.java | 90 +++++++++++---------
2 files changed, 94 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/221bed68/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index 9e38d81..fc1a938 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -148,7 +148,44 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
}
private void initController() {
- treeSelectionListener = new TreeSelectionListener() {
+ initTreeSelectionListener();
+
+ treeWillExpandListener = new TreeWillExpandListener() {
+ @Override
+ public void treeWillExpand(TreeExpansionEvent e) throws ExpandVetoException {
+ TreePath path = e.getPath();
+ if (!isPathSelected(path) && !isSelectionEmpty()) {
+ setSelectionPath(path);
+ }
+ }
+
+ @Override
+ public void treeWillCollapse(TreeExpansionEvent e) throws ExpandVetoException {
+ TreePath path = e.getPath();
+ if (!isPathSelected(path) && !isSelectionEmpty()) {
+ setSelectionPath(path);
+ }
+ }
+ };
+
+ addTreeSelectionListener(treeSelectionListener);
+ addTreeWillExpandListener(treeWillExpandListener);
+
+ addMouseListener(new MouseClickHandler());
+
+ setupMediator();
+ mediator.addQueryListener(this);
+ mediator.addQueryDisplayListener(this);
+ mediator.addMultipleObjectsDisplayListener(this);
+
+ mediator.getApplication().getActionManager().setupCutCopyPaste(
+ this,
+ CutAction.class,
+ CopyAction.class);
+ }
+
+ private void initTreeSelectionListener() {
+ treeSelectionListener = new TreeSelectionListener() {
public void valueChanged(TreeSelectionEvent e) {
TreePath[] paths = getSelectionPaths();
@@ -193,31 +230,10 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
return projectPath;
}
};
+ }
- treeWillExpandListener = new TreeWillExpandListener() {
- @Override
- public void treeWillExpand(TreeExpansionEvent e) throws ExpandVetoException {
- TreePath path = e.getPath();
- if (!isPathSelected(path) && !isSelectionEmpty()) {
- setSelectionPath(path);
- }
- }
-
- @Override
- public void treeWillCollapse(TreeExpansionEvent e) throws ExpandVetoException {
- TreePath path = e.getPath();
- if (!isPathSelected(path) && !isSelectionEmpty()) {
- setSelectionPath(path);
- }
- }
- };
-
- addTreeSelectionListener(treeSelectionListener);
- addTreeWillExpandListener(treeWillExpandListener);
-
- addMouseListener(new MouseClickHandler());
-
- mediator.addDomainListener(this);
+ private void setupMediator() {
+ mediator.addDomainListener(this);
mediator.addDomainDisplayListener(this);
mediator.addDataNodeListener(this);
mediator.addDataNodeDisplayListener(this);
@@ -231,15 +247,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
mediator.addEmbeddableListener(this);
mediator.addProcedureListener(this);
mediator.addProcedureDisplayListener(this);
- mediator.addQueryListener(this);
- mediator.addQueryDisplayListener(this);
- mediator.addMultipleObjectsDisplayListener(this);
-
- mediator.getApplication().getActionManager().setupCutCopyPaste(
- this,
- CutAction.class,
- CopyAction.class);
- }
+ }
private void initFromModel(Project project) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/221bed68/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
index 6f3b94a..c649a47 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
@@ -131,31 +131,9 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
GraphLayoutCache view = new GraphLayoutCache(model, new DefaultCellViewFactory());
graph.setGraphLayoutCache(view);
- graph.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseReleased(MouseEvent e) {
- if (e.isPopupTrigger()) {
- Object selected = graph.getSelectionCell();
- if (selected != null && selected instanceof DefaultGraphCell) {
- Object userObject = ((DefaultGraphCell) selected).getUserObject();
- if (userObject instanceof EntityCellMetadata) {
- showPopup(e.getPoint(), ((EntityCellMetadata) userObject).fetchEntity());
- }
- }
- }
- }
- });
+
- graph.addMouseWheelListener(new MouseWheelListener() {
- @Override
- public void mouseWheelMoved(MouseWheelEvent e) {
- // limit scale
- double scale = graph.getScale() / Math.pow(ZOOM_FACTOR, e.getWheelRotation());
- scale = Math.max(scale, 0.1);
- scale = Math.min(scale, 3);
- graph.setScale(scale);
- }
- });
+ addMouseListeners();
entityCells = new HashMap<>();
createdObjects = new ArrayList<>();
@@ -198,7 +176,24 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
}
view.insert(createdObjects.toArray());
- if (doLayout) {
+ setLayout(doLayout);
+
+ /*
+ * Adding isolated objects
+ *
+ * We're placing them so that they will take maximum space in left top
+ * corner. The sample order is below:
+ *
+ * 1 2 6 7... 3 5 8 ... 4 9... 10 ...
+ */
+ addIsolatedObjetcs(isolatedObjects);
+
+ view.insert(isolatedObjects.toArray());
+ graph.getModel().addUndoableEditListener(this);
+ }
+
+ private void setLayout(boolean doLayout) {
+ if (doLayout) {
JGraphFacade facade = new JGraphFacade(graph);
JGraphOrganicLayout layout = new JGraphOrganicLayout();
@@ -221,16 +216,38 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
// Apply the results to the actual graph
edit(nested);
}
+ }
- /*
- * Adding isolated objects
- *
- * We're placing them so that they will take maximum space in left top
- * corner. The sample order is below:
- *
- * 1 2 6 7... 3 5 8 ... 4 9... 10 ...
- */
- if (isolatedObjects.size() > 0) {
+ private void addMouseListeners() {
+ graph.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ if (e.isPopupTrigger()) {
+ Object selected = graph.getSelectionCell();
+ if (selected != null && selected instanceof DefaultGraphCell) {
+ Object userObject = ((DefaultGraphCell) selected).getUserObject();
+ if (userObject instanceof EntityCellMetadata) {
+ showPopup(e.getPoint(), ((EntityCellMetadata) userObject).fetchEntity());
+ }
+ }
+ }
+ }
+ });
+
+ graph.addMouseWheelListener(new MouseWheelListener() {
+ @Override
+ public void mouseWheelMoved(MouseWheelEvent e) {
+ // limit scale
+ double scale = graph.getScale() / Math.pow(ZOOM_FACTOR, e.getWheelRotation());
+ scale = Math.max(scale, 0.1);
+ scale = Math.min(scale, 3);
+ graph.setScale(scale);
+ }
+ });
+ }
+
+ private void addIsolatedObjetcs(List<DefaultGraphCell> isolatedObjects) {
+ if (isolatedObjects.size() > 0) {
int n = isolatedObjects.size() / 2; // number of isolated entities
int x = (int) Math.ceil((Math.sqrt(1 + 8 * n) - 1) / 2); // side of
// triangle
@@ -256,10 +273,7 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
row++;
}
}
-
- view.insert(isolatedObjects.toArray());
- graph.getModel().addUndoableEditListener(this);
- }
+ }
protected DefaultGraphCell createEntityCell(Entity entity) {
DefaultGraphCell cell = new DefaultGraphCell(getCellMetadata(entity));
[2/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/266' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/266' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e8cae770
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e8cae770
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e8cae770
Branch: refs/heads/master
Commit: e8cae770ed781c96bb949737a805b84e29bf1536
Parents: 383cfb0 221bed6
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Feb 7 14:55:42 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Feb 7 14:55:42 2018 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/ProjectTreeView.java | 76 +++++++++--------
.../cayenne/modeler/graph/BaseGraphBuilder.java | 90 +++++++++++---------
2 files changed, 94 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
[3/3] cayenne git commit: Code cleanup
Posted by nt...@apache.org.
Code cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c11adead
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c11adead
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c11adead
Branch: refs/heads/master
Commit: c11adead8319b8fb62e4bafcc24284913144041d
Parents: e8cae77
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Feb 7 15:13:07 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Feb 7 15:13:07 2018 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/ProjectTreeView.java | 80 ++++++++++----------
.../cayenne/modeler/graph/BaseGraphBuilder.java | 51 +++----------
2 files changed, 51 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c11adead/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index fc1a938..90ceb58 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -97,7 +97,6 @@ import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.event.TreeWillExpandListener;
import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
@@ -148,40 +147,10 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
}
private void initController() {
- initTreeSelectionListener();
-
- treeWillExpandListener = new TreeWillExpandListener() {
- @Override
- public void treeWillExpand(TreeExpansionEvent e) throws ExpandVetoException {
- TreePath path = e.getPath();
- if (!isPathSelected(path) && !isSelectionEmpty()) {
- setSelectionPath(path);
- }
- }
-
- @Override
- public void treeWillCollapse(TreeExpansionEvent e) throws ExpandVetoException {
- TreePath path = e.getPath();
- if (!isPathSelected(path) && !isSelectionEmpty()) {
- setSelectionPath(path);
- }
- }
- };
-
- addTreeSelectionListener(treeSelectionListener);
- addTreeWillExpandListener(treeWillExpandListener);
-
+ initTreeSelectionListener();
+ initTreeExpandListener();
addMouseListener(new MouseClickHandler());
-
setupMediator();
- mediator.addQueryListener(this);
- mediator.addQueryDisplayListener(this);
- mediator.addMultipleObjectsDisplayListener(this);
-
- mediator.getApplication().getActionManager().setupCutCopyPaste(
- this,
- CutAction.class,
- CopyAction.class);
}
private void initTreeSelectionListener() {
@@ -224,14 +193,37 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
*/
private ConfigurationNode createProjectPath(TreePath treePath) {
Object[] path = treePath.getPath();
- ConfigurationNode projectPath = (ConfigurationNode) ((DefaultMutableTreeNode) path[path.length - 1])
- .getUserObject();
-
- return projectPath;
+ DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)path[path.length - 1];
+ return (ConfigurationNode) treeNode.getUserObject();
}
};
+
+ addTreeSelectionListener(treeSelectionListener);
}
+ private void initTreeExpandListener() {
+ treeWillExpandListener = new TreeWillExpandListener() {
+ @Override
+ public void treeWillExpand(TreeExpansionEvent e) {
+ TreePath path = e.getPath();
+ if (!isPathSelected(path) && !isSelectionEmpty()) {
+ setSelectionPath(path);
+ }
+ }
+
+ @Override
+ public void treeWillCollapse(TreeExpansionEvent e) {
+ TreePath path = e.getPath();
+ if (!isPathSelected(path) && !isSelectionEmpty()) {
+ setSelectionPath(path);
+ }
+ }
+ };
+
+
+ addTreeWillExpandListener(treeWillExpandListener);
+ }
+
private void setupMediator() {
mediator.addDomainListener(this);
mediator.addDomainDisplayListener(this);
@@ -247,6 +239,13 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
mediator.addEmbeddableListener(this);
mediator.addProcedureListener(this);
mediator.addProcedureDisplayListener(this);
+ mediator.addQueryListener(this);
+ mediator.addQueryDisplayListener(this);
+ mediator.addMultipleObjectsDisplayListener(this);
+ mediator.getApplication().getActionManager().setupCutCopyPaste(
+ this,
+ CutAction.class,
+ CopyAction.class);
}
private void initFromModel(Project project) {
@@ -302,8 +301,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
return (value != null) ? String.valueOf(PropertyUtils.getProperty(value, "name")) : "";
} catch (Exception e) {
- String objectClass = (value == null) ? "(unknown)" : value.getClass().getName();
- logObj.warn("Exception reading property 'name', class " + objectClass, e);
+ logObj.warn("Exception reading property 'name', class " + value.getClass().getName(), e);
return "";
}
}
@@ -430,7 +428,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
public void procedureChanged(ProcedureEvent e) {
if (e.isNameChange()) {
Object[] path = new Object[] {
- (DataChannelDescriptor) mediator.getProject().getRootNode(),
+ mediator.getProject().getRootNode(),
e.getProcedure().getDataMap(), e.getProcedure()
};
@@ -443,7 +441,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
public void procedureRemoved(ProcedureEvent e) {
removeNode(new Object[] {
- (DataChannelDescriptor) mediator.getProject().getRootNode(),
+ mediator.getProject().getRootNode(),
e.getProcedure().getDataMap(), e.getProcedure()
});
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c11adead/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
index c649a47..b11ac64 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
@@ -24,8 +24,6 @@ import java.awt.Font;
import java.awt.Point;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
@@ -131,8 +129,6 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
GraphLayoutCache view = new GraphLayoutCache(model, new DefaultCellViewFactory());
graph.setGraphLayoutCache(view);
-
-
addMouseListeners();
entityCells = new HashMap<>();
@@ -186,7 +182,7 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
*
* 1 2 6 7... 3 5 8 ... 4 9... 10 ...
*/
- addIsolatedObjetcs(isolatedObjects);
+ addIsolatedObjects(isolatedObjects);
view.insert(isolatedObjects.toArray());
graph.getModel().addUndoableEditListener(this);
@@ -234,19 +230,16 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
}
});
- graph.addMouseWheelListener(new MouseWheelListener() {
- @Override
- public void mouseWheelMoved(MouseWheelEvent e) {
- // limit scale
- double scale = graph.getScale() / Math.pow(ZOOM_FACTOR, e.getWheelRotation());
- scale = Math.max(scale, 0.1);
- scale = Math.min(scale, 3);
- graph.setScale(scale);
- }
+ graph.addMouseWheelListener(e -> {
+ // limit scale
+ double scale = graph.getScale() / Math.pow(ZOOM_FACTOR, e.getWheelRotation());
+ scale = Math.max(scale, 0.1);
+ scale = Math.min(scale, 3);
+ graph.setScale(scale);
});
}
- private void addIsolatedObjetcs(List<DefaultGraphCell> isolatedObjects) {
+ private void addIsolatedObjects(List<DefaultGraphCell> isolatedObjects) {
if (isolatedObjects.size() > 0) {
int n = isolatedObjects.size() / 2; // number of isolated entities
int x = (int) Math.ceil((Math.sqrt(1 + 8 * n) - 1) / 2); // side of
@@ -413,12 +406,7 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
protected void removeEntityCell(Entity e) {
final DefaultGraphCell cell = entityCells.get(e.getName());
if (cell != null) {
- runWithUndoDisabled(new Runnable() {
- @Override
- public void run() {
- graph.getGraphLayoutCache().remove(new Object[] { cell }, true, true);
- }
- });
+ runWithUndoDisabled(() -> graph.getGraphLayoutCache().remove(new Object[] { cell }, true, true));
entityCells.remove(e.getName());
}
}
@@ -426,12 +414,7 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
protected void removeRelationshipCell(Relationship rel) {
final DefaultEdge edge = relCells.get(getQualifiedName(rel));
if (edge != null) {
- runWithUndoDisabled(new Runnable() {
- @Override
- public void run() {
- graph.getGraphLayoutCache().remove(new Object[] { edge });
- }
- });
+ runWithUndoDisabled(() -> graph.getGraphLayoutCache().remove(new Object[] { edge }));
relCells.remove(getQualifiedName(rel));
}
}
@@ -593,21 +576,11 @@ abstract class BaseGraphBuilder implements GraphBuilder, DataMapListener {
}
private void edit(final Map map) {
- runWithUndoDisabled(new Runnable() {
-
- public void run() {
- graph.getGraphLayoutCache().edit(map);
- }
- });
+ runWithUndoDisabled(() -> graph.getGraphLayoutCache().edit(map));
}
private void insert(final Object cell) {
- runWithUndoDisabled(new Runnable() {
-
- public void run() {
- graph.getGraphLayoutCache().insert(cell);
- }
- });
+ runWithUndoDisabled(() -> graph.getGraphLayoutCache().insert(cell));
}
private void runWithUndoDisabled(Runnable r) {