Fix codegen bug: _elseif triggers generation at statement creation time

Author: csadilek

errai-codegen/src/main/java/org/jboss/errai/codegen/builder/impl/IfBlockBuilderImpl.java

@@ -69,7 +69,7 @@ public BlockBuilder<ElseBlockBuilder> if_(BooleanOperator op, Statement rhs) {
 
   @Override
   public BlockBuilder<ElseBlockBuilder> if_(BooleanOperator op, Object rhs) {
-    Statement rhsStatement = GenUtil.generate(context, rhs);
+    final Statement rhsStatement = GenUtil.generate(context, rhs);
     return if_(new BooleanExpressionBuilder(rhsStatement, op));
   }
 
@@ -113,10 +113,7 @@ public BlockBuilder<ElseBlockBuilder> elseif_(Statement lhs) {
 
   @Override
   public BlockBuilder<ElseBlockBuilder> elseif_(Statement lhs, BooleanOperator op, Statement rhs) {
-    if (lhs.getType() == null)
-      lhs.generate(context);
-
-    IfBlock elseIfBlock = new IfBlock(new BooleanExpressionBuilder(lhs, rhs, op));
+    final IfBlock elseIfBlock = new IfBlock(new BooleanExpressionBuilder(lhs, rhs, op));
     ifBlock.setElseIfBlock(elseIfBlock);
     return elseif_(elseIfBlock);
   }

errai-data-binding/src/main/java/org/jboss/errai/databinding/rebind/BindableProxyGenerator.java

@@ -428,7 +428,7 @@ private Statement generateDeepUnwrapMethodBody(final String methodName) {
                     )
                 )
               .finish()
-              .elseif_(Bool.expr(Stmt.invokeStatic(BindableProxyFactory.class, "isBindableType", target().invoke(readMethod))))
+              .elseif_(Stmt.invokeStatic(BindableProxyFactory.class, "isBindableType", target().invoke(readMethod)))
               .append(Stmt.loadVariable(cloneVar).invoke(writeMethod,
                       Cast.to (
                           readMethod.getReturnType(),

errai-marshalling/src/main/java/org/jboss/errai/marshalling/rebind/MarshallerGeneratorFactory.java

@@ -247,8 +247,8 @@ private ElseBlockBuilder generateGetMarshallerHelperMethods() {
         elseBlockBuilder = If.objEquals(Stmt.loadLiteral(typeName), Stmt.loadVariable("a0")).append(stmt).finish();
       }
       else {
-        elseBlockBuilder = elseBlockBuilder.elseif_(Stmt.create(Context.create().addVariable("a0", String.class))
-                .loadLiteral(typeName).invoke("equals", Stmt.loadVariable("a0"))).append(stmt).finish();
+        elseBlockBuilder = elseBlockBuilder.elseif_(Stmt.loadLiteral(typeName).invoke("equals", 
+                Stmt.loadVariable("a0"))).append(stmt).finish();
       }
 
       typeIndex += 1;