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/07/10 08:30:20 UTC

[1/7] cayenne git commit: CAY-2430. Redo throws NPE

Repository: cayenne
Updated Branches:
  refs/heads/STABLE-4.0 8d4c83abe -> 7a0ec83ba


CAY-2430. Redo throws NPE


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

Branch: refs/heads/STABLE-4.0
Commit: d5f14a8d16aefd6703531c95e4808cc53fb92d2d
Parents: 8d4c83a
Author: Arseni Bulatski <an...@gmail.com>
Authored: Tue Jul 10 10:50:48 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Tue Jul 10 10:50:48 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/d5f14a8d/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1d85638..69142a7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -48,6 +48,7 @@ CAY-2405 Broken prefetch of entity with inheritance and attribute with custom ja
 CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class
 CAY-2420 Modeler: search is not performed for Stored Procedures
 CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
+CAY-2430 Redo throws NPE
 
 ----------------------------------
 Release: 4.0.B2

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d5f14a8d/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;
         }
     }
 


[7/7] cayenne git commit: Release notes

Posted by nt...@apache.org.
Release notes


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

Branch: refs/heads/STABLE-4.0
Commit: 7a0ec83ba99216225662924bf3cd73a8f0ac9907
Parents: 7e9d4c0
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jul 10 11:29:55 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jul 10 11:29:55 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/7a0ec83b/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 2d9952f..c7474b3 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -16,6 +16,9 @@ Changes/New Features:
 
 Bug Fixes:
 
+CAY-2418 Modeler: unable to edit entity selected via Search
+CAY-2427 Modeler: Undo throws exception
+CAY-2430 Modeler: Redo throws NPE
 CAY-2435 cdbimport: procedure parameters are not imported
 CAY-2436 NPE in CayenneRuntimeException constructor
 CAY-2442 Broken EventBridge providers implementations
@@ -46,11 +49,8 @@ CAY-2392 Modeler: Unable to remove DataNode
 CAY-2401 Modeler: NPE in ObjEntity sync action
 CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type
 CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class
-CAY-2418 Modeler: unable to edit entity selected via Search
 CAY-2420 Modeler: search is not performed for Stored Procedures
-CAY-2427 Modeler: Undo throws exeption
 CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
-CAY-2430 Redo throws NPE
 
 ----------------------------------
 Release: 4.0.B2


[3/7] cayenne git commit: CAY-2418 Modeler: unable to edit entity selected via Search

Posted by nt...@apache.org.
CAY-2418 Modeler: unable to edit entity selected via Search


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

Branch: refs/heads/STABLE-4.0
Commit: c77c85172cff47deaa5241b169f0c3189d0e0e00
Parents: 8d4c83a
Author: Arseni Bulatski <an...@gmail.com>
Authored: Tue Jul 10 10:46:46 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Tue Jul 10 11:09:53 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                                | 1 +
 .../cayenne/modeler/editor/ObjEntityRelationshipPanel.java       | 4 ++--
 .../modeler/editor/dbentity/DbEntityRelationshipPanel.java       | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1d85638..df6328f 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -46,6 +46,7 @@ CAY-2392 Modeler: Unable to remove DataNode
 CAY-2401 Modeler: NPE in ObjEntity sync action
 CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type
 CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class
+CAY-2418 Modeler: unable to edit entity selected via Search
 CAY-2420 Modeler: search is not performed for Stored Procedures
 CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
index c7c3788..b48a68e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
@@ -45,7 +45,6 @@ import org.apache.cayenne.modeler.util.DbRelationshipPathComboBoxEditor;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +69,6 @@ import javax.swing.table.TableColumn;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collection;
@@ -204,6 +202,8 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl
         }
 
         table.select(newSel);
+        parentPanel.getResolve().removeActionListener(getResolver());
+        parentPanel.getResolve().addActionListener(getResolver());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cayenne/blob/c77c8517/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java
index ca25022..13122ac 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java
@@ -190,6 +190,8 @@ public class DbEntityRelationshipPanel extends JPanel implements DbEntityDisplay
         }
 
         table.select(newSel);
+        parentPanel.getResolve().removeActionListener(getResolver());
+        parentPanel.getResolve().addActionListener(getResolver());
     }
 
     /**


[4/7] cayenne git commit: Merge PR #298

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


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

Branch: refs/heads/STABLE-4.0
Commit: 7077ed0d5eca3820989e38372d18273a32ad3c2f
Parents: 8d4c83a 94db922
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jul 10 11:21:16 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jul 10 11:21:16 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                    |  1 +
 .../cayenne/modeler/action/DbEntitySyncAction.java   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



[6/7] cayenne git commit: Merge PR #300

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


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

Branch: refs/heads/STABLE-4.0
Commit: 7e9d4c0a1701649bc68630ef664cfb92c421181a
Parents: 39326db d5f14a8
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jul 10 11:23:01 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jul 10 11:23:01 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/7e9d4c0a/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index 4c2ec13,69142a7..2d9952f
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -46,10 -46,9 +46,11 @@@ CAY-2392 Modeler: Unable to remove Data
  CAY-2401 Modeler: NPE in ObjEntity sync action
  CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type
  CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class
 +CAY-2418 Modeler: unable to edit entity selected via Search
  CAY-2420 Modeler: search is not performed for Stored Procedures
 +CAY-2427 Modeler: Undo throws exeption
  CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
+ CAY-2430 Redo throws NPE
  
  ----------------------------------
  Release: 4.0.B2


[2/7] cayenne git commit: CAY-2427 Undo: undo throws exeption

Posted by nt...@apache.org.
CAY-2427 Undo: undo throws exeption


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

Branch: refs/heads/STABLE-4.0
Commit: 94db9226bf1466069c22a3c75e496c8c492adbb9
Parents: 8d4c83a
Author: Arseni Bulatski <an...@gmail.com>
Authored: Tue Jul 10 11:04:14 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Tue Jul 10 11:04:14 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                    |  1 +
 .../cayenne/modeler/action/DbEntitySyncAction.java   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/94db9226/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1d85638..8599c3b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -47,6 +47,7 @@ CAY-2401 Modeler: NPE in ObjEntity sync action
 CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type
 CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class
 CAY-2420 Modeler: search is not performed for Stored Procedures
+CAY-2427 Modeler: Undo throws exeption
 CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
 
 ----------------------------------

http://git-wip-us.apache.org/repos/asf/cayenne/blob/94db9226/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
index b774233..822e95a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.dbsync.merge.context.EntityMergeSupport;
 import org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator;
+import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.ObjEntity;
@@ -99,6 +100,7 @@ public class DbEntitySyncAction extends CayenneAction {
 			// filter out inherited entities, as we need to add attributes only to the roots
 			filterInheritedEntities(entities);
 
+			boolean hasChanges = false;
 			for(ObjEntity entity : entities) {
 
 				DbEntitySyncUndoableEdit.EntitySyncUndoableListener listener = undoableEdit.new EntitySyncUndoableListener(
@@ -106,21 +108,26 @@ public class DbEntitySyncAction extends CayenneAction {
 
 				merger.addEntityMergeListener(listener);
 
+				Collection<DbAttribute> meaningfulFKs = merger.getMeaningfulFKs(entity);
+
 				// TODO: addition or removal of model objects should be reflected in listener callbacks...
 				// we should not be trying to introspect the merger
-				if (merger.isRemovingMeaningfulFKs()) {
-					undoableEdit.addEdit(undoableEdit.new MeaningfulFKsUndoableEdit(entity, merger
-							.getMeaningfulFKs(entity)));
+				if (merger.isRemovingMeaningfulFKs() && !meaningfulFKs.isEmpty()) {
+					undoableEdit.addEdit(undoableEdit.new MeaningfulFKsUndoableEdit(entity, meaningfulFKs));
+					hasChanges = true;
 				}
 
 				if (merger.synchronizeWithDbEntity(entity)) {
 					mediator.fireObjEntityEvent(new EntityEvent(this, entity, MapEvent.CHANGE));
+					hasChanges = true;
 				}
 
 				merger.removeEntityMergeListener(listener);
 			}
 
-			application.getUndoManager().addEdit(undoableEdit);
+			if(hasChanges) {
+				application.getUndoManager().addEdit(undoableEdit);
+			}
 		}
 	}
 


[5/7] cayenne git commit: Merge PR #299

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


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

Branch: refs/heads/STABLE-4.0
Commit: 39326db2d2b2b7c466390aa5a02f00008622918b
Parents: 7077ed0 c77c851
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jul 10 11:22:21 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jul 10 11:22:21 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                                | 1 +
 .../cayenne/modeler/editor/ObjEntityRelationshipPanel.java       | 4 ++--
 .../modeler/editor/dbentity/DbEntityRelationshipPanel.java       | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/39326db2/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index 8599c3b,df6328f..4c2ec13
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -46,8 -46,8 +46,9 @@@ CAY-2392 Modeler: Unable to remove Data
  CAY-2401 Modeler: NPE in ObjEntity sync action
  CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type
  CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class
+ CAY-2418 Modeler: unable to edit entity selected via Search
  CAY-2420 Modeler: search is not performed for Stored Procedures
 +CAY-2427 Modeler: Undo throws exeption
  CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS
  
  ----------------------------------