Skip to content

Commit ef2da8a

Browse files
committed
Merge pull request #896 from abersnaze/observable-string-remove-7
removing java 7 dep
2 parents 89ff375 + 945e0ce commit ef2da8a

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

rxjava-contrib/rxjava-string/src/main/java/rx/observables/StringObservable.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.nio.charset.CoderResult;
2828
import java.nio.charset.CodingErrorAction;
2929
import java.util.Arrays;
30-
import java.util.Objects;
3130
import java.util.regex.Pattern;
3231

3332
import rx.Observable;
@@ -461,14 +460,23 @@ public String getText() {
461460

462461
@Override
463462
public int hashCode() {
464-
return Objects.hash(number, text);
463+
int result = 31 + number;
464+
result = 31 * result + (text == null ? 0 : text.hashCode());
465+
return result;
465466
}
466467

467468
@Override
468469
public boolean equals(Object obj) {
469470
if (!(obj instanceof Line))
470471
return false;
471-
return Objects.equals(number, ((Line) obj).number) && Objects.equals(text, ((Line) obj).text);
472+
Line other = (Line) obj;
473+
if (number != other.number)
474+
return false;
475+
if (other.text == text)
476+
return true;
477+
if (text == null)
478+
return false;
479+
return text.equals(other.text);
472480
}
473481

474482
@Override

0 commit comments

Comments
 (0)