eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 11:23:50 +00:00
Code Activity

Placemark toString problem solved

Browse Source
This commit is contained in:
Lennart Hensler committed 2012-01-18 14:03:33 +01:00
1 parent 276278b07d
commit 849df66d9c
2 files changed
+78 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java
+51 -50
View File
@@ -72,56 +72,57 @@ public class PlacemarkImpl implements Placemark {
// public String getCountryName() {
// return CountryCodeFactory.INSTANCE.getFromTwoLetterISOName(countryCode).getName();
// }
//
// @Override
// public String toString() {
// StringBuilder b = new StringBuilder(Placemark.class.getSimpleName() + "[");
// b.append(name + ", ");
// b.append(countryCode + ", ");
// b.append(position.toString() + ", ");
// b.append(population + "]");
//
// return b.toString();
// }
@Override
public String toString() {
StringBuilder b = new StringBuilder();
b.append(name + ", ");
b.append(countryCode + ", ");
b.append(position.toString() + ", ");
b.append(population);
return b.toString();
}
// @Override
// public int hashCode() {
// final int prime = 31;
// int result = 1;
// result = prime * result + ((countryCode == null) ? 0 : countryCode.hashCode());
// result = prime * result + ((name == null) ? 0 : name.hashCode());
// result = prime * result + (int) (population ^ (population >>> 32));
// result = prime * result + ((position == null) ? 0 : position.hashCode());
// return result;
// }
//
// @Override
// public boolean equals(Object obj) {
// if (this == obj)
// return true;
// if (obj == null)
// return false;
// if (getClass() != obj.getClass())
// return false;
// PlacemarkImpl other = (PlacemarkImpl) obj;
// if (countryCode == null) {
// if (other.countryCode != null)
// return false;
// } else if (!countryCode.equals(other.countryCode))
// return false;
// if (name == null) {
// if (other.name != null)
// return false;
// } else if (!name.equals(other.name))
// return false;
// if (population != other.population)
// return false;
// if (position == null) {
// if (other.position != null)
// return false;
// } else if (!position.equals(other.position))
// return false;
// return true;
// }
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((countryCode == null) ? 0 : countryCode.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + (int) (population ^ (population >>> 32));
result = prime * result + ((position == null) ? 0 : position.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
PlacemarkImpl other = (PlacemarkImpl) obj;
if (countryCode == null) {
if (other.countryCode != null)
return false;
} else if (!countryCode.equals(other.countryCode))
return false;
if (name == null) {
if (other.name != null)
return false;
} else if (!name.equals(other.name))
return false;
if (population != other.population)
return false;
if (position == null) {
if (other.position != null)
return false;
} else if (!position.equals(other.position))
return false;
return true;
}
}
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/SerializablePositionImpl.java
+27 -27
View File
@@ -27,32 +27,32 @@ public class SerializablePositionImpl implements SerializablePosition {
return "(" + latDeg + ", " + lngDeg + ")";
}
// @Override
// public int hashCode() {
// final int prime = 31;
// int result = 1;
// long temp;
// temp = (int) latDeg;
// result = prime * result + (int) (temp ^ (temp >>> 32));
// temp = (int) latDeg;
// result = prime * result + (int) (temp ^ (temp >>> 32));
// return result;
// }
//
// @Override
// public boolean equals(Object obj) {
// if (this == obj)
// return true;
// if (obj == null)
// return false;
// if (getClass() != obj.getClass())
// return false;
// SerializablePositionImpl other = (SerializablePositionImpl) obj;
// if (!new Double(latDeg).equals(other.latDeg))
// return false;
// if (!new Double(lngDeg).equals(other.lngDeg))
// return false;
// return true;
// }
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
long temp;
temp = (int) latDeg;
result = prime * result + (int) (temp ^ (temp >>> 32));
temp = (int) latDeg;
result = prime * result + (int) (temp ^ (temp >>> 32));
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
SerializablePositionImpl other = (SerializablePositionImpl) obj;
if (!new Double(latDeg).equals(other.latDeg))
return false;
if (!new Double(lngDeg).equals(other.lngDeg))
return false;
return true;
}
}