[jboss-cvs] jboss-seam/src/gen/org/jboss/seam/tool ...
Gavin King
gavin.king at jboss.com
Thu Nov 2 23:29:21 EST 2006
User: gavin
Date: 06/11/02 23:29:21
Modified: src/gen/org/jboss/seam/tool AbstractSeamGen.java
FaceletGenerator.java JavaClassGenerator.java
Log:
optional args
Revision Changes Path
1.3 +5 -0 jboss-seam/src/gen/org/jboss/seam/tool/AbstractSeamGen.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractSeamGen.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/AbstractSeamGen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AbstractSeamGen.java 2 Nov 2006 22:34:20 -0000 1.2
+++ AbstractSeamGen.java 3 Nov 2006 04:29:21 -0000 1.3
@@ -46,6 +46,11 @@
private static Configuration cfg = new Configuration();
+ protected String lower(String name)
+ {
+ return name.substring(0, 1).toLowerCase() + name.substring(1);
+ }
+
public AbstractSeamGen() {
logger.setLevel(logLevel);
try {
1.6 +37 -24 jboss-seam/src/gen/org/jboss/seam/tool/FaceletGenerator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FaceletGenerator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/FaceletGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- FaceletGenerator.java 3 Nov 2006 03:46:16 -0000 1.5
+++ FaceletGenerator.java 3 Nov 2006 04:29:21 -0000 1.6
@@ -37,68 +37,81 @@
public FaceletGenerator() {};
public FaceletGenerator(String[] args) throws IOException {
- this.projectName = args[1];
- this.actionName = args[2];
- this.pageName = args[3];
- if (args.length>4) this.masterPageName = args[4];
- //make the component name same as action name but first char lower case
- this.componentName = this.actionName.substring(0,1).toLowerCase() + this.actionName.substring(1);
+ projectName = args[1];
+ actionName = args[2];
+ componentName = lower(actionName);
+ if ( !"".equals(args[3]) )
+ {
+ pageName = args[3];
+ }
+ else
+ {
+ pageName = componentName;
+ }
+ if ( !"".equals(args[4]) )
+ {
+ masterPageName = args[4];
+ }
+ else
+ {
+ masterPageName = componentName + "List";
+ }
}
private HashMap getModel() throws IOException {
HashMap map = new HashMap();
- map.put("projectName", this.projectName);
- map.put("pageName", this.pageName);
- map.put("masterPageName", this.masterPageName);
- map.put("actionName", this.actionName);
- map.put("componentName", this.componentName);
+ map.put("projectName", projectName);
+ map.put("pageName", pageName);
+ map.put("masterPageName", masterPageName);
+ map.put("actionName", actionName);
+ map.put("componentName", componentName);
return map;
}
public void newPage() throws IOException, TemplateException {
logger.info("Generating a new page");
- String page = getFaceletPath( this.projectProps.getWorkspaceHome(),
- this.projectName, this.pageName, this.projectProps.getWtp());
+ String page = getFaceletPath( projectProps.getWorkspaceHome(),
+ projectName, pageName, projectProps.getWtp());
generateFile("page.ftl", page, getModel());
}
public void newActionPage() throws IOException, TemplateException {
logger.info("Generating a new action page");
- String page = getFaceletPath( this.projectProps.getWorkspaceHome(),
- this.projectName, this.pageName, this.projectProps.getWtp());
+ String page = getFaceletPath( projectProps.getWorkspaceHome(),
+ projectName, pageName, projectProps.getWtp());
generateFile("action-page.ftl", page, getModel());
}
public void newEditPage() throws IOException, TemplateException {
logger.info("Generating a new edit page");
- String page = getFaceletPath( this.projectProps.getWorkspaceHome(),
- this.projectName, this.pageName, this.projectProps.getWtp());
+ String page = getFaceletPath( projectProps.getWorkspaceHome(),
+ projectName, pageName, projectProps.getWtp());
generateFile("edit-page.ftl", page, getModel());
}
public void newListPage() throws IOException, TemplateException {
- logger.info("Generating a new edit page");
- String page = getFaceletPath( this.projectProps.getWorkspaceHome(),
- this.projectName, this.masterPageName, this.projectProps.getWtp());
+ logger.info("Generating a new list page");
+ String page = getFaceletPath( projectProps.getWorkspaceHome(),
+ projectName, masterPageName, projectProps.getWtp());
generateFile("list-page.ftl", page, getModel());
}
public void newFormPage() throws IOException, TemplateException {
logger.info("Generating a new form page");
- String page = getFaceletPath( this.projectProps.getWorkspaceHome(),
- this.projectName, this.pageName, this.projectProps.getWtp());
+ String page = getFaceletPath( projectProps.getWorkspaceHome(),
+ projectName, pageName, projectProps.getWtp());
generateFile("form-page.ftl", page, getModel());
}
public void newConversationPage() throws IOException, TemplateException {
logger.info("Generating a new conversation page");
- String page = getFaceletPath( this.projectProps.getWorkspaceHome(),
- this.projectName, this.pageName, this.projectProps.getWtp());
+ String page = getFaceletPath( projectProps.getWorkspaceHome(),
+ projectName, pageName, projectProps.getWtp());
generateFile("conversation-page.ftl", page, getModel());
}
1.5 +50 -51 jboss-seam/src/gen/org/jboss/seam/tool/JavaClassGenerator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JavaClassGenerator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/gen/org/jboss/seam/tool/JavaClassGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- JavaClassGenerator.java 3 Nov 2006 03:46:16 -0000 1.4
+++ JavaClassGenerator.java 3 Nov 2006 04:29:21 -0000 1.5
@@ -40,34 +40,33 @@
public JavaClassGenerator() {};
public JavaClassGenerator(String[] args) throws IOException {
- this.projectName = args[1];
- this.actionName = args[2];
- this.interfaceName = args[2];
- //make the component name same as action name but first char lower case
- this.componentName = this.actionName.substring(0,1).toLowerCase() + this.actionName.substring(1);
+ projectName = args[1];
+ actionName = args[2];
+ interfaceName = actionName;
+ componentName = lower(actionName);
}
private HashMap getModel() throws IOException {
HashMap map = new HashMap();
- map.put("projectName", this.projectName);
- map.put("actionName", this.actionName);
- map.put("componentName", this.componentName);
- map.put("interfaceName", this.interfaceName);
- map.put("packageName", this.projectProps.getActionPackage());
- map.put("testPackageName", this.projectProps.getTestPackage());
- map.put("mdbPackage", this.projectProps.getMdbPackage());
- map.put("entityPackage", this.projectProps.getModelPackage());
+ map.put("projectName", projectName);
+ map.put("actionName", actionName);
+ map.put("componentName", componentName);
+ map.put("interfaceName", interfaceName);
+ map.put("packageName", projectProps.getActionPackage());
+ map.put("testPackageName", projectProps.getTestPackage());
+ map.put("mdbPackage", projectProps.getMdbPackage());
+ map.put("entityPackage", projectProps.getModelPackage());
return map;
}
public void newStatefulAction() throws IOException, TemplateException {
logger.info("Generating a new SFSB and interface");
- String sfsbAction = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.actionName+"Action", this.projectProps.getWtp());
- String sfsbInterface = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.interfaceName, this.projectProps.getWtp());
+ String sfsbAction = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ actionName+"Action", projectProps.getWtp());
+ String sfsbInterface = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ interfaceName, projectProps.getWtp());
generateFile("CreateSFSBAction.ftl", sfsbAction, getModel());
generateFile("CreateSFSBInterface.ftl", sfsbInterface, getModel());
@@ -75,12 +74,12 @@
public void newStatelessAction() throws IOException, TemplateException {
logger.info("Generating a new SLSB and interface");
- String slsbAction = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.actionName+"Action", this.projectProps.getWtp());
- String slsbInterface = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.interfaceName, this.projectProps.getWtp());
+ String slsbAction = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ actionName+"Action", projectProps.getWtp());
+ String slsbInterface = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ interfaceName, projectProps.getWtp());
generateFile("CreateSLSBAction.ftl", slsbAction, getModel());
generateFile("CreateInterface.ftl", slsbInterface, getModel());
@@ -88,12 +87,12 @@
public void newConversation() throws IOException, TemplateException {
logger.info("Generating a new SFSB and interface");
- String sfsbAction = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.actionName+"Action", this.projectProps.getWtp());
- String sfsbInterface = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.interfaceName, this.projectProps.getWtp());
+ String sfsbAction = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ actionName+"Action", projectProps.getWtp());
+ String sfsbInterface = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ interfaceName, projectProps.getWtp());
generateFile("CreateSFSBConversation.ftl", sfsbAction, getModel());
generateFile("CreateInterfaceConversation.ftl", sfsbInterface, getModel());
@@ -101,13 +100,13 @@
public void newTestcase() throws IOException, TemplateException {
logger.info("Generating a new TestNG test case");
- String testAction = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getTestDir(),
- this.actionName+"Test", this.projectProps.getWtp());
-
- String testNgXml = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getTestDir(),
- this.actionName+"Test", this.projectProps.getWtp(), true);
+ String testAction = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getTestDir(),
+ actionName+"Test", projectProps.getWtp());
+
+ String testNgXml = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getTestDir(),
+ actionName+"Test", projectProps.getWtp(), true);
generateFile("TestCase.ftl", testAction, getModel());
generateFile("testng.ftl", testNgXml, getModel());
@@ -115,27 +114,27 @@
public void newEntity() throws IOException, TemplateException {
logger.info("Generating a new entity bean");
- String entity = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getModelDir(),
- this.actionName, this.projectProps.getWtp());
+ String entity = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getModelDir(),
+ actionName, projectProps.getWtp());
generateFile("Entity.ftl", entity, getModel());
}
public void newEntityHome() throws IOException, TemplateException {
logger.info("Generating a new EntityHome");
- String entity = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.actionName + "Home", this.projectProps.getWtp());
+ String entity = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ actionName + "Home", projectProps.getWtp());
generateFile("EntityHome.ftl", entity, getModel());
}
public void newEntityList() throws IOException, TemplateException {
logger.info("Generating a new EntityList");
- String entity = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getActionDir(),
- this.actionName + "List", this.projectProps.getWtp());
+ String entity = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getActionDir(),
+ actionName + "List", projectProps.getWtp());
generateFile("EntityList.ftl", entity, getModel());
}
@@ -143,11 +142,11 @@
public void newMdb() throws IOException, TemplateException {
logger.info("Generating a new MDB");
HashMap model = getModel();
- String mdb = getJavaFilePath(this.projectProps.getWorkspaceHome(),
- this.projectName, this.projectProps.getMdbDir(),
- this.actionName, this.projectProps.getWtp());
- model.put("destination", this.mdbDestination);
- model.put("destinationType", this.mdbDestinationType);
+ String mdb = getJavaFilePath(projectProps.getWorkspaceHome(),
+ projectName, projectProps.getMdbDir(),
+ actionName, projectProps.getWtp());
+ model.put("destination", mdbDestination);
+ model.put("destinationType", mdbDestinationType);
generateFile("Mdb.ftl", mdb, model);
}
More information about the jboss-cvs-commits
mailing list