fix(java): Fix name conflicts. (stellar#161)

lib/xdrgen/generators/java.rb

@@ -348,7 +348,7 @@ def render_struct(struct, out)
           out.indent do
             out.puts "#{name struct} val = new #{name struct}();"
             struct.members.map { |m|
-              out.puts "val.set#{m.name.slice(0,1).capitalize+m.name.slice(1..-1)}(#{m.name});"
+              out.puts "val.set#{m.name.slice(0,1).capitalize+m.name.slice(1..-1)}(this.#{m.name});"
             }
             out.puts "return val;"
           end
@@ -497,7 +497,7 @@ def render_union(union, out)
             out.puts "val.setDiscriminant(discriminant);"
             union.arms.each do |arm|
               next if arm.void?
-              out.puts "val.set#{arm.name.slice(0,1).capitalize+arm.name.slice(1..-1)}(#{arm.name});"
+              out.puts "val.set#{arm.name.slice(0,1).capitalize+arm.name.slice(1..-1)}(this.#{arm.name});"
             end
             out.puts "return val;"
           end

spec/output/generator_spec_java/nesting.x/MyUnion.java

@@ -75,8 +75,8 @@ public Builder two(MyUnionTwo two) {
     public MyUnion build() {
       MyUnion val = new MyUnion();
       val.setDiscriminant(discriminant);
-      val.setOne(one);
-      val.setTwo(two);
+      val.setOne(this.one);
+      val.setTwo(this.two);
       return val;
     }
   }
@@ -173,7 +173,7 @@ public Builder someInt(Integer someInt) {
 
       public MyUnionOne build() {
         MyUnionOne val = new MyUnionOne();
-        val.setSomeInt(someInt);
+        val.setSomeInt(this.someInt);
         return val;
       }
     }
@@ -238,8 +238,8 @@ public Builder foo(Foo foo) {
 
       public MyUnionTwo build() {
         MyUnionTwo val = new MyUnionTwo();
-        val.setSomeInt(someInt);
-        val.setFoo(foo);
+        val.setSomeInt(this.someInt);
+        val.setFoo(this.foo);
         return val;
       }
     }

spec/output/generator_spec_java/optional.x/HasOptions.java

@@ -116,9 +116,9 @@ public Builder thirdOption(Arr thirdOption) {
 
     public HasOptions build() {
       HasOptions val = new HasOptions();
-      val.setFirstOption(firstOption);
-      val.setSecondOption(secondOption);
-      val.setThirdOption(thirdOption);
+      val.setFirstOption(this.firstOption);
+      val.setSecondOption(this.secondOption);
+      val.setThirdOption(this.thirdOption);
       return val;
     }
   }

spec/output/generator_spec_java/struct.x/MyStruct.java

@@ -128,11 +128,11 @@ public Builder maxString(XdrString maxString) {
 
     public MyStruct build() {
       MyStruct val = new MyStruct();
-      val.setSomeInt(someInt);
-      val.setABigInt(aBigInt);
-      val.setSomeOpaque(someOpaque);
-      val.setSomeString(someString);
-      val.setMaxString(maxString);
+      val.setSomeInt(this.someInt);
+      val.setABigInt(this.aBigInt);
+      val.setSomeOpaque(this.someOpaque);
+      val.setSomeString(this.someString);
+      val.setMaxString(this.maxString);
       return val;
     }
   }

spec/output/generator_spec_java/test.x/HasStuff.java

@@ -60,7 +60,7 @@ public Builder data(LotsOfMyStructs data) {
 
     public HasStuff build() {
       HasStuff val = new HasStuff();
-      val.setData(data);
+      val.setData(this.data);
       return val;
     }
   }

spec/output/generator_spec_java/test.x/LotsOfMyStructs.java

@@ -68,7 +68,7 @@ public Builder members(MyStruct[] members) {
 
     public LotsOfMyStructs build() {
       LotsOfMyStructs val = new LotsOfMyStructs();
-      val.setMembers(members);
+      val.setMembers(this.members);
       return val;
     }
   }

spec/output/generator_spec_java/test.x/MyStruct.java

@@ -156,13 +156,13 @@ public Builder field7(Boolean field7) {
 
     public MyStruct build() {
       MyStruct val = new MyStruct();
-      val.setField1(field1);
-      val.setField2(field2);
-      val.setField3(field3);
-      val.setField4(field4);
-      val.setField5(field5);
-      val.setField6(field6);
-      val.setField7(field7);
+      val.setField1(this.field1);
+      val.setField2(this.field2);
+      val.setField3(this.field3);
+      val.setField4(this.field4);
+      val.setField5(this.field5);
+      val.setField6(this.field6);
+      val.setField7(this.field7);
       return val;
     }
   }

spec/output/generator_spec_java/test.x/Nester.java

@@ -106,9 +106,9 @@ public Builder nestedUnion(NesterNestedUnion nestedUnion) {
 
     public Nester build() {
       Nester val = new Nester();
-      val.setNestedEnum(nestedEnum);
-      val.setNestedStruct(nestedStruct);
-      val.setNestedUnion(nestedUnion);
+      val.setNestedEnum(this.nestedEnum);
+      val.setNestedStruct(this.nestedStruct);
+      val.setNestedUnion(this.nestedUnion);
       return val;
     }
   }
@@ -190,7 +190,7 @@ public Builder blah(Integer blah) {
 
       public NesterNestedStruct build() {
         NesterNestedStruct val = new NesterNestedStruct();
-        val.setBlah(blah);
+        val.setBlah(this.blah);
         return val;
       }
     }
@@ -230,7 +230,7 @@ public Builder blah2(Integer blah2) {
       public NesterNestedUnion build() {
         NesterNestedUnion val = new NesterNestedUnion();
         val.setDiscriminant(discriminant);
-        val.setBlah2(blah2);
+        val.setBlah2(this.blah2);
         return val;
       }
     }

spec/output/generator_spec_java/union.x/IntUnion.java

@@ -68,8 +68,8 @@ public Builder things(Multi[] things) {
     public IntUnion build() {
       IntUnion val = new IntUnion();
       val.setDiscriminant(discriminant);
-      val.setError(error);
-      val.setThings(things);
+      val.setError(this.error);
+      val.setThings(this.things);
       return val;
     }
   }

spec/output/generator_spec_java/union.x/MyUnion.java

@@ -69,8 +69,8 @@ public Builder things(Multi[] things) {
     public MyUnion build() {
       MyUnion val = new MyUnion();
       val.setDiscriminant(discriminant);
-      val.setError(error);
-      val.setThings(things);
+      val.setError(this.error);
+      val.setThings(this.things);
       return val;
     }
   }