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/27 08:12:19 UTC
[36/39] cayenne git commit: CAY-1973 | error while generating classes
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/14b5e145
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/14b5e145
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/14b5e145
Branch: refs/heads/CAY-1946_1
Commit: 14b5e145cdaeea9aeddc06597bba155fc82ed354
Parents: 09c924c
Author: Savva Kolbachev <s....@gmail.com>
Authored: Wed Nov 26 13:27:30 2014 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Wed Nov 26 13:27:30 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/14b5e145/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);
}
}