You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/26 19:49:53 UTC
[1/3] cayenne git commit: CAY-1973 | error while generating classes
Repository: cayenne
Updated Branches:
refs/heads/STABLE-3.1 76ee3bc2d -> 15103f398
CAY-1973 | error while generating classes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f6a15cab
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f6a15cab
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f6a15cab
Branch: refs/heads/STABLE-3.1
Commit: f6a15cab9e4f26b20d0c46fdf8137c01aaaa4720
Parents: 76ee3bc
Author: Savva Kolbachev <s....@gmail.com>
Authored: Wed Nov 26 13:27:30 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Wed Nov 26 21:48:49 2014 +0300
----------------------------------------------------------------------
.../cayenne/modeler/pref/DataMapDefaults.java | 23 ++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6a15cab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
index ccbb399..77ad146 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
@@ -18,12 +18,12 @@
****************************************************************/
package org.apache.cayenne.modeler.pref;
-import java.util.prefs.Preferences;
-
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.pref.RenamedPreferences;
import org.apache.cayenne.util.Util;
+import java.util.prefs.Preferences;
+
public class DataMapDefaults extends RenamedPreferences {
private boolean generatePairs;
@@ -47,7 +47,7 @@ public class DataMapDefaults extends RenamedPreferences {
}
/**
- * Returns a superlcass package tailored for a given DataMap.
+ * Returns a superclass package tailored for a given DataMap.
*/
public void updateSuperclassPackage(DataMap dataMap, boolean isClient) {
@@ -74,7 +74,7 @@ public class DataMapDefaults extends RenamedPreferences {
}
if (DEFAULT_SUPERCLASS_PACKAGE_SUFFIX.equals(getSuperclassPackage())) {
- setSuperclassPackage(null);
+ setSuperclassPackage("");
}
}
@@ -135,6 +135,9 @@ public class DataMapDefaults extends RenamedPreferences {
public void setOutputPath(String outputPath) {
if (getCurrentPreference() != null) {
this.outputPath = outputPath;
+ if(outputPath == null) {
+ outputPath = "";
+ }
getCurrentPreference().put(OUTPUT_PATH_PROPERTY, outputPath);
}
}
@@ -151,6 +154,9 @@ public class DataMapDefaults extends RenamedPreferences {
public void setSubclassTemplate(String subclassTemplate) {
if (getCurrentPreference() != null) {
this.subclassTemplate = subclassTemplate;
+ if(subclassTemplate == null) {
+ subclassTemplate = "";
+ }
getCurrentPreference().put(SUBCLASS_TEMPLATE_PROPERTY, subclassTemplate);
}
}
@@ -167,6 +173,9 @@ public class DataMapDefaults extends RenamedPreferences {
public void setSuperclassPackage(String superclassPackage) {
if (getCurrentPreference() != null) {
this.superclassPackage = superclassPackage;
+ if(superclassPackage == null) {
+ superclassPackage = "";
+ }
getCurrentPreference().put(SUPERCLASS_PACKAGE_PROPERTY, superclassPackage);
}
}
@@ -183,6 +192,9 @@ public class DataMapDefaults extends RenamedPreferences {
public void setSuperclassTemplate(String superclassTemplate) {
if (getCurrentPreference() != null) {
this.superclassTemplate = superclassTemplate;
+ if(superclassTemplate == null) {
+ superclassTemplate = "";
+ }
getCurrentPreference().put(SUPERCLASS_TEMPLATE_PROPERTY, superclassTemplate);
}
}
@@ -196,6 +208,9 @@ public class DataMapDefaults extends RenamedPreferences {
public void setProperty(String property, String value) {
if (getCurrentPreference() != null) {
+ if(value == null) {
+ value = "";
+ }
getCurrentPreference().put(property, value);
}
}
[3/3] cayenne git commit: CAY-1973 error while generating classes
Posted by aa...@apache.org.
CAY-1973 error while generating classes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/15103f39
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/15103f39
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/15103f39
Branch: refs/heads/STABLE-3.1
Commit: 15103f39884f69b367014fbbf2a1accc1fb577c7
Parents: b629a4e
Author: aadamchik <aa...@apache.org>
Authored: Wed Nov 26 21:49:45 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Wed Nov 26 21:49:45 2014 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/15103f39/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 d3cea59..db113ad 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@ Changes/New Features Since 3.1
Bug Fixes Since 3.1:
CAY-1964 Fix convertAdditionalDataMaps() in CayenneGeneratorMojo.java
+CAY-1973 error while generating classes
----------------------------------
Release: 3.1-final
[2/3] cayenne git commit: CAY-1973 | fix setSuperclassPackage()
Posted by aa...@apache.org.
CAY-1973 | fix setSuperclassPackage()
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b629a4ed
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b629a4ed
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b629a4ed
Branch: refs/heads/STABLE-3.1
Commit: b629a4edc545556894fa6fc69058fbf1f6a19251
Parents: f6a15ca
Author: Savva Kolbachev <s....@gmail.com>
Authored: Wed Nov 26 14:36:03 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Wed Nov 26 21:49:02 2014 +0300
----------------------------------------------------------------------
.../main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b629a4ed/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
index 77ad146..881b88f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
@@ -74,7 +74,7 @@ public class DataMapDefaults extends RenamedPreferences {
}
if (DEFAULT_SUPERCLASS_PACKAGE_SUFFIX.equals(getSuperclassPackage())) {
- setSuperclassPackage("");
+ setSuperclassPackage(null);
}
}