salto-db-devs Mailing List for Salto Persistence Mechanism (Page 4)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 278
          http://svn.sourceforge.net/salto-db/?rev=278&view=rev
Author:   rflament
Date:     2007-04-05 07:12:32 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------


Modified Paths:
--------------
    salto-db-generator/trunk/src/com/salto/db/generator/plugin/SpringWebappPlugin.java
    salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java
    salto-db-generator/trunk/templates/springwebapp/addupdatecontroller.vm
    salto-db-generator/trunk/templates/springwebapp/ajaxdeletecontroller.vm
    salto-db-generator/trunk/templates/springwebapp/editor.vm
    salto-db-generator/trunk/templates/springwebapp/searchcontroller.vm

Added Paths:
-----------
    salto-db-generator/trunk/templates/springwebapp/getpkfromrequest.vm

Modified: salto-db-generator/trunk/src/com/salto/db/generator/plugin/SpringWebappPlugin.java
===================================================================

--- salto-db-generator/trunk/src/com/salto/db/generator/plugin/SpringWebappPlugin.java	2007-04-05 10:13:54 UTC (rev 277)
+++ salto-db-generator/trunk/src/com/salto/db/generator/plugin/SpringWebappPlugin.java	2007-04-05 14:12:32 UTC (rev 278)
@@ -41,6 +41,9 @@
 
 		runVelocity(TEMPLATE_PATH, "searchcontroller.vm", srcPath + "/src/" + (pckName + ".webapp.controller").replace('.', '/') + "/", className + "SearchController.java", context);
 
+		runVelocity(TEMPLATE_PATH, "editor.vm", srcPath + "/src/" + (pckName + ".webapp.editor").replace('.', '/') + "/", className + "EditorSupport.java", context);
+
+		
 		runVelocity(TEMPLATE_PATH, "emlist.jsp.vm", srcPath + "/WebContent/WEB-INF/pages", CreatorUtil.getDoNameCreator().class2attribute(className) + "EmList.jsp", context);
 
 		runVelocity(TEMPLATE_PATH, "list.jsp.vm", srcPath + "/WebContent/WEB-INF/pages", CreatorUtil.getDoNameCreator().class2attribute(className) + "List.jsp", context);

Modified: salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java
===================================================================
--- salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java	2007-04-05 10:13:54 UTC (rev 277)
+++ salto-db-generator/trunk/src/salto/tool/jdo/util/DoNameCreator.java	2007-04-05 14:12:32 UTC (rev 278)
@@ -67,8 +67,7 @@
 
 	public String createJavaAttName(String sqlName) {
 
-		if (sqlName.indexOf("_") > 0 || sqlName.toUpperCase().equals(sqlName)
-				|| sqlName.toLowerCase().equals(sqlName)) {
+		if (sqlName.indexOf("_") > 0 || sqlName.toUpperCase().equals(sqlName) || sqlName.toLowerCase().equals(sqlName)) {
 
 			int len = sqlName.length();
 			int offset = 0;
@@ -77,8 +76,7 @@
 			for (int i = (len - 1); i >= 0; i--) {
 				c = sqlName.charAt(i);
 				if (c == '_' && i + 1 + offset < len) {
-					javaName[i + 1 + offset] = Character.toUpperCase(javaName[i
-							+ 1 + offset]);
+					javaName[i + 1 + offset] = Character.toUpperCase(javaName[i + 1 + offset]);
 					offset++;
 				} else {
 					javaName[i + offset] = Character.toLowerCase(c);
@@ -111,8 +109,7 @@
 		for (int i = (len - 1); i >= 0; i--) {
 			c = tableName.charAt(i);
 			if (c == '_') {
-				javaName[i + 1 + offset] = Character.toUpperCase(javaName[i + 1
-						+ offset]);
+				javaName[i + 1 + offset] = Character.toUpperCase(javaName[i + 1 + offset]);
 				offset++;
 			} else {
 				javaName[i + offset] = Character.toLowerCase(c);
@@ -137,7 +134,8 @@
 	}
 
 	public String attribute2class(String attributeName) {
-		return attributeName.substring(0, 1).toUpperCase()
-				+ attributeName.substring(1);
+		if (attributeName == null)
+			return null;
+		return attributeName.substring(0, 1).toUpperCase() + attributeName.substring(1);
 	}
 }
\ No newline at end of file

Modified: salto-db-generator/trunk/templates/springwebapp/addupdatecontroller.vm
===================================================================
--- salto-db-generator/trunk/templates/springwebapp/addupdatecontroller.vm	2007-04-05 10:13:54 UTC (rev 277)
+++ salto-db-generator/trunk/templates/springwebapp/addupdatecontroller.vm	2007-04-05 14:12:32 UTC (rev 278)
@@ -10,6 +10,21 @@
 #end	
 
 #end
+#set ($pk="Long")
+#set ($pkname="")
+#foreach($col in ${jdoInfo.jdoColInfos})
+#foreach($colpk in ${jdoInfo.getPk()})
+#if ($colpk.col.equals($col.colName))
+#set ($pk=$util.getClassNameForPrimitive($col.javaAttClass))
+#set ($pkname=$util.getDoNameCreator().attribute2class($col.javaAttName))
+#end
+#end
+#end
+#if ($util.getLength($jdoInfo.getPk()) > 1)
+#set ($pk="${jdoInfo.javaClassName}PK")
+#set ($pkname="${jdoInfo.javaClassName}PK")
+import ${jdoInfo.javaPckName}.pojo.${jdoInfo.javaClassName}.${jdoInfo.javaClassName}PK;
+#end
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.web.servlet.mvc.CancellableFormController;
@@ -70,6 +85,9 @@
 	}
 	
 #end
+
+#parse("${templatePath}/getpkfromrequest.vm")	
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -80,7 +98,7 @@
 
 		${jdoInfo.javaClassName} ${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = null;
 		if (request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id") != null) {
-			${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = ${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}DAO.getById(Integer.parseInt(request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id")));
+${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = ${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}DAO.getById(getPkFromRequest(request));
 		} else {
 			${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = new ${jdoInfo.javaClassName}();
 		}

Modified: salto-db-generator/trunk/templates/springwebapp/ajaxdeletecontroller.vm
===================================================================
--- salto-db-generator/trunk/templates/springwebapp/ajaxdeletecontroller.vm	2007-04-05 10:13:54 UTC (rev 277)
+++ salto-db-generator/trunk/templates/springwebapp/ajaxdeletecontroller.vm	2007-04-05 14:12:32 UTC (rev 278)
@@ -5,7 +5,21 @@
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
-
+#set ($pk="Long")
+#set ($pkname="")
+#foreach($col in ${jdoInfo.jdoColInfos})
+#foreach($colpk in ${jdoInfo.getPk()})
+#if ($colpk.col.equals($col.colName))
+#set ($pk=$util.getClassNameForPrimitive($col.javaAttClass))
+#set ($pkname=$util.getDoNameCreator().attribute2class($col.javaAttName))
+#end
+#end
+#end
+#if ($util.getLength($jdoInfo.getPk()) > 1)
+#set ($pk="${jdoInfo.javaClassName}PK")
+#set ($pkname="${jdoInfo.javaClassName}PK")
+import ${jdoInfo.javaPckName}.pojo.${jdoInfo.javaClassName}.${jdoInfo.javaClassName}PK;
+#end
 import ${jdoInfo.javaPckName}.${jdoInfo.javaClassName}DAO;
 
 /**
@@ -26,11 +40,13 @@
 		return this.${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}DAO;
 	}
 
+#parse("${templatePath}/getpkfromrequest.vm")
+
 	@Override
 	protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 		if (request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id") != null) {
-			${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}DAO.deleteById(Integer.parseInt(request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id")));
+			${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}DAO.deleteById(getPkFromRequest(request));
 		}
 
 		//TODO: when it will be ajax : return null;

Modified: salto-db-generator/trunk/templates/springwebapp/editor.vm
===================================================================
--- salto-db-generator/trunk/templates/springwebapp/editor.vm	2007-04-05 10:13:54 UTC (rev 277)
+++ salto-db-generator/trunk/templates/springwebapp/editor.vm	2007-04-05 14:12:32 UTC (rev 278)
@@ -0,0 +1,27 @@
+package ${jdoInfo.javaPckName}.webapp.editor;
+
+import java.beans.PropertyEditorSupport;
+
+import ${jdoInfo.javaPckName}.pojo.${jdoInfo.javaClassName};
+#if ($util.getLength($jdoInfo.pk) > 0)
+#foreach($pk in $jdoInfo.pk)
+#set ($pkEntry="${pk.javaAttName}")
+#end
+#end
+
+/**
+ * <p>PropertyEditorSupport for ${jdoInfo.javaClassName}s</p>
+ * <p>Generated at $date</p>
+ *
+ * @author ${generatorVersion}
+ */
+public class ${jdoInfo.javaClassName}EditorSupport extends PropertyEditorSupport {
+
+	public void setAsText(String text) throws IllegalArgumentException {
+
+		${jdoInfo.javaClassName} ${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = new ${jdoInfo.javaClassName}();
+		${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}.set${util.DoNameCreator.attribute2class(${pkEntry})}(Long.valueOf(text));
+		setValue(${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})});
+	}
+
+}
\ No newline at end of file

Added: salto-db-generator/trunk/templates/springwebapp/getpkfromrequest.vm
===================================================================
--- salto-db-generator/trunk/templates/springwebapp/getpkfromrequest.vm	                        (rev 0)
+++ salto-db-generator/trunk/templates/springwebapp/getpkfromrequest.vm	2007-04-05 14:12:32 UTC (rev 278)
@@ -0,0 +1,13 @@
+	private ${pk} getPkFromRequest(HttpServletRequest request) {
+#if ($util.getLength($jdoInfo.getPk()) > 1)
+		//TODO : get composite of the pk in request and return an instance of ${pk}
+		return null;
+#else	
+#if ($pk == "Integer")
+		return Integer.parseInt(request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id"));
+#end
+#if ($pk == "Long")
+		return Long.parseLong(request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id"));
+#end
+#end
+	}
\ No newline at end of file

Modified: salto-db-generator/trunk/templates/springwebapp/searchcontroller.vm
===================================================================
--- salto-db-generator/trunk/templates/springwebapp/searchcontroller.vm	2007-04-05 10:13:54 UTC (rev 277)
+++ salto-db-generator/trunk/templates/springwebapp/searchcontroller.vm	2007-04-05 14:12:32 UTC (rev 278)
@@ -10,6 +10,21 @@
 #end	
 
 #end
+#set ($pk="Long")
+#set ($pkname="")
+#foreach($col in ${jdoInfo.jdoColInfos})
+#foreach($colpk in ${jdoInfo.getPk()})
+#if ($colpk.col.equals($col.colName))
+#set ($pk=$util.getClassNameForPrimitive($col.javaAttClass))
+#set ($pkname=$util.getDoNameCreator().attribute2class($col.javaAttName))
+#end
+#end
+#end
+#if ($util.getLength($jdoInfo.getPk()) > 1)
+#set ($pk="${jdoInfo.javaClassName}PK")
+#set ($pkname="${jdoInfo.javaClassName}PK")
+import ${jdoInfo.javaPckName}.pojo.${jdoInfo.javaClassName}.${jdoInfo.javaClassName}PK;
+#end
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -73,6 +88,9 @@
 	}
 	
 #end
+
+#parse("${templatePath}/getpkfromrequest.vm")	
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -83,7 +101,7 @@
 
 		${jdoInfo.javaClassName} ${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = null;
 		if (request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id") != null) {
-			${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = ${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}DAO.getById(Integer.parseInt(request.getParameter("${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}Id")));
+			${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = ${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})}DAO.getById(getPkFromRequest(request));
 		} else {
 			${util.DoNameCreator.class2attribute(${jdoInfo.javaClassName})} = new ${jdoInfo.javaClassName}();
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (11)	Oct (10)	Nov (3)	Dec
2007	Jan (44)	Feb (30)	Mar (11)	Apr (43)	May	Jun	Jul	Aug (1)	Sep (9)	Oct	Nov (1)	Dec (1)
2008	Jan (1)	Feb	Mar	Apr (17)	May (9)	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec

salto-db-devs Mailing List for Salto Persistence Mechanism (Page 4)

salto-db-devs — svn commits and jira events