Author: chatellier Date: 2009-02-11 10:50:27 +0000 (Wed, 11 Feb 2009) New Revision: 1352 Modified: topia/trunk/topia-persistence/changelog.txt topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java Log: Capitalize model name first letter. Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/changelog.txt 2009-02-11 10:50:27 UTC (rev 1352) @@ -1,4 +1,5 @@ 2.1.3 ??? 200902?? +* 20090410 [chatellier] - add first letter capitalize on model name use * 20090129 [chemit] - add methods in TopiaGeneratorUtil class to optimize imports * 20090129 [thimel] - Refactor generators (part1 : remove any methods calls in <%=...%>) * 20090129 [thimel] - Renamed GeneratorUtil to TopiaGeneratorUtil Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-11 10:50:27 UTC (rev 1352) @@ -38,6 +38,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.generator.Generator; +import org.codelutin.generator.GeneratorUtil; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; @@ -63,9 +64,12 @@ @Override public String getFilenameForModel(ObjectModel model) { + + String modelName = GeneratorUtil.capitalize(model.getName()); + return (getProperty("defaultPackage") + ".").replace('.', File.separatorChar) - + model.getName() + "DAOHelper.java"; + + modelName + "DAOHelper.java"; } @Override @@ -76,7 +80,7 @@ /*{<%=copyright%> }*/ } - String modelName = model.getName(); + String modelName = GeneratorUtil.capitalize(model.getName()); /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.TopiaContext; Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2009-02-11 10:50:27 UTC (rev 1352) @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.generator.Generator; +import org.codelutin.generator.GeneratorUtil; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; @@ -57,16 +58,19 @@ @Override public String getFilenameForModel(ObjectModel model) { + + String modelName = GeneratorUtil.capitalize(model.getName()); + return (getProperty("defaultPackage") + ".").replace('.', File.separatorChar) - + model.getName() + "EntityEnum.java"; + + modelName + "EntityEnum.java"; } @Override public void generateFromModel(Writer output, ObjectModel model) throws IOException { String copyright = TopiaGeneratorUtil.getCopyright(model); - String modelName = model.getName(); + String modelName = GeneratorUtil.capitalize(model.getName()); String className = modelName + "EntityEnum"; if (log.isDebugEnabled()) { log.debug("generating " + className); Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2009-02-11 10:50:27 UTC (rev 1352) @@ -31,6 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.generator.Generator; +import org.codelutin.generator.GeneratorUtil; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; @@ -59,9 +60,12 @@ @Override public String getFilenameForModel(ObjectModel model) { + + String modelName = GeneratorUtil.capitalize(model.getName()); + return (getProperty("defaultPackage") + ".").replace('.', File.separatorChar) - + model.getName() + "EntityProvider.java"; + + modelName + "EntityProvider.java"; } @Override @@ -72,7 +76,7 @@ /*{<%=copyright%> }*/ } - String modelName = model.getName(); + String modelName = GeneratorUtil.capitalize(model.getName()); /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.persistence.TopiaEntity; @@ -80,6 +84,11 @@ import java.util.HashMap; import java.util.Collections; +/** + * <%=modelName%>EntityProvider. + * + * @deprecated <%=modelName%>EntityProvider will be removed in future ToPIA version + *) @SuppressWarnings({"unchecked"}) public class <%=modelName%>EntityProvider {