CAY-2250 bug-fix: change action priority in performAction (change if-else sequence)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ba4ff305 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ba4ff305 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ba4ff305 Branch: refs/heads/master Commit: ba4ff3057bd17fd3927f8812d55b8b5aaf72d32f Parents: 8926738 Author: Maxim Petrusevich <mpetrusev...@objectstyle.com> Authored: Tue Apr 4 15:28:11 2017 +0300 Committer: Maxim Petrusevich <mpetrusev...@objectstyle.com> Committed: Tue Apr 4 15:28:11 2017 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/cayenne/modeler/action/RemoveAction.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba4ff305/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 97c185c..467fc50 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 @@ -129,6 +129,7 @@ public class RemoveAction extends CayenneAction { ProjectController mediator = getProjectController(); ConfirmRemoveDialog dialog = getConfirmDeleteDialog(allowAsking); + if (mediator.getCurrentObjEntity() != null) { if (dialog .shouldDelete("ObjEntity", mediator.getCurrentObjEntity().getName())) {
