diff options
| author | Scott Barta <sbarta@google.com> | 2013-05-13 08:59:36 -0700 |
|---|---|---|
| committer | Scott Barta <sbarta@google.com> | 2013-05-13 08:59:36 -0700 |
| commit | 427f95eeb53e3ad4ef10a61d871e83a59a62aab1 (patch) | |
| tree | 93c0da3cadd7a5d6cfd031187adad86838b87021 /templates | |
| parent | cd270beaad09cee90c99f45140b772a7e65ce296 (diff) | |
| download | sdk-427f95eeb53e3ad4ef10a61d871e83a59a62aab1.zip sdk-427f95eeb53e3ad4ef10a61d871e83a59a62aab1.tar.gz sdk-427f95eeb53e3ad4ef10a61d871e83a59a62aab1.tar.bz2 | |
Fixes to Java library template so it will render correctly
Adds package name and class name to the Java library template so it
can render correctly using the same input parameters as the other
templates.
Change-Id: I706e70e8741464bb0c5d2725e7f6114e6e1cb686
Diffstat (limited to 'templates')
4 files changed, 20 insertions, 6 deletions
diff --git a/templates/projects/NewJavaLibrary/recipe.xml.ftl b/templates/projects/NewJavaLibrary/recipe.xml.ftl index e2d943a..29e5e4f 100644 --- a/templates/projects/NewJavaLibrary/recipe.xml.ftl +++ b/templates/projects/NewJavaLibrary/recipe.xml.ftl @@ -6,6 +6,6 @@ <instantiate from="build.gradle.ftl" to="${projectOut}/build.gradle" /> </#if> - <instantiate from="/src/library_package/Placeholder.java" - to="${srcOut}/Placeholder.java" /> + <instantiate from="/src/library_package/Placeholder.java.ftl" + to="${srcOut}/${className}.java" /> </recipe> diff --git a/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java b/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java deleted file mode 100644 index 016aacb..0000000 --- a/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example; - -public class Placeholder { -} diff --git a/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl b/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl new file mode 100644 index 0000000..2af8c0d --- /dev/null +++ b/templates/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl @@ -0,0 +1,4 @@ +package ${packageName}; + +public class ${className} { +} diff --git a/templates/projects/NewJavaLibrary/template.xml b/templates/projects/NewJavaLibrary/template.xml index 4a3ed90..bf2fbbd 100644 --- a/templates/projects/NewJavaLibrary/template.xml +++ b/templates/projects/NewJavaLibrary/template.xml @@ -18,6 +18,20 @@ constraints="nonempty" default="MyLibrary"/> + <parameter + id="packageName" + name="Java package name" + type="string" + constraints="nonempty" + default="com.example"/> + + <parameter + id="className" + name="Java class name" + type="string" + constraints="nonempty" + default="MyClass"/> + <globals file="globals.xml.ftl" /> <execute file="recipe.xml.ftl" /> |