property factory fixes (mergeFromSuperBuilder)

inferred · Dec 8, 2016 · f592eb8 · f592eb8
1 parent b1c924e
commit f592eb8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/src/main/java/org/inferred/freebuilder/processor/ListMultimapPropertyFactory.java b/src/main/java/org/inferred/freebuilder/processor/ListMultimapPropertyFactory.java
@@ -389,11 +389,10 @@ public void addMergeFromBuilder(Block code, String builder) {
 
     @Override
     public void addMergeFromSuperBuilder(Block code, String builder) {
-      code.addLine("%s(((%s) %s).%s());",
-              putAllMethod(property),
-              metadata.getGeneratedBuilder(),
-              builder,
-              getter(property));
+      code.addLine("%s(%s.%s());",
+          putAllMethod(property),
+          builder,
+          getter(property));
     }
 
     @Override

diff --git a/src/main/java/org/inferred/freebuilder/processor/ListPropertyFactory.java b/src/main/java/org/inferred/freebuilder/processor/ListPropertyFactory.java
@@ -369,8 +369,10 @@ public void addMergeFromBuilder(Block code, String builder) {
 
     @Override
     public void addMergeFromSuperBuilder(Block code, String builder) {
-      Excerpt base = new Block(code).add(builder);
-      code.addLine("%s(%s.%s());", addAllMethod(property), base, getter(property));
+      code.addLine("%s(%s.%s());",
+          addAllMethod(property),
+          builder,
+          getter(property));
     }
 
     @Override

diff --git a/src/main/java/org/inferred/freebuilder/processor/MapPropertyFactory.java b/src/main/java/org/inferred/freebuilder/processor/MapPropertyFactory.java
@@ -323,9 +323,8 @@ public void addMergeFromBuilder(Block code, String builder) {
 
     @Override
     public void addMergeFromSuperBuilder(Block code, String builder) {
-      code.addLine("%s(((%s) %s).%s());",
+      code.addLine("%s(%s.%s());",
           putAllMethod(property),
-          metadata.getGeneratedBuilder(),
           builder,
           getter(property));
     }

diff --git a/src/main/java/org/inferred/freebuilder/processor/MultisetPropertyFactory.java b/src/main/java/org/inferred/freebuilder/processor/MultisetPropertyFactory.java
@@ -331,9 +331,8 @@ public void addMergeFromBuilder(Block code, String builder) {
 
     @Override
     public void addMergeFromSuperBuilder(Block code, String builder) {
-      code.addLine("%s(((%s) %s).%s());",
+      code.addLine("%s(%s.%s());",
           addAllMethod(property),
-          metadata.getGeneratedBuilder(),
           builder,
           getter(property));
     }

diff --git a/src/main/java/org/inferred/freebuilder/processor/SetMultimapPropertyFactory.java b/src/main/java/org/inferred/freebuilder/processor/SetMultimapPropertyFactory.java
@@ -385,9 +385,8 @@ public void addMergeFromBuilder(Block code, String builder) {
 
     @Override
     public void addMergeFromSuperBuilder(Block code, String builder) {
-      code.addLine("%s(((%s) %s).%s());",
+      code.addLine("%s(%s.%s());",
           putAllMethod(property),
-          metadata.getGeneratedBuilder(),
           builder,
           getter(property));
     }

diff --git a/src/main/java/org/inferred/freebuilder/processor/SetPropertyFactory.java b/src/main/java/org/inferred/freebuilder/processor/SetPropertyFactory.java
@@ -372,9 +372,8 @@ public void addMergeFromBuilder(Block code, String builder) {
 
     @Override
     public void addMergeFromSuperBuilder(Block code, String builder) {
-      code.addLine("%s(((%s) %s).%s());",
+      code.addLine("%s(%s.%s());",
           addAllMethod(property),
-          metadata.getGeneratedBuilder(),
           builder,
           getter(property));
     }