Skip to content

Commit 0fddfdd

Browse files
klueverGoogle Java Core Libraries
kluever
authored and
Google Java Core Libraries
committed
s/Object object/Object obj/.
RELNOTES=n/a PiperOrigin-RevId: 747962435
1 parent 412c1bf commit 0fddfdd

14 files changed

+38
-38
lines changed

Diff for: ‎android/guava/src/com/google/common/base/Absent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public <V> Optional<V> transform(Function<? super T, V> function) {
7979
}
8080

8181
@Override
82-
public boolean equals(@Nullable Object object) {
83-
return object == this;
82+
public boolean equals(@Nullable Object obj) {
83+
return this == obj;
8484
}
8585

8686
@Override

Diff for: ‎android/guava/src/com/google/common/base/CaseFormat.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ protected String doBackward(String s) {
186186
}
187187

188188
@Override
189-
public boolean equals(@Nullable Object object) {
190-
if (object instanceof StringConverter) {
191-
StringConverter that = (StringConverter) object;
189+
public boolean equals(@Nullable Object obj) {
190+
if (obj instanceof StringConverter) {
191+
StringConverter that = (StringConverter) obj;
192192
return sourceFormat.equals(that.sourceFormat) && targetFormat.equals(that.targetFormat);
193193
}
194194
return false;

Diff for: ‎android/guava/src/com/google/common/base/Enums.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ protected String doBackward(T enumValue) {
132132
}
133133

134134
@Override
135-
public boolean equals(@Nullable Object object) {
136-
if (object instanceof StringConverter) {
137-
StringConverter<?> that = (StringConverter<?>) object;
135+
public boolean equals(@Nullable Object obj) {
136+
if (obj instanceof StringConverter) {
137+
StringConverter<?> that = (StringConverter<?>) obj;
138138
return this.enumClass.equals(that.enumClass);
139139
}
140140
return false;

Diff for: ‎android/guava/src/com/google/common/base/Function.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public interface Function<F extends @Nullable Object, T extends @Nullable Object
6262
T apply(@ParametricNullness F input);
6363

6464
/**
65-
* <i>May</i> return {@code true} if {@code object} is a {@code Function} that behaves identically
66-
* to this function.
65+
* <i>May</i> return {@code true} if {@code obj} is a {@code Function} that behaves identically to
66+
* this function.
6767
*
6868
* <p><b>Warning: do not depend</b> on the behavior of this method.
6969
*
@@ -73,5 +73,5 @@ public interface Function<F extends @Nullable Object, T extends @Nullable Object
7373
* disappear. It is best not to depend on it.
7474
*/
7575
@Override
76-
boolean equals(@Nullable Object object);
76+
boolean equals(@Nullable Object obj);
7777
}

Diff for: ‎android/guava/src/com/google/common/base/PairwiseEquivalence.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ protected int doHash(Iterable<T> iterable) {
5454
}
5555

5656
@Override
57-
public boolean equals(@Nullable Object object) {
58-
if (object instanceof PairwiseEquivalence) {
57+
public boolean equals(@Nullable Object obj) {
58+
if (obj instanceof PairwiseEquivalence) {
5959
@SuppressWarnings("unchecked")
60-
PairwiseEquivalence<Object, Object> that = (PairwiseEquivalence<Object, Object>) object;
60+
PairwiseEquivalence<Object, Object> that = (PairwiseEquivalence<Object, Object>) obj;
6161
return this.elementEquivalence.equals(that.elementEquivalence);
6262
}
6363

Diff for: ‎android/guava/src/com/google/common/base/Predicate.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ public interface Predicate<T extends @Nullable Object> {
6666
* Indicates whether another object is equal to this predicate.
6767
*
6868
* <p>Most implementations will have no reason to override the behavior of {@link Object#equals}.
69-
* However, an implementation may also choose to return {@code true} whenever {@code object} is a
69+
* However, an implementation may also choose to return {@code true} whenever {@code obj} is a
7070
* {@link Predicate} that it considers <i>interchangeable</i> with this one. "Interchangeable"
7171
* <i>typically</i> means that {@code this.apply(t) == that.apply(t)} for all {@code t} of type
7272
* {@code T}). Note that a {@code false} result from this method does not imply that the
7373
* predicates are known <i>not</i> to be interchangeable.
7474
*/
7575
@Override
76-
boolean equals(@Nullable Object object);
76+
boolean equals(@Nullable Object obj);
7777
}

Diff for: ‎android/guava/src/com/google/common/base/Present.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public <V> Optional<V> transform(Function<? super T, V> function) {
7979
}
8080

8181
@Override
82-
public boolean equals(@Nullable Object object) {
83-
if (object instanceof Present) {
84-
Present<?> other = (Present<?>) object;
82+
public boolean equals(@Nullable Object obj) {
83+
if (obj instanceof Present) {
84+
Present<?> other = (Present<?>) obj;
8585
return reference.equals(other.reference);
8686
}
8787
return false;

Diff for: ‎guava/src/com/google/common/base/Absent.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public <V> Optional<V> transform(Function<? super T, V> function) {
7979
}
8080

8181
@Override
82-
public boolean equals(@Nullable Object object) {
83-
return object == this;
82+
public boolean equals(@Nullable Object obj) {
83+
return this == obj;
8484
}
8585

8686
@Override

Diff for: ‎guava/src/com/google/common/base/CaseFormat.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ protected String doBackward(String s) {
186186
}
187187

188188
@Override
189-
public boolean equals(@Nullable Object object) {
190-
if (object instanceof StringConverter) {
191-
StringConverter that = (StringConverter) object;
189+
public boolean equals(@Nullable Object obj) {
190+
if (obj instanceof StringConverter) {
191+
StringConverter that = (StringConverter) obj;
192192
return sourceFormat.equals(that.sourceFormat) && targetFormat.equals(that.targetFormat);
193193
}
194194
return false;

Diff for: ‎guava/src/com/google/common/base/Enums.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ protected String doBackward(T enumValue) {
132132
}
133133

134134
@Override
135-
public boolean equals(@Nullable Object object) {
136-
if (object instanceof StringConverter) {
137-
StringConverter<?> that = (StringConverter<?>) object;
135+
public boolean equals(@Nullable Object obj) {
136+
if (obj instanceof StringConverter) {
137+
StringConverter<?> that = (StringConverter<?>) obj;
138138
return this.enumClass.equals(that.enumClass);
139139
}
140140
return false;

Diff for: ‎guava/src/com/google/common/base/Function.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public interface Function<F extends @Nullable Object, T extends @Nullable Object
4747
T apply(@ParametricNullness F input);
4848

4949
/**
50-
* <i>May</i> return {@code true} if {@code object} is a {@code Function} that behaves identically
51-
* to this function.
50+
* <i>May</i> return {@code true} if {@code obj} is a {@code Function} that behaves identically to
51+
* this function.
5252
*
5353
* <p><b>Warning: do not depend</b> on the behavior of this method.
5454
*
@@ -58,5 +58,5 @@ public interface Function<F extends @Nullable Object, T extends @Nullable Object
5858
* disappear. It is best not to depend on it.
5959
*/
6060
@Override
61-
boolean equals(@Nullable Object object);
61+
boolean equals(@Nullable Object obj);
6262
}

Diff for: ‎guava/src/com/google/common/base/PairwiseEquivalence.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ protected int doHash(Iterable<T> iterable) {
5454
}
5555

5656
@Override
57-
public boolean equals(@Nullable Object object) {
58-
if (object instanceof PairwiseEquivalence) {
57+
public boolean equals(@Nullable Object obj) {
58+
if (obj instanceof PairwiseEquivalence) {
5959
@SuppressWarnings("unchecked")
60-
PairwiseEquivalence<Object, Object> that = (PairwiseEquivalence<Object, Object>) object;
60+
PairwiseEquivalence<Object, Object> that = (PairwiseEquivalence<Object, Object>) obj;
6161
return this.elementEquivalence.equals(that.elementEquivalence);
6262
}
6363

Diff for: ‎guava/src/com/google/common/base/Predicate.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ public interface Predicate<T extends @Nullable Object> extends java.util.functio
6363
* Indicates whether another object is equal to this predicate.
6464
*
6565
* <p>Most implementations will have no reason to override the behavior of {@link Object#equals}.
66-
* However, an implementation may also choose to return {@code true} whenever {@code object} is a
66+
* However, an implementation may also choose to return {@code true} whenever {@code obj} is a
6767
* {@link Predicate} that it considers <i>interchangeable</i> with this one. "Interchangeable"
6868
* <i>typically</i> means that {@code this.apply(t) == that.apply(t)} for all {@code t} of type
6969
* {@code T}). Note that a {@code false} result from this method does not imply that the
7070
* predicates are known <i>not</i> to be interchangeable.
7171
*/
7272
@Override
73-
boolean equals(@Nullable Object object);
73+
boolean equals(@Nullable Object obj);
7474

7575
@Override
7676
default boolean test(@ParametricNullness T input) {

Diff for: ‎guava/src/com/google/common/base/Present.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public <V> Optional<V> transform(Function<? super T, V> function) {
7979
}
8080

8181
@Override
82-
public boolean equals(@Nullable Object object) {
83-
if (object instanceof Present) {
84-
Present<?> other = (Present<?>) object;
82+
public boolean equals(@Nullable Object obj) {
83+
if (obj instanceof Present) {
84+
Present<?> other = (Present<?>) obj;
8585
return reference.equals(other.reference);
8686
}
8787
return false;

0 commit comments

Comments
 (0)