Merge remote-tracking branch 'upstream/master' into fix-no-content

Conflicts:
	samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java
This commit is contained in:
Andrew Young
2013-12-02 13:42:15 -08:00
17 changed files with 91 additions and 20 deletions

View File

@@ -10,6 +10,12 @@ public class {{classname}} {
{{#description}}/* {{{description}}} */
{{/description}}
private {{{datatype}}} {{name}} = {{{defaultValue}}};
{{#allowableValues}}{{#min}} // range from {{min}} to {{max}}
{{/min}}
//{{^min}}public enum {{name}}Enum { {{#values}} {{.}}, {{/values}} };
{{/min}}
{{/allowableValues}}
{{/vars}}
{{#vars}}