You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/11 18:45:21 UTC
[1/3] cayenne git commit: Fixed naming problems on creating
Embeddable Fixed ConcurrentModificationException on updating Embeddable
package
Repository: cayenne
Updated Branches:
refs/heads/master b013ca167 -> db6aab4ff
Fixed naming problems on creating Embeddable
Fixed ConcurrentModificationException on updating Embeddable package
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cd102859
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cd102859
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cd102859
Branch: refs/heads/master
Commit: cd10285912bca48fe12a432624f7b4494dc0eec9
Parents: 2b7a21b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Nov 9 13:32:23 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Nov 9 13:32:23 2016 +0300
----------------------------------------------------------------------
.../cayenne/modeler/action/CreateEmbeddableAction.java | 4 +++-
.../modeler/dialog/datamap/PackageUpdateController.java | 12 +++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cd102859/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
index fe073ec..f58b021 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
@@ -56,7 +56,9 @@ public class CreateEmbeddableAction extends CayenneAction {
DataMap dataMap = mediator.getCurrentDataMap();
Embeddable embeddable = new Embeddable();
- embeddable.setClassName(NameBuilder.builder(embeddable, dataMap).name());
+ String baseName = NameBuilder.builder(embeddable, dataMap).name();
+ String nameWithPackage = dataMap.getNameWithDefaultPackage(baseName);
+ embeddable.setClassName(nameWithPackage);
createEmbeddable(dataMap, embeddable);
application.getUndoManager().addEdit(new CreateEmbeddableUndoableEdit(dataMap, embeddable));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cd102859/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
index 52d2160..5981fa9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
@@ -22,7 +22,12 @@ package org.apache.cayenne.modeler.dialog.datamap;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Map;
import java.util.regex.Pattern;
@@ -96,9 +101,10 @@ public class PackageUpdateController extends DefaultsPreferencesController {
boolean doAll = isAllEntities();
Map<String, String> oldNameEmbeddableToNewName = new HashMap<>();
-
- for (Embeddable embeddable : dataMap.getEmbeddables()) {
-
+
+ // Create local copy to escape ConcurrentModificationException
+ Collection<Embeddable> embeddables = new ArrayList<>(dataMap.getEmbeddables());
+ for (Embeddable embeddable : embeddables) {
String oldName = embeddable.getClassName();
Pattern p = Pattern.compile("[.]");
[2/3] cayenne git commit: Fixed naming problems on creating
Embeddable Fixed ConcurrentModificationException on updating Embeddable
package
Posted by sk...@apache.org.
Fixed naming problems on creating Embeddable
Fixed ConcurrentModificationException on updating Embeddable package
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0837f99b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0837f99b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0837f99b
Branch: refs/heads/master
Commit: 0837f99b4426d50d4e671e408902b822d3542503
Parents: cd10285
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Nov 9 13:34:59 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Nov 9 13:34:59 2016 +0300
----------------------------------------------------------------------
.../cayenne/modeler/dialog/datamap/PackageUpdateController.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0837f99b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
index 5981fa9..b779e38 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
@@ -24,10 +24,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
import java.util.Map;
import java.util.regex.Pattern;
[3/3] cayenne git commit: Merge branch '124'
Posted by sk...@apache.org.
Merge branch '124'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/db6aab4f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/db6aab4f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/db6aab4f
Branch: refs/heads/master
Commit: db6aab4ff5f3da71bf4e003894c8a4bd90c1861a
Parents: b013ca1 0837f99
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Nov 11 21:45:03 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Nov 11 21:45:03 2016 +0300
----------------------------------------------------------------------
.../cayenne/modeler/action/CreateEmbeddableAction.java | 4 +++-
.../modeler/dialog/datamap/PackageUpdateController.java | 9 ++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------