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 2017/12/07 13:07:07 UTC
[1/7] cayenne git commit: CAY-2385 CAY-2386 Fixed visualization
issues after an undo action for deleted DbRelationship and DbAttribute
Repository: cayenne
Updated Branches:
refs/heads/master ab6ec9eed -> e0b9ebecc
CAY-2385 CAY-2386 Fixed visualization issues after an undo action for deleted DbRelationship and DbAttribute
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2d0daeea
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2d0daeea
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2d0daeea
Branch: refs/heads/master
Commit: 2d0daeeaf9c4d60b59d6a309a4f2462cb5f084ed
Parents: c2200fc
Author: Emerson Castaneda <em...@users.noreply.github.com>
Authored: Fri Dec 1 22:39:10 2017 -0500
Committer: Emerson Castaneda <em...@users.noreply.github.com>
Committed: Tue Dec 5 22:38:53 2017 -0500
----------------------------------------------------------------------
.../action/ObjEntityCounterpartAction.java | 58 ++++++++++++++++++++
.../undo/RemoveAttributeUndoableEdit.java | 9 ++-
.../undo/RemoveRelationshipUndoableEdit.java | 11 +++-
3 files changed, 73 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2d0daeea/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
index 7126a0a..3feef17 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
@@ -19,8 +19,16 @@
package org.apache.cayenne.modeler.action;
+import javax.swing.tree.TreePath;
+
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.CayenneModelerFrame;
+import org.apache.cayenne.modeler.ProjectTreeModel;
+import org.apache.cayenne.modeler.editor.EditorView;
+import org.apache.cayenne.modeler.event.EntityDisplayEvent;
public class ObjEntityCounterpartAction extends BaseViewEntityAction {
@@ -40,4 +48,54 @@ public class ObjEntityCounterpartAction extends BaseViewEntityAction {
protected Entity getEntity() {
return objEntity.getDbEntity();
}
+
+ public void viewCounterpartObject(DbEntity entity) {
+ TreePath path = buildTreePath(entity);
+ editor().getProjectTreeView().getSelectionModel().setSelectionPath(path);
+
+ EntityDisplayEvent event = new EntityDisplayEvent(
+ editor().getProjectTreeView(),
+ entity,
+ entity.getDataMap(),
+ (DataChannelDescriptor) getProjectController().getProject().getRootNode());
+ getProjectController().fireDbEntityDisplayEvent(event);
+ }
+
+ public static EditorView editor() {
+ return ((CayenneModelerFrame) Application
+ .getInstance()
+ .getFrameController()
+ .getView()).getView();
+ }
+
+ /**
+ * Builds a tree path for a given entity. Urgent for later selection.
+ *
+ * @param entity to build path for
+ * @return tree path
+ */
+ public static TreePath buildTreePath(Entity entity) {
+ DataChannelDescriptor domain = (DataChannelDescriptor) Application
+ .getInstance()
+ .getProject()
+ .getRootNode();
+
+ Object[] path = new Object[] {domain, entity.getDataMap(), entity};
+
+ Object[] mutableTreeNodes = new Object[path.length];
+ mutableTreeNodes[0] = ((ProjectTreeModel) editor().getProjectTreeView().getModel())
+ .getRootNode();
+
+ Object[] helper;
+ for (int i = 1; i < path.length; i++) {
+ helper = new Object[i];
+ for (int j = 0; j < i;) {
+ helper[j] = path[++j];
+ }
+ mutableTreeNodes[i] = ((ProjectTreeModel) editor()
+ .getProjectTreeView()
+ .getModel()).getNodeForObjectPath(helper);
+ }
+ return new TreePath(mutableTreeNodes);
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2d0daeea/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
index 5db0c52..5fd13d9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.action.CreateAttributeAction;
import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
+import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
import org.apache.cayenne.modeler.action.RemoveAttributeAction;
import org.apache.cayenne.modeler.event.EmbeddableDisplayEvent;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
@@ -122,6 +123,7 @@ public class RemoveAttributeUndoableEdit extends CayenneUndoableEdit {
for (DbAttribute attr : dbAttributes) {
action.createDbAttribute(dataMap, dbEntity, attr);
}
+ focusDBEntity(dbEntity);
}
if (embeddable != null) {
@@ -133,8 +135,11 @@ public class RemoveAttributeUndoableEdit extends CayenneUndoableEdit {
}
private void focusObjEntity(ObjEntity objEntity){
- actionManager.getAction(DbEntityCounterpartAction.class)
- .viewCounterpartEntity(objEntity);
+ actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
+ }
+
+ private void focusDBEntity(DbEntity dbEntity){
+ actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
}
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2d0daeea/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
index d915f0b..afe9320 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.modeler.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
+import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
import org.apache.cayenne.modeler.action.RemoveRelationshipAction;
public class RemoveRelationshipUndoableEdit extends CayenneUndoableEdit {
@@ -85,11 +86,15 @@ public class RemoveRelationshipUndoableEdit extends CayenneUndoableEdit {
for (DbRelationship dr : dbRels) {
action.createDbRelationship(dbEntity, dr);
}
+ focusDBEntity(dbEntity);
}
}
-
+
private void focusObjEntity(ObjEntity objEntity){
- actionManager.getAction(DbEntityCounterpartAction.class)
- .viewCounterpartEntity(objEntity);
+ actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
+ }
+
+ private void focusDBEntity(DbEntity dbEntity){
+ actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
}
}
[7/7] cayenne git commit: CAY-2388 unify Obj and DbEntity actions
Posted by nt...@apache.org.
CAY-2388 unify Obj and DbEntity actions
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e0b9ebec
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e0b9ebec
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e0b9ebec
Branch: refs/heads/master
Commit: e0b9ebecc873a17baccba9f0e850dfdaddbdbfec
Parents: c98ec81
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Dec 7 16:05:13 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Dec 7 16:05:13 2017 +0300
----------------------------------------------------------------------
.../modeler/action/BaseViewEntityAction.java | 41 +++++++----------
.../action/DbEntityCounterpartAction.java | 47 ++++----------------
.../action/ObjEntityCounterpartAction.java | 22 +++------
.../action/ObjEntityToSuperEntityAction.java | 7 ++-
.../undo/BaseRemovePropertyUndoableEdit.java | 5 +--
5 files changed, 38 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e0b9ebec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/BaseViewEntityAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/BaseViewEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/BaseViewEntityAction.java
index be4f26b..091c6dc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/BaseViewEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/BaseViewEntityAction.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
@@ -34,9 +33,7 @@ import java.awt.event.ActionEvent;
/**
* @since 4.0
*/
-public abstract class BaseViewEntityAction extends CayenneAction{
-
- protected ObjEntity objEntity;
+public abstract class BaseViewEntityAction extends CayenneAction {
abstract protected Entity getEntity();
@@ -53,31 +50,25 @@ public abstract class BaseViewEntityAction extends CayenneAction{
}
protected void viewEntity() {
- ProjectController mediator = getProjectController();
-
- objEntity = mediator.getCurrentObjEntity();
-
- if (objEntity == null) {
- return;
- }
-
Entity entity = getEntity();
-
if(entity != null) {
- TreePath path = DbEntityCounterpartAction.buildTreePath(entity);
- DbEntityCounterpartAction.editor().getProjectTreeView().getSelectionModel().setSelectionPath(path);
+ navigateToEntity(entity);
+ }
+ }
- EntityDisplayEvent event = new EntityDisplayEvent(
- DbEntityCounterpartAction.editor().getProjectTreeView(),
- entity,
- entity.getDataMap(),
- (DataChannelDescriptor) getProjectController().getProject().getRootNode());
+ public void navigateToEntity(Entity entity) {
+ TreePath path = buildTreePath(entity);
+ editor().getProjectTreeView().getSelectionModel().setSelectionPath(path);
- if (entity instanceof DbEntity) {
- mediator.fireDbEntityDisplayEvent(event);
- } else if (entity instanceof ObjEntity){
- mediator.fireObjEntityDisplayEvent(event);
- }
+ EntityDisplayEvent event = new EntityDisplayEvent(
+ editor().getProjectTreeView(),
+ entity,
+ entity.getDataMap(),
+ (DataChannelDescriptor) getProjectController().getProject().getRootNode());
+ if (entity instanceof DbEntity) {
+ getProjectController().fireDbEntityDisplayEvent(event);
+ } else if (entity instanceof ObjEntity){
+ getProjectController().fireObjEntityDisplayEvent(event);
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e0b9ebec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
index adb586b..700b951 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
@@ -19,20 +19,14 @@
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
import java.util.Iterator;
-import javax.swing.tree.TreePath;
-
-import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.event.EntityDisplayEvent;
-import org.apache.cayenne.modeler.util.CayenneAction;
-public class DbEntityCounterpartAction extends CayenneAction {
+public class DbEntityCounterpartAction extends BaseViewEntityAction {
public static String getActionName() {
return "View related ObjEntity";
@@ -46,42 +40,19 @@ public class DbEntityCounterpartAction extends CayenneAction {
return "icon-move_up.png";
}
- /**
- * @see org.apache.cayenne.modeler.util.CayenneAction#performAction(ActionEvent)
- */
- public void performAction(ActionEvent e) {
- viewCounterpartEntity();
- }
-
- protected void viewCounterpartEntity() {
- ProjectController mediator = getProjectController();
-
- DbEntity dbEntity = mediator.getCurrentDbEntity();
-
+ @Override
+ protected Entity getEntity() {
+ DbEntity dbEntity = getProjectController().getCurrentDbEntity();
if (dbEntity == null) {
- return;
+ return null;
}
-
+
Iterator<ObjEntity> it = dbEntity.getDataMap().getMappedEntities(dbEntity).iterator();
if (!it.hasNext()) {
- return;
+ return null;
}
- ObjEntity entity = it.next();
- viewCounterpartEntity(entity);
+ return it.next();
}
- public void viewCounterpartEntity(ObjEntity entity) {
- TreePath path = buildTreePath(entity);
- editor().getProjectTreeView().getSelectionModel().setSelectionPath(path);
-
- EntityDisplayEvent event = new EntityDisplayEvent(
- editor().getProjectTreeView(),
- entity,
- entity.getDataMap(),
- (DataChannelDescriptor) getProjectController().getProject().getRootNode());
- getProjectController().fireObjEntityDisplayEvent(event);
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e0b9ebec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
index ec04a22..615ff93 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
@@ -19,13 +19,9 @@
package org.apache.cayenne.modeler.action;
-import javax.swing.tree.TreePath;
-
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.event.EntityDisplayEvent;
public class ObjEntityCounterpartAction extends BaseViewEntityAction {
@@ -43,19 +39,11 @@ public class ObjEntityCounterpartAction extends BaseViewEntityAction {
@Override
protected Entity getEntity() {
+ ObjEntity objEntity = getProjectController().getCurrentObjEntity();
+ if (objEntity == null) {
+ return null;
+ }
return objEntity.getDbEntity();
}
- public void viewCounterpartObject(DbEntity entity) {
- TreePath path = buildTreePath(entity);
- editor().getProjectTreeView().getSelectionModel().setSelectionPath(path);
-
- EntityDisplayEvent event = new EntityDisplayEvent(
- editor().getProjectTreeView(),
- entity,
- entity.getDataMap(),
- (DataChannelDescriptor) getProjectController().getProject().getRootNode());
- getProjectController().fireDbEntityDisplayEvent(event);
- }
-
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e0b9ebec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityToSuperEntityAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityToSuperEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityToSuperEntityAction.java
index eb0b839..16550ee 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityToSuperEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityToSuperEntityAction.java
@@ -20,6 +20,7 @@
package org.apache.cayenne.modeler.action;
import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
/**
@@ -37,6 +38,10 @@ public class ObjEntityToSuperEntityAction extends BaseViewEntityAction {
@Override
protected Entity getEntity() {
- return super.objEntity.getSuperEntity();
+ ObjEntity objEntity = getProjectController().getCurrentObjEntity();
+ if (objEntity == null) {
+ return null;
+ }
+ return objEntity.getSuperEntity();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e0b9ebec/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
index 69fc0a2..30a9270 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
@@ -23,7 +23,6 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
import org.apache.cayenne.modeler.event.EmbeddableDisplayEvent;
@@ -37,11 +36,11 @@ public abstract class BaseRemovePropertyUndoableEdit extends CayenneUndoableEdit
protected Embeddable embeddable;
protected void focusObjEntity(){
- actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
+ actionManager.getAction(ObjEntityCounterpartAction.class).navigateToEntity(objEntity);
}
protected void focusDBEntity(){
- actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
+ actionManager.getAction(ObjEntityCounterpartAction.class).navigateToEntity(dbEntity);
}
protected void focusEmbeddable() {
[5/7] cayenne git commit: CAY-2385 and CAY-2386 cleanup
Posted by nt...@apache.org.
CAY-2385 and CAY-2386
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fe1ee5f7
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fe1ee5f7
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fe1ee5f7
Branch: refs/heads/master
Commit: fe1ee5f7d1d6a542f5795d9e8185dfdb224b13cd
Parents: 2e077dd
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Dec 7 15:42:43 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Dec 7 15:42:43 2017 +0300
----------------------------------------------------------------------
.../cayenne/modeler/action/RemoveAction.java | 8 +-
.../modeler/action/RemoveAttributeAction.java | 33 ++------
.../undo/BaseRemovePropertyUndoableEdit.java | 55 ++++++++++++++
.../modeler/undo/CayenneUndoableEdit.java | 11 ---
.../modeler/undo/DbEntitySyncUndoableEdit.java | 12 +--
.../undo/RemoveAttributeUndoableEdit.java | 80 +++++---------------
.../undo/RemoveRelationshipUndoableEdit.java | 26 +++----
7 files changed, 95 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fe1ee5f7/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
index 5c162b5..ce5228c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
@@ -258,9 +258,7 @@ public class RemoveAction extends CayenneAction {
ObjEntity entity = mediator.getCurrentObjEntity();
application.getUndoManager()
- .addEdit(new RemoveAttributeUndoableEdit(
- (DataChannelDescriptor)mediator.getProject().getRootNode(),
- mediator.getCurrentDataMap(), entity, objAttrs));
+ .addEdit(new RemoveAttributeUndoableEdit(entity, objAttrs));
for (ObjAttribute attrib : objAttrs) {
entity.removeAttribute(attrib.getName());
@@ -281,9 +279,7 @@ public class RemoveAction extends CayenneAction {
DbEntity entity = mediator.getCurrentDbEntity();
application.getUndoManager()
- .addEdit(new RemoveAttributeUndoableEdit(
- (DataChannelDescriptor)mediator.getProject().getRootNode(),
- mediator.getCurrentDataMap(), entity, dbAttrs));
+ .addEdit(new RemoveAttributeUndoableEdit(entity, dbAttrs));
for (DbAttribute attrib : dbAttrs) {
entity.removeAttribute(attrib.getName());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fe1ee5f7/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
index 769b2a0..66cb396 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
@@ -44,12 +44,9 @@ import org.apache.cayenne.modeler.util.ProjectUtil;
/**
* Removes currently selected attribute from either the DbEntity or ObjEntity.
- *
*/
public class RemoveAttributeAction extends RemoveAction implements MultipleObjectsAction {
-
-
private final static String ACTION_NAME = "Remove Attribute";
/**
@@ -75,11 +72,7 @@ public class RemoveAttributeAction extends RemoveAction implements MultipleObjec
*/
@Override
public boolean enableForPath(ConfigurationNode object) {
- if (object == null) {
- return false;
- }
-
- return object instanceof Attribute;
+ return object != null && object instanceof Attribute;
}
@Override
@@ -107,37 +100,25 @@ public class RemoveAttributeAction extends RemoveAction implements MultipleObjec
removeEmbeddableAttributes(embeddable, embAttrs);
}
- }
- else if (objAttrs != null && objAttrs.length > 0) {
+ } else if (objAttrs != null && objAttrs.length > 0) {
if ((objAttrs.length == 1 && dialog.shouldDelete("ObjAttribute", objAttrs[0]
.getName()))
|| (objAttrs.length > 1 && dialog.shouldDelete("selected ObjAttributes"))) {
ObjEntity entity = mediator.getCurrentObjEntity();
- application.getUndoManager().addEdit(
- new RemoveAttributeUndoableEdit(
- (DataChannelDescriptor)mediator.getProject().getRootNode(),
- mediator.getCurrentDataMap(),
- entity,
- objAttrs));
+ application.getUndoManager().addEdit(new RemoveAttributeUndoableEdit(entity, objAttrs));
removeObjAttributes(entity, objAttrs);
}
- }
- else if (dbAttrs != null && dbAttrs.length > 0) {
+ } else if (dbAttrs != null && dbAttrs.length > 0) {
if ((dbAttrs.length == 1 && dialog.shouldDelete("DbAttribute", dbAttrs[0]
.getName()))
|| (dbAttrs.length > 1 && dialog.shouldDelete("selected DbAttributes"))) {
DbEntity entity = mediator.getCurrentDbEntity();
- application.getUndoManager().addEdit(
- new RemoveAttributeUndoableEdit(
- (DataChannelDescriptor)mediator.getProject().getRootNode(),
- mediator.getCurrentDataMap(),
- entity,
- dbAttrs));
+ application.getUndoManager().addEdit(new RemoveAttributeUndoableEdit(entity, dbAttrs));
removeDbAttributes(mediator.getCurrentDataMap(), entity, dbAttrs);
}
@@ -181,9 +162,7 @@ public class RemoveAttributeAction extends RemoveAction implements MultipleObjec
}
}
- public void removeEmbeddableAttributes(
- Embeddable embeddable,
- EmbeddableAttribute[] attrs) {
+ public void removeEmbeddableAttributes(Embeddable embeddable, EmbeddableAttribute[] attrs) {
ProjectController mediator = getProjectController();
for (EmbeddableAttribute attrib : attrs) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fe1ee5f7/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
new file mode 100644
index 0000000..69fc0a2
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
@@ -0,0 +1,55 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.undo;
+
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.Embeddable;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
+import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
+import org.apache.cayenne.modeler.event.EmbeddableDisplayEvent;
+
+/**
+ * @since 4.1
+ */
+public abstract class BaseRemovePropertyUndoableEdit extends CayenneUndoableEdit {
+
+ protected ObjEntity objEntity;
+ protected DbEntity dbEntity;
+ protected Embeddable embeddable;
+
+ protected void focusObjEntity(){
+ actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
+ }
+
+ protected void focusDBEntity(){
+ actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
+ }
+
+ protected void focusEmbeddable() {
+ controller.fireEmbeddableDisplayEvent(new EmbeddableDisplayEvent(
+ this,
+ embeddable,
+ embeddable.getDataMap(),
+ (DataChannelDescriptor) controller.getProject().getRootNode()));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fe1ee5f7/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
index 86baee4..659f236 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
@@ -20,13 +20,9 @@ package org.apache.cayenne.modeler.undo;
import javax.swing.undo.AbstractUndoableEdit;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.action.ActionManager;
-import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
-import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
public abstract class CayenneUndoableEdit extends AbstractUndoableEdit {
@@ -47,12 +43,5 @@ public abstract class CayenneUndoableEdit extends AbstractUndoableEdit {
public boolean canUndo() {
return true;
}
-
- protected void focusObjEntity(ObjEntity objEntity){
- actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
- }
- protected void focusDBEntity(DbEntity dbEntity){
- actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fe1ee5f7/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
index 20e1749..9d8d258 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
@@ -60,9 +60,7 @@ public class DbEntitySyncUndoableEdit extends CompoundEdit {
}
public void objRelationshipAdded(ObjRelationship rel) {
- addEdit(new CreateRelationshipUndoableEdit(entity, new ObjRelationship[] {
- rel
- }));
+ addEdit(new CreateRelationshipUndoableEdit(entity, new ObjRelationship[] {rel}));
}
public void objAttributeAdded(ObjAttribute attr) {
@@ -86,13 +84,7 @@ public class DbEntitySyncUndoableEdit extends CompoundEdit {
for (DbAttribute da : dbAttrs) {
ObjAttribute oa = entity.getAttributeForDbAttribute(da);
if (oa != null) {
- addEdit(new RemoveAttributeUndoableEdit(
- domain,
- map,
- entity,
- new ObjAttribute[] {
- oa
- }));
+ addEdit(new RemoveAttributeUndoableEdit(entity, new ObjAttribute[] {oa}));
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fe1ee5f7/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
index 3d85beb..5ef1497 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
@@ -21,8 +21,6 @@ package org.apache.cayenne.modeler.undo;
import javax.swing.undo.CannotRedoException;
import javax.swing.undo.CannotUndoException;
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Embeddable;
@@ -31,125 +29,87 @@ import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.action.CreateAttributeAction;
import org.apache.cayenne.modeler.action.RemoveAttributeAction;
-import org.apache.cayenne.modeler.event.EmbeddableDisplayEvent;
-import org.apache.cayenne.modeler.event.EntityDisplayEvent;
-public class RemoveAttributeUndoableEdit extends CayenneUndoableEdit {
-
- private DataChannelDescriptor domain;
- private DataMap dataMap;
+public class RemoveAttributeUndoableEdit extends BaseRemovePropertyUndoableEdit {
private DbAttribute[] dbAttributes;
private ObjAttribute[] objAttributes;
-
- private ObjEntity objEntity;
- private DbEntity dbEntity;
-
- private Embeddable embeddable;
private EmbeddableAttribute[] embeddableAttrs;
- public RemoveAttributeUndoableEdit(Embeddable embeddable,
- EmbeddableAttribute[] embeddableAttrs) {
+ public RemoveAttributeUndoableEdit(Embeddable embeddable, EmbeddableAttribute[] embeddableAttributes) {
super();
this.embeddable = embeddable;
- this.embeddableAttrs = embeddableAttrs;
+ this.embeddableAttrs = embeddableAttributes;
}
- public RemoveAttributeUndoableEdit(DataChannelDescriptor domain, DataMap dataMap,
- ObjEntity entity, ObjAttribute[] attribs) {
+ public RemoveAttributeUndoableEdit(ObjEntity entity, ObjAttribute[] objAttributes) {
this.objEntity = entity;
- this.objAttributes = attribs;
- this.domain = domain;
- this.dataMap = dataMap;
+ this.objAttributes = objAttributes;
}
- public RemoveAttributeUndoableEdit(DataChannelDescriptor domain, DataMap dataMap,
- DbEntity entity, DbAttribute[] attribs) {
+ public RemoveAttributeUndoableEdit(DbEntity entity, DbAttribute[] dbAttributes) {
this.dbEntity = entity;
- this.dbAttributes = attribs;
- this.domain = domain;
- this.dataMap = dataMap;
+ this.dbAttributes = dbAttributes;
}
@Override
public void redo() throws CannotRedoException {
- RemoveAttributeAction action = actionManager
- .getAction(RemoveAttributeAction.class);
+ RemoveAttributeAction action = actionManager.getAction(RemoveAttributeAction.class);
if (objEntity != null) {
action.removeObjAttributes(objEntity, objAttributes);
- controller.fireObjEntityDisplayEvent(new EntityDisplayEvent(
- this,
- objEntity,
- dataMap,
- domain));
+ focusObjEntity();
}
if (dbEntity != null) {
action.removeDbAttributes(dbEntity.getDataMap(), dbEntity, dbAttributes);
- controller.fireDbEntityDisplayEvent(new EntityDisplayEvent(
- this,
- dbEntity,
- dataMap,
- domain));
+ focusDBEntity();
}
if (embeddable != null) {
action.removeEmbeddableAttributes(embeddable, embeddableAttrs);
- controller.fireEmbeddableDisplayEvent(new EmbeddableDisplayEvent(
- this,
- embeddable,
- dataMap,
- domain));
+ focusEmbeddable();
}
}
@Override
public void undo() throws CannotUndoException {
-
- CreateAttributeAction action = actionManager
- .getAction(CreateAttributeAction.class);
+ CreateAttributeAction action = actionManager.getAction(CreateAttributeAction.class);
if (objEntity != null) {
for (ObjAttribute attr : objAttributes) {
- action.createObjAttribute(dataMap, objEntity, attr);
+ action.createObjAttribute(objEntity.getDataMap(), objEntity, attr);
}
- focusObjEntity(objEntity);
+ focusObjEntity();
}
if (dbEntity != null) {
for (DbAttribute attr : dbAttributes) {
- action.createDbAttribute(dataMap, dbEntity, attr);
+ action.createDbAttribute(dbEntity.getDataMap(), dbEntity, attr);
}
- focusDBEntity(dbEntity);
+ focusDBEntity();
}
if (embeddable != null) {
for (EmbeddableAttribute attr : embeddableAttrs) {
action.createEmbAttribute(embeddable, attr);
}
+ focusEmbeddable();
}
-
}
@Override
public String getPresentationName() {
if (objEntity != null) {
- return (objAttributes.length > 1)
- ? "Remove ObjAttributes"
- : "Remove ObjAttribute";
+ return (objAttributes.length > 1) ? "Remove ObjAttributes" : "Remove ObjAttribute";
}
if (dbEntity != null) {
- return (dbAttributes.length > 1)
- ? "Remove DbAttributes"
- : "Remove DbAttribute";
+ return (dbAttributes.length > 1) ? "Remove DbAttributes" : "Remove DbAttribute";
}
if (embeddableAttrs != null) {
- return (embeddableAttrs.length > 1)
- ? "Remove Embeddable Attributes"
- : "Remove Embeddable Attribute";
+ return (embeddableAttrs.length > 1) ? "Remove Embeddable Attributes" : "Remove Embeddable Attribute";
}
return super.getPresentationName();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/fe1ee5f7/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
index c0d59a0..611f55c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
@@ -28,12 +28,9 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.modeler.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.action.RemoveRelationshipAction;
-public class RemoveRelationshipUndoableEdit extends CayenneUndoableEdit {
+public class RemoveRelationshipUndoableEdit extends BaseRemovePropertyUndoableEdit {
- private ObjEntity objEntity;
private ObjRelationship[] rels;
-
- private DbEntity dbEntity;
private DbRelationship[] dbRels;
public RemoveRelationshipUndoableEdit(ObjEntity objEntity, ObjRelationship[] rels) {
@@ -52,39 +49,36 @@ public class RemoveRelationshipUndoableEdit extends CayenneUndoableEdit {
public String getPresentationName() {
if (objEntity != null) {
return "Remove Obj Relationship";
- }
- else {
+ } else {
return "Remove Db Relationship";
}
}
@Override
public void redo() throws CannotRedoException {
- RemoveRelationshipAction action = actionManager
- .getAction(RemoveRelationshipAction.class);
+ RemoveRelationshipAction action = actionManager.getAction(RemoveRelationshipAction.class);
if (objEntity != null) {
action.removeObjRelationships(objEntity, rels);
- }
- else {
+ focusObjEntity();
+ } else {
action.removeDbRelationships(dbEntity, dbRels);
+ focusDBEntity();
}
}
@Override
public void undo() throws CannotUndoException {
- CreateRelationshipAction action = actionManager
- .getAction(CreateRelationshipAction.class);
+ CreateRelationshipAction action = actionManager.getAction(CreateRelationshipAction.class);
if (objEntity != null) {
for (ObjRelationship r : rels) {
action.createObjRelationship(objEntity, r);
}
- focusObjEntity(objEntity);
- }
- else {
+ focusObjEntity();
+ } else {
for (DbRelationship dr : dbRels) {
action.createDbRelationship(dbEntity, dr);
}
- focusDBEntity(dbEntity);
+ focusDBEntity();
}
}
}
[2/7] cayenne git commit: CAY-2385 CAY-2386 Refactored 3 duplicated
methods by moving these to their correspondent superclasses
Posted by nt...@apache.org.
CAY-2385 CAY-2386 Refactored 3 duplicated methods by moving these to their correspondent superclasses
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f181099b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f181099b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f181099b
Branch: refs/heads/master
Commit: f181099ba03f61308aa0b055147f22d7c055f534
Parents: 2d0daee
Author: Emerson Castaneda <em...@users.noreply.github.com>
Authored: Fri Dec 1 23:04:08 2017 -0500
Committer: Emerson Castaneda <em...@users.noreply.github.com>
Committed: Tue Dec 5 22:41:23 2017 -0500
----------------------------------------------------------------------
.../modeler/action/DbEntityCounterpartAction.java | 9 ---------
.../modeler/action/ObjEntityCounterpartAction.java | 9 ---------
.../cayenne/modeler/undo/CayenneUndoableEdit.java | 12 ++++++++++++
.../modeler/undo/RemoveAttributeUndoableEdit.java | 10 ----------
.../modeler/undo/RemoveRelationshipUndoableEdit.java | 10 ----------
.../org/apache/cayenne/modeler/util/CayenneAction.java | 9 +++++++++
6 files changed, 21 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f181099b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
index 35cf7f5..7e43e2f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
@@ -29,10 +29,8 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.ProjectTreeModel;
-import org.apache.cayenne.modeler.editor.EditorView;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
@@ -87,13 +85,6 @@ public class DbEntityCounterpartAction extends CayenneAction {
getProjectController().fireObjEntityDisplayEvent(event);
}
- public static EditorView editor() {
- return ((CayenneModelerFrame) Application
- .getInstance()
- .getFrameController()
- .getView()).getView();
- }
-
/**
* Builds a tree path for a given entity. Urgent for later selection.
*
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f181099b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
index 3feef17..8920802 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
@@ -25,9 +25,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectTreeModel;
-import org.apache.cayenne.modeler.editor.EditorView;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
public class ObjEntityCounterpartAction extends BaseViewEntityAction {
@@ -61,13 +59,6 @@ public class ObjEntityCounterpartAction extends BaseViewEntityAction {
getProjectController().fireDbEntityDisplayEvent(event);
}
- public static EditorView editor() {
- return ((CayenneModelerFrame) Application
- .getInstance()
- .getFrameController()
- .getView()).getView();
- }
-
/**
* Builds a tree path for a given entity. Urgent for later selection.
*
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f181099b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
index 6bd8527..86baee4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
@@ -20,9 +20,13 @@ package org.apache.cayenne.modeler.undo;
import javax.swing.undo.AbstractUndoableEdit;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.action.ActionManager;
+import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
+import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
public abstract class CayenneUndoableEdit extends AbstractUndoableEdit {
@@ -43,4 +47,12 @@ public abstract class CayenneUndoableEdit extends AbstractUndoableEdit {
public boolean canUndo() {
return true;
}
+
+ protected void focusObjEntity(ObjEntity objEntity){
+ actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
+ }
+
+ protected void focusDBEntity(DbEntity dbEntity){
+ actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f181099b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
index 5fd13d9..3d85beb 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveAttributeUndoableEdit.java
@@ -30,8 +30,6 @@ import org.apache.cayenne.map.EmbeddableAttribute;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.action.CreateAttributeAction;
-import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
-import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
import org.apache.cayenne.modeler.action.RemoveAttributeAction;
import org.apache.cayenne.modeler.event.EmbeddableDisplayEvent;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
@@ -134,14 +132,6 @@ public class RemoveAttributeUndoableEdit extends CayenneUndoableEdit {
}
- private void focusObjEntity(ObjEntity objEntity){
- actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
- }
-
- private void focusDBEntity(DbEntity dbEntity){
- actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
- }
-
@Override
public String getPresentationName() {
if (objEntity != null) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f181099b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
index afe9320..c0d59a0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveRelationshipUndoableEdit.java
@@ -26,8 +26,6 @@ import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.modeler.action.CreateRelationshipAction;
-import org.apache.cayenne.modeler.action.DbEntityCounterpartAction;
-import org.apache.cayenne.modeler.action.ObjEntityCounterpartAction;
import org.apache.cayenne.modeler.action.RemoveRelationshipAction;
public class RemoveRelationshipUndoableEdit extends CayenneUndoableEdit {
@@ -89,12 +87,4 @@ public class RemoveRelationshipUndoableEdit extends CayenneUndoableEdit {
focusDBEntity(dbEntity);
}
}
-
- private void focusObjEntity(ObjEntity objEntity){
- actionManager.getAction(DbEntityCounterpartAction.class).viewCounterpartEntity(objEntity);
- }
-
- private void focusDBEntity(DbEntity dbEntity){
- actionManager.getAction(ObjEntityCounterpartAction.class).viewCounterpartObject(dbEntity);
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f181099b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
index 8b294ca..00fabd1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
@@ -34,8 +34,10 @@ import javax.swing.KeyStroke;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
+import org.apache.cayenne.modeler.editor.EditorView;
import org.apache.cayenne.project.Project;
import org.apache.cayenne.swing.components.image.FilteredIconFactory;
import org.apache.cayenne.util.Util;
@@ -322,4 +324,11 @@ public abstract class CayenneAction extends AbstractAction {
}
}
}
+
+ protected static EditorView editor() {
+ return ((CayenneModelerFrame) Application
+ .getInstance()
+ .getFrameController()
+ .getView()).getView();
+ }
}
[3/7] cayenne git commit: CAY-2385 CAY-2386 Refactored 1 duplicated
method by moving it to their correspondent superclass
Posted by nt...@apache.org.
CAY-2385 CAY-2386 Refactored 1 duplicated method by moving it to their correspondent superclass
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a941ea7b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a941ea7b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a941ea7b
Branch: refs/heads/master
Commit: a941ea7b0d6518ea6e90bee4b57c2f142633b790
Parents: f181099
Author: Emerson Castaneda <em...@users.noreply.github.com>
Authored: Fri Dec 1 23:15:26 2017 -0500
Committer: Emerson Castaneda <em...@users.noreply.github.com>
Committed: Tue Dec 5 22:42:25 2017 -0500
----------------------------------------------------------------------
.../action/DbEntityCounterpartAction.java | 33 +-----------------
.../action/ObjEntityCounterpartAction.java | 31 -----------------
.../cayenne/modeler/util/CayenneAction.java | 35 ++++++++++++++++++++
3 files changed, 36 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a941ea7b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
index 7e43e2f..adb586b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
@@ -26,11 +26,9 @@ import javax.swing.tree.TreePath;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.ProjectTreeModel;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
@@ -85,34 +83,5 @@ public class DbEntityCounterpartAction extends CayenneAction {
getProjectController().fireObjEntityDisplayEvent(event);
}
- /**
- * Builds a tree path for a given entity. Urgent for later selection.
- *
- * @param entity to build path for
- * @return tree path
- */
- public static TreePath buildTreePath(Entity entity) {
- DataChannelDescriptor domain = (DataChannelDescriptor) Application
- .getInstance()
- .getProject()
- .getRootNode();
-
- Object[] path = new Object[] {domain, entity.getDataMap(), entity};
-
- Object[] mutableTreeNodes = new Object[path.length];
- mutableTreeNodes[0] = ((ProjectTreeModel) editor().getProjectTreeView().getModel())
- .getRootNode();
-
- Object[] helper;
- for (int i = 1; i < path.length; i++) {
- helper = new Object[i];
- for (int j = 0; j < i;) {
- helper[j] = path[++j];
- }
- mutableTreeNodes[i] = ((ProjectTreeModel) editor()
- .getProjectTreeView()
- .getModel()).getNodeForObjectPath(helper);
- }
- return new TreePath(mutableTreeNodes);
- }
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a941ea7b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
index 8920802..ec04a22 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntityCounterpartAction.java
@@ -25,7 +25,6 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ProjectTreeModel;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
public class ObjEntityCounterpartAction extends BaseViewEntityAction {
@@ -59,34 +58,4 @@ public class ObjEntityCounterpartAction extends BaseViewEntityAction {
getProjectController().fireDbEntityDisplayEvent(event);
}
- /**
- * Builds a tree path for a given entity. Urgent for later selection.
- *
- * @param entity to build path for
- * @return tree path
- */
- public static TreePath buildTreePath(Entity entity) {
- DataChannelDescriptor domain = (DataChannelDescriptor) Application
- .getInstance()
- .getProject()
- .getRootNode();
-
- Object[] path = new Object[] {domain, entity.getDataMap(), entity};
-
- Object[] mutableTreeNodes = new Object[path.length];
- mutableTreeNodes[0] = ((ProjectTreeModel) editor().getProjectTreeView().getModel())
- .getRootNode();
-
- Object[] helper;
- for (int i = 1; i < path.length; i++) {
- helper = new Object[i];
- for (int j = 0; j < i;) {
- helper[j] = path[++j];
- }
- mutableTreeNodes[i] = ((ProjectTreeModel) editor()
- .getProjectTreeView()
- .getModel()).getNodeForObjectPath(helper);
- }
- return new TreePath(mutableTreeNodes);
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a941ea7b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
index 00fabd1..213b5f6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
@@ -31,11 +31,15 @@ import javax.swing.JButton;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JMenuItem;
import javax.swing.KeyStroke;
+import javax.swing.tree.TreePath;
import org.apache.cayenne.configuration.ConfigurationNode;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.Entity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectController;
+import org.apache.cayenne.modeler.ProjectTreeModel;
import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
import org.apache.cayenne.modeler.editor.EditorView;
import org.apache.cayenne.project.Project;
@@ -331,4 +335,35 @@ public abstract class CayenneAction extends AbstractAction {
.getFrameController()
.getView()).getView();
}
+
+ /**
+ * Builds a tree path for a given entity. Urgent for later selection.
+ *
+ * @param entity to build path for
+ * @return tree path
+ */
+ protected static TreePath buildTreePath(Entity entity) {
+ DataChannelDescriptor domain = (DataChannelDescriptor) Application
+ .getInstance()
+ .getProject()
+ .getRootNode();
+
+ Object[] path = new Object[] {domain, entity.getDataMap(), entity};
+
+ Object[] mutableTreeNodes = new Object[path.length];
+ mutableTreeNodes[0] = ((ProjectTreeModel) editor().getProjectTreeView().getModel())
+ .getRootNode();
+
+ Object[] helper;
+ for (int i = 1; i < path.length; i++) {
+ helper = new Object[i];
+ for (int j = 0; j < i;) {
+ helper[j] = path[++j];
+ }
+ mutableTreeNodes[i] = ((ProjectTreeModel) editor()
+ .getProjectTreeView()
+ .getModel()).getNodeForObjectPath(helper);
+ }
+ return new TreePath(mutableTreeNodes);
+ }
}
[4/7] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/251' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/251' 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/2e077dd3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2e077dd3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2e077dd3
Branch: refs/heads/master
Commit: 2e077dd3b0220436a040b69c47190cc333cabd03
Parents: ab6ec9e a941ea7
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Dec 7 14:10:08 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Dec 7 14:10:08 2017 +0300
----------------------------------------------------------------------
.../action/DbEntityCounterpartAction.java | 40 ------------------
.../action/ObjEntityCounterpartAction.java | 18 ++++++++
.../modeler/undo/CayenneUndoableEdit.java | 12 ++++++
.../undo/RemoveAttributeUndoableEdit.java | 7 +---
.../undo/RemoveRelationshipUndoableEdit.java | 7 +---
.../cayenne/modeler/util/CayenneAction.java | 44 ++++++++++++++++++++
6 files changed, 76 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
[6/7] cayenne git commit: CAY-2388 release notes
Posted by nt...@apache.org.
CAY-2388 release notes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c98ec811
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c98ec811
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c98ec811
Branch: refs/heads/master
Commit: c98ec8112905309aceecd3f01c71a2c0c6588920
Parents: fe1ee5f
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Dec 7 15:48:29 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Dec 7 15:48:29 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c98ec811/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index e4f1ced..5a32f7a 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -19,11 +19,10 @@ CAY-2377 Cleanup deprecated code.
Bug Fixes:
CAY-2370 ValueObjectType for byte[] fails lookup
-CAY-2379 Modeler: Visualization issue after an undo action for a deleted ObjAttribute
CAY-2380 ReferenceMap should not store or return null values
CAY-2382 Lack of synchronization in DataContext serialization
-CAY-2384 Modeler: Visualization issue after an undo action for a deleted ObjRelationship
CAY-2387 Can't select byte[] property with ColumnSelect
+CAY-2388 Modeler: Visualization issues with undo/redo actions for attributes and relationships
----------------------------------
Release: 4.1.M1