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/04/04 13:38:39 UTC
[1/3] cayenne git commit: bug-fix: change action priority in
performAction (change if-else sequence)
Repository: cayenne
Updated Branches:
refs/heads/master 27637e16b -> b3b6e03cf
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/8926738c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8926738c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8926738c
Branch: refs/heads/master
Commit: 8926738cd2af3d17fb1431c319b12c2288563039
Parents: 4a6dbf1
Author: Maxim Petrusevich <mp...@objectstyle.com>
Authored: Tue Apr 4 15:19:56 2017 +0300
Committer: Maxim Petrusevich <mp...@objectstyle.com>
Committed: Tue Apr 4 15:19:56 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/action/RemoveAction.java | 44 ++++++++++----------
2 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8926738c/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 058e88c..22fc18a 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -34,6 +34,7 @@ CAY-2077 Bug in CayenneRuntimeException using wrong specified string in Formatte
CAY-2094 SelectById query doesn't work from ROP client
CAY-2240 Modeler: issue with cursor rendering for EJBQL query
CAY-2243 ObjectContext.getGraphManager().unregisterObject() inconsistencies
+CAY-2250 Remove: Incorrect text in Confirm Remove message when cursor is set on attribute row
CAY-2256 Cannot Save/Insert an Object With null Flattened (complex) toOne Relationship (see also CAY-2146)
CAY-2265 ServerRuntime.builder() fails to set default runtime name when a the project file doesn't follow recognized pattern
CAY-2273 Modeler: default suggested cgen location is rooted in subpackage
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8926738c/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 db1fee6..97c185c 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,29 +129,7 @@ public class RemoveAction extends CayenneAction {
ProjectController mediator = getProjectController();
ConfirmRemoveDialog dialog = getConfirmDeleteDialog(allowAsking);
-
- if(mediator.getCurrentCallbackMethods().length > 0) {
- removeMethods(mediator, dialog, getProjectController().getCurrentCallbackMethods());
- }
- else if(mediator.getCurrentObjRelationships().length > 0) {
- removeObjRelationships(mediator, dialog, getProjectController().getCurrentObjRelationships());
- }
- else if(mediator.getCurrentDbRelationships().length > 0) {
- removeDBRelationships(mediator, dialog, getProjectController().getCurrentDbRelationships());
- }
- else if(mediator.getCurrentObjAttributes().length > 0) {
- removeObjAttributes(mediator, dialog, getProjectController().getCurrentObjAttributes());
- }
- else if(mediator.getCurrentEmbAttributes().length > 0) {
- removeEmbAttributes(mediator, dialog, getProjectController().getCurrentEmbAttributes());
- }
- else if(mediator.getCurrentDbAttributes().length > 0) {
- removeDbAttributes(mediator, dialog, getProjectController().getCurrentDbAttributes());
- }
- else if(mediator.getCurrentProcedureParameters().length > 0) {
- removeProcedureParameters(mediator.getCurrentProcedure(), mediator.getCurrentProcedureParameters());
- }
- else if (mediator.getCurrentObjEntity() != null) {
+ if (mediator.getCurrentObjEntity() != null) {
if (dialog
.shouldDelete("ObjEntity", mediator.getCurrentObjEntity().getName())) {
application.getUndoManager().addEdit(
@@ -255,6 +233,26 @@ public class RemoveAction extends CayenneAction {
application.getUndoManager().addEdit(compoundEdit);
}
+ } else if(mediator.getCurrentCallbackMethods().length > 0) {
+ removeMethods(mediator, dialog, getProjectController().getCurrentCallbackMethods());
+ }
+ else if(mediator.getCurrentObjRelationships().length > 0) {
+ removeObjRelationships(mediator, dialog, getProjectController().getCurrentObjRelationships());
+ }
+ else if(mediator.getCurrentDbRelationships().length > 0) {
+ removeDBRelationships(mediator, dialog, getProjectController().getCurrentDbRelationships());
+ }
+ else if(mediator.getCurrentObjAttributes().length > 0) {
+ removeObjAttributes(mediator, dialog, getProjectController().getCurrentObjAttributes());
+ }
+ else if(mediator.getCurrentEmbAttributes().length > 0) {
+ removeEmbAttributes(mediator, dialog, getProjectController().getCurrentEmbAttributes());
+ }
+ else if(mediator.getCurrentDbAttributes().length > 0) {
+ removeDbAttributes(mediator, dialog, getProjectController().getCurrentDbAttributes());
+ }
+ else if(mediator.getCurrentProcedureParameters().length > 0) {
+ removeProcedureParameters(mediator.getCurrentProcedure(), mediator.getCurrentProcedureParameters());
}
}
[3/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/180' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/180' 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/b3b6e03c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b3b6e03c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b3b6e03c
Branch: refs/heads/master
Commit: b3b6e03cf3a0973f69728fda84ee33ea2c8e752c
Parents: 27637e1 ba4ff30
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Apr 4 16:32:15 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Apr 4 16:32:15 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/action/RemoveAction.java | 45 ++++++++++----------
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[2/3] cayenne git commit: CAY-2250 bug-fix: change action priority in
performAction (change if-else sequence)
Posted by nt...@apache.org.
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 <mp...@objectstyle.com>
Authored: Tue Apr 4 15:28:11 2017 +0300
Committer: Maxim Petrusevich <mp...@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())) {