Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-19 18:21:00 +02:00
Code Issues Projects Releases Wiki Activity

Change TimeKeeper.toString()

Browse Source 
Simplifies TimeKeeper.equals()
This commit is contained in:
Fuzzlemann 2017-08-02 01:30:32 +02:00
parent 53cd34978b
commit f705877cbc
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Plan/src/main/java/com/djrapitops/plan/data/time/TimeKeeper.java
View File

@ -117,26 +117,6 @@ public abstract class TimeKeeper {
return times;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TimeKeeper that = (TimeKeeper) o;
if (lastStateChange != that.lastStateChange) return false;
if (times != null ? !times.equals(that.times) : that.times != null) return false;
return state != null ? state.equals(that.state) : that.state == null;
}
@Override
public int hashCode() {
int result = times != null ? times.hashCode() : 0;
result = 31 * result + (state != null ? state.hashCode() : 0);
result = 31 * result + (int) (lastStateChange ^ (lastStateChange >>> 32));
return result;
}
public void setState(String state) {
this.state = state;
}
@ -153,10 +133,32 @@ public abstract class TimeKeeper {
return lastStateChange;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TimeKeeper that = (TimeKeeper) o;
return lastStateChange == that.lastStateChange &&
times != null ? times.equals(that.times) : that.times == null
&& state != null ? state.equals(that.state) : that.state == null;
}
@Override
public int hashCode() {
int result = times != null ? times.hashCode() : 0;
result = 31 * result + (state != null ? state.hashCode() : 0);
result = 31 * result + (int) (lastStateChange ^ (lastStateChange >>> 32));
return result;
}
@Override
public String toString() {
return "times:" + times +
",state:" + state +
",lastStateChange:" + lastStateChange;
return "TimeKeeper{" +
"times=" + times +
", state='" + state + '\'' +
", lastStateChange=" + lastStateChange +
'}';
}
}