Small cleanup - still suffering x-template duplication

Author: Brian Melton

Templates/Android/generated/BaseEntityCollectionRequestBuilder.java.tt

@@ -31,9 +31,9 @@
         return new <#=TypeRequestBuilder(c)#>(getRequestUrlWithAdditionalSegment(id), getClient(), getOptions());
     }
 <#
-var aa = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
-if (aa != null) {
-    foreach (var method in aa.MethodsAndOverloads()) {
+var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
+if (currentTypeProjection != null) {
+    foreach (var method in currentTypeProjection.MethodsAndOverloads()) {
 
         if (!method.IsBoundToCollection) {
             continue;

Templates/Android/generated/BaseEntityRequestBuilder.java.tt

@@ -107,9 +107,13 @@ if (c.AsOdcmClass() != null)
         }
 
         var parameterList = MethodParametersSignature(method);
-        if (parameterList != "") { parameterList = parameterList.Remove(0, 2); }
+
+        if (parameterList != "") {
+            parameterList = parameterList.Remove(0, 2);
+        }
+
+        if (method.IsCollection) {
 #>
-<#      if (method.IsCollection) { #>
 
     public <#=ITypeCollectionRequestBuilder(method)#> get<#=MethodName(method)#>(<#=parameterList#>) {
         return new <#=TypeCollectionRequestBuilder(method)#>(getRequestUrlWithAdditionalSegment("<#=MethodFullName(method)#>"), getClient(), null<#=MethodParametersValues(method)#>);

Templates/Android/generated/IBaseEntityCollectionRequestBuilder.java.tt

@@ -18,19 +18,22 @@
     <#=ITypeRequestBuilder(c)#> byId(final String id);
 
 <#
-var aa = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
-if (aa != null)
+var currentTypeProjection = c.AsOdcmProperty().Projection.Type.AsOdcmClass();
+if (currentTypeProjection != null)
 {
-    foreach (var method in aa.AsOdcmClass().MethodsAndOverloads()) {
+    foreach (var method in currentTypeProjection.AsOdcmClass().MethodsAndOverloads()) {
 
         if (!method.IsBoundToCollection) {
             continue;
         }
 
         var parameterList = MethodParametersSignature(method);
-        if (parameterList != "") { parameterList = parameterList.Remove(0, 2); }
+        if (parameterList != "") {
+            parameterList = parameterList.Remove(0, 2);
+        }
+
+        if (method.IsCollection) {
 #>
-<# if (method.IsCollection) { #>
 
     <#=ITypeCollectionRequestBuilder(method)#> get<#=MethodName(method)#>(<#=parameterList#>);
 <#  } else { #>

Templates/Android/generated/IBaseEntityRequestBuilder.java.tt

@@ -79,9 +79,13 @@ if (c.AsOdcmClass() != null)
         }
 
         var parameterList = MethodParametersSignature(method);
-        if (parameterList != "") { parameterList = parameterList.Remove(0, 2); }
+
+        if (parameterList != "") {
+            parameterList = parameterList.Remove(0, 2);
+        }
+
+        if (method.IsCollection) {
 #>
-<# if (method.IsCollection) { #>
 
     <#=ITypeCollectionRequestBuilder(method)#> get<#=MethodName(method)#>(<#=parameterList#>);
 <#  } else { #>