From 276278b07d1831f730bbb040ec92140a6ca8d1b1 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 18 Jan 2012 12:07:54 +0100 Subject: [PATCH] Problem localized in AbstractBearing (use of doubleToLongBits) --- .../sap/sailing/domain/common/impl/PlacemarkImpl.java | 10 +++++----- .../domain/common/impl/SerializablePositionImpl.java | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java index 9cc404de800..9c24ed9390b 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PlacemarkImpl.java @@ -48,10 +48,10 @@ public class PlacemarkImpl implements Placemark { public String getCountryCode() { return countryCode; } -// -// public Position getPosition() { -// return position.getPosition(); -// } + + public Position getPosition() { + return position.getPosition(); + } public long getPopulation() { return population; @@ -83,7 +83,7 @@ public class PlacemarkImpl implements Placemark { // // return b.toString(); // } -// + // @Override // public int hashCode() { // final int prime = 31; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/SerializablePositionImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/SerializablePositionImpl.java index 0f4082ba6c5..9b4f1475c3e 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/SerializablePositionImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/SerializablePositionImpl.java @@ -18,7 +18,8 @@ public class SerializablePositionImpl implements SerializablePosition { @Override public Position getPosition() { - return new DegreePosition(latDeg, lngDeg); +// return new DegreePosition(latDeg, lngDeg); + return null; } @Override @@ -31,9 +32,9 @@ public class SerializablePositionImpl implements SerializablePosition { // final int prime = 31; // int result = 1; // long temp; -// temp = Double.doubleToLongBits(latDeg); +// temp = (int) latDeg; // result = prime * result + (int) (temp ^ (temp >>> 32)); -// temp = Double.doubleToLongBits(lngDeg); +// temp = (int) latDeg; // result = prime * result + (int) (temp ^ (temp >>> 32)); // return result; // } @@ -47,9 +48,9 @@ public class SerializablePositionImpl implements SerializablePosition { // if (getClass() != obj.getClass()) // return false; // SerializablePositionImpl other = (SerializablePositionImpl) obj; -// if (Double.doubleToLongBits(latDeg) != Double.doubleToLongBits(other.latDeg)) +// if (!new Double(latDeg).equals(other.latDeg)) // return false; -// if (Double.doubleToLongBits(lngDeg) != Double.doubleToLongBits(other.lngDeg)) +// if (!new Double(lngDeg).equals(other.lngDeg)) // return false; // return true; // }