updated templar, use functionAdd

synapticloop · Aug 17, 2015 · 62ed04b · 62ed04b
1 parent c276cb3
commit 62ed04b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/dist/h2zero.jar b/dist/h2zero.jar
diff --git a/dist/h2zero.zip b/dist/h2zero.zip
diff --git a/lib/runtime/templar.jar b/lib/runtime/templar.jar
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -28,4 +28,4 @@ sonar.projectVersion=1.0
 sonar.language=java
 sonar.sources=src/main/java
 sonar.java.binaries="build/
-"sonar.java.libraries=lib/runtime/*.jar,lib/compile/*.jar
+sonar.java.libraries=lib/runtime/*.jar,lib/compile/*.jar
diff --git a/src/main/template/java-create-model.templar b/src/main/template/java-create-model.templar
@@ -469,7 +469,7 @@ public class {table.javaClassName} {if !table.isConstant}extends ModelBase {endi
 			{endif}
 
 			{if !table.isConstant}
-				updateHitCount({field.fieldIndex} + 1);
+				updateHitCount({fn:+[field.fieldIndex, '1']}); 
 			{endif}
 
 			return(this.{field.javaName}); 
@@ -511,7 +511,7 @@ public class {table.javaClassName} {if !table.isConstant}extends ModelBase {endi
 			{endif}
 
 			{if !table.isConstant}
-				updateHitCount({field.fieldIndex} + 1); 
+				updateHitCount({fn:+[field.fieldIndex, '1']}); 
 			{endif}
 
 			return(this.{field.javaName}); 

diff --git a/src/main/template/java-create-view-model.templar b/src/main/template/java-create-view-model.templar
@@ -61,6 +61,7 @@ public class {view.javaClassName} extends ViewBase {{{\n}
 
 	{-- Now we need the toString Method--}
 	{\n}
+		{\t}@Override{\n}
 		{\t}public String toString() {{{\n}
 		{\t}{\t}StringBuilder stringBuilder = new StringBuilder();{\n}
 
@@ -75,7 +76,6 @@ public class {view.javaClassName} extends ViewBase {{{\n}
 
 	{-- Now we need the toJsonString Method--}
 	{\n}
-		{\t}@Override{\n}
 		{\t}public String toJsonString() {{{\n}
 		{\t}{\t}StringBuilder stringBuilder = new StringBuilder();{\n}