From af74365e311eb55936049bed6efa0d2f3af1ece2 Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Thu, 6 Feb 2014 13:39:50 +0000 Subject: [PATCH] Rename to avoid clashing with parameter names git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1565245 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/commons/lang3/builder/DiffBuilder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java index ee85272ee..8c71b3590 100644 --- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java @@ -68,8 +68,8 @@ public class DiffBuilder implements Builder { private final List> diffs; private final boolean objectsTriviallyEqual; - private final Object lhs; - private final Object rhs; + private final Object left; + private final Object right; private final ToStringStyle style; /** @@ -103,8 +103,8 @@ public class DiffBuilder implements Builder { } this.diffs = new ArrayList>(); - this.lhs = lhs; - this.rhs = rhs; + this.left = lhs; + this.right = rhs; this.style = style; // Don't compare any fields if objects equal @@ -908,7 +908,7 @@ public class DiffBuilder implements Builder { */ @Override public DiffResult build() { - return new DiffResult(lhs, rhs, diffs, style); + return new DiffResult(left, right, diffs, style); } }