* hashcode now uses Objects.hash
* equals new uses and Object.equals
* toString now avoids a useless new String()
Change-Id: Ib409d1eee45a17b917f334d93e52a6845bcd2954
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/82308
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Hudson CI
@Override
public String toString() {
@Override
public String toString() {
- return new String("[" + String.valueOf(fStart) + ", " + String.valueOf(fEnd) + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return '[' + String.valueOf(fStart) + ", " + String.valueOf(fEnd) + ']'; //$NON-NLS-1$
}
@Override
public int hashCode() {
}
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + fDepth;
- result = prime * result + (int) (fEnd ^ (fEnd >>> 32));
- ICalledFunction parent = fParent;
- result = prime * result + ((parent == null) ? 0 : parent.hashCode());
- result = prime * result + (int) (fSelfTime ^ (fSelfTime >>> 32));
- result = prime * result + (int) (fStart ^ (fStart >>> 32));
- result = prime * result + getSymbol().hashCode();
- return result;
+ return Objects.hash(fDepth, fEnd, fParent, fSelfTime, fStart, getSymbol());
if (fEnd != other.fEnd) {
return false;
}
if (fEnd != other.fEnd) {
return false;
}
- if (fParent == null) {
- if (other.fParent != null) {
- return false;
- }
- } else if (!Objects.equals(fParent, other.fParent)) {
- return false;
- }
if (fSelfTime != other.fSelfTime) {
return false;
}
if (fStart != other.fStart) {
return false;
}
if (fSelfTime != other.fSelfTime) {
return false;
}
if (fStart != other.fStart) {
return false;
}
+ if (!Objects.equals(fParent, other.getParent())) {
+ return false;
+ }
if (!Objects.equals(getSymbol(), other.getSymbol())) {
return false;
}
if (!Objects.equals(getSymbol(), other.getSymbol())) {
return false;
}