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/04/19 10:07:53 UTC

[1/3] cayenne git commit: CAY-2430

Repository: cayenne
Updated Branches:
  refs/heads/master d2fb2de46 -> fed6bcb95


CAY-2430

Fixed NPE on redo delete procedure action.


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cf2a1a06
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cf2a1a06
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cf2a1a06

Branch: refs/heads/master
Commit: cf2a1a060444a3717bf8c8f1d1dee1163e5dbbed
Parents: d2fb2de
Author: kkomyak <co...@gmail.com>
Authored: Thu Apr 12 09:20:03 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Thu Apr 19 10:35:29 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                                  | 1 +
 .../java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java   | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf2a1a06/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 6440065..99cc961 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -35,6 +35,7 @@ CAY-2414 Modeler: new icon design
 CAY-2415 Transaction isolation and propagation support
 CAY-2416 Change TreeMap for HashMap to store data in Cayenne model classes
 CAY-2422 Modeler: Open driver setup window on driver load error
+CAY-2430 Modeler: Redo throws NPE
 
 Bug Fixes:
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf2a1a06/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
index fd22b74..fe662b2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
@@ -211,6 +211,7 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit {
                 break;
             case PROCEDURE:
                 action.removeProcedure(map, procedure);
+                break;
             case MAP_FROM_NODE:
                 action.removeDataMapFromDataNode(dataNode, map);
                 break;
@@ -222,6 +223,7 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit {
                 break;
             case EMBEDDABLE:
                 action.removeEmbeddable(map, embeddable);
+                break;
         }
     }
 


[3/3] cayenne git commit: CAY-2430 Modeler: Redo throws NPE release notes

Posted by nt...@apache.org.
CAY-2430 Modeler: Redo throws NPE
  release notes


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/fed6bcb9
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/fed6bcb9
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/fed6bcb9

Branch: refs/heads/master
Commit: fed6bcb95dba8f0bfed1a24dff4375ad9618eb9a
Parents: 07611d9
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Apr 19 13:06:43 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Apr 19 13:06:43 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/fed6bcb9/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 99cc961..f8b777f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -35,7 +35,6 @@ CAY-2414 Modeler: new icon design
 CAY-2415 Transaction isolation and propagation support
 CAY-2416 Change TreeMap for HashMap to store data in Cayenne model classes
 CAY-2422 Modeler: Open driver setup window on driver load error
-CAY-2430 Modeler: Redo throws NPE
 
 Bug Fixes:
 
@@ -57,6 +56,7 @@ CAY-2420 Modeler: search is not performed for Stored Procedures
 CAY-2425 Modeler: Migrate DB Direction field is locked if no option was selected in dropdown list
 CAY-2427 Modeler: Undo throws exception
 CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
+CAY-2430 Modeler: Redo throws NPE
 
 ----------------------------------
 Release: 4.1.M1


[2/3] cayenne git commit: Merge PR #290

Posted by nt...@apache.org.
Merge PR #290


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/07611d93
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/07611d93
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/07611d93

Branch: refs/heads/master
Commit: 07611d930163d346bedb596cf9b6d8e0d1d65625
Parents: d2fb2de cf2a1a0
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Apr 19 13:05:58 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Apr 19 13:05:58 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                                  | 1 +
 .../java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java   | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------