From 9592863205192fbb26bcb91eda45b3d28158c53e Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 27 Nov 2013 11:43:39 +0100 Subject: [PATCH] added toString() to fix types --- .../sap/sailing/domain/igtimiadapter/datatypes/AWA.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/AWS.java | 5 +++++ .../sailing/domain/igtimiadapter/datatypes/AntCbst.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/AntHrm.java | 5 +++++ .../domain/igtimiadapter/datatypes/BatteryLevel.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/COG.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/File.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/Fix.java | 7 +++++++ .../domain/igtimiadapter/datatypes/GpsAltitude.java | 5 +++++ .../sailing/domain/igtimiadapter/datatypes/GpsLatLong.java | 5 +++++ .../domain/igtimiadapter/datatypes/GpsQualityHdop.java | 5 +++++ .../igtimiadapter/datatypes/GpsQualityIndicator.java | 5 +++++ .../domain/igtimiadapter/datatypes/GpsQualitySatCount.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/HDG.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/HDGM.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/SOG.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/datatypes/STW.java | 5 +++++ .../sap/sailing/domain/igtimiadapter/impl/SensorImpl.java | 5 +++++ 18 files changed, 92 insertions(+) diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java index 0cc7b9869bd..4ac9cb98c72 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWA.java @@ -24,4 +24,9 @@ public class AWA extends Fix { public Bearing getApparentWindAngle() { return apparentWindAngle; } + + @Override + protected String localToString() { + return "AWA: "+getApparentWindAngle(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java index dc5907db40b..bf4674047d5 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AWS.java @@ -24,4 +24,9 @@ public class AWS extends Fix { public Speed getApparentWindSpeed() { return apparentWindSpeed; } + + @Override + protected String localToString() { + return "AWS: "+getApparentWindSpeed(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntCbst.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntCbst.java index 562781bb8f3..9547d7a93d1 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntCbst.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntCbst.java @@ -22,4 +22,9 @@ public class AntCbst extends Fix { public int getCadence() { return cadence; } + + @Override + public String localToString() { + return "Cadence "+getCadence(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntHrm.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntHrm.java index 10dab493833..ff9ea0bfae5 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntHrm.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/AntHrm.java @@ -22,4 +22,9 @@ public class AntHrm extends Fix { public int getHeartRate() { return heartRate; } + + @Override + protected String localToString() { + return "heart rate "+getHeartRate()+"/min"; + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/BatteryLevel.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/BatteryLevel.java index af8ad3cb20d..54ed09e509e 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/BatteryLevel.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/BatteryLevel.java @@ -16,4 +16,9 @@ public class BatteryLevel extends Fix { public double getPercentage() { return percentage; } + + @Override + protected String localToString() { + return "Battery: "+getPercentage()+"%"; + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java index 39276778d6f..15e24a2743b 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/COG.java @@ -24,4 +24,9 @@ public class COG extends Fix { public Bearing getCourseOverGround() { return courseOverGround; } + + @Override + protected String localToString() { + return "COG: "+getCourseOverGround(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/File.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/File.java index 4d7b202e016..b60752dce97 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/File.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/File.java @@ -46,4 +46,9 @@ public class File extends Fix { public long getSize() { return size; } + + @Override + protected String localToString() { + return "File: "+getFileName()+", MD5: "+getMd5()+" content type "+getContentType()+", "+getSize()+" bytes"; + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/Fix.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/Fix.java index bf03dbd6511..165ac1b5f5e 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/Fix.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/Fix.java @@ -20,4 +20,11 @@ public abstract class Fix { public Sensor getSensor() { return sensor; } + + abstract protected String localToString(); + + @Override + public String toString() { + return localToString() + " at "+getTimePoint()+" from "+getSensor(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java index d6ae2a8ba64..a3e302f7748 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsAltitude.java @@ -18,4 +18,9 @@ public class GpsAltitude extends Fix { public Distance getAltitude() { return altitude; } + + @Override + protected String localToString() { + return "Altitude "+getAltitude(); + } } \ No newline at end of file diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsLatLong.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsLatLong.java index 2de762131ad..95696d45d90 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsLatLong.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsLatLong.java @@ -18,4 +18,9 @@ public class GpsLatLong extends Fix { public Position getPosition() { return position; } + + @Override + protected String localToString() { + return position.toString(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java index 44d43be8c96..ed0604a3f0a 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityHdop.java @@ -18,4 +18,9 @@ public class GpsQualityHdop extends Fix { public Distance getHdop() { return hdop; } + + @Override + protected String localToString() { + return "HDOP: "+getHdop(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityIndicator.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityIndicator.java index 680c535bc31..7fa40771aa9 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityIndicator.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualityIndicator.java @@ -16,4 +16,9 @@ public class GpsQualityIndicator extends Fix { public int getQuality() { return quality; } + + @Override + protected String localToString() { + return "GPS Quality: "+getQuality(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualitySatCount.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualitySatCount.java index 5f05934d317..6540bd6dfc9 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualitySatCount.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/GpsQualitySatCount.java @@ -16,4 +16,9 @@ public class GpsQualitySatCount extends Fix { public int getSatCount() { return satCount; } + + @Override + protected String localToString() { + return ""+getSatCount()+" satellites"; + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java index 37d00d842ca..129a67cd701 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDG.java @@ -24,4 +24,9 @@ public class HDG extends Fix { public Bearing getTrueHeading() { return trueHeading; } + + @Override + protected String localToString() { + return "HDG: "+getTrueHeading(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java index 80a27ecf08b..397e0686ef1 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/HDGM.java @@ -24,4 +24,9 @@ public class HDGM extends Fix { public Bearing getMagnetigHeading() { return magnetigHeading; } + + @Override + protected String localToString() { + return "HDGM: "+getMagnetigHeading(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java index aaac2158e85..ac98bbb9ca0 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/SOG.java @@ -24,4 +24,9 @@ public class SOG extends Fix { public Speed getSpeedOverGround() { return speedOverGround; } + + @Override + protected String localToString() { + return "SOG: "+getSpeedOverGround(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java index 083969d0aba..5e3f8637867 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/datatypes/STW.java @@ -24,4 +24,9 @@ public class STW extends Fix { public Speed getSpeedThroughWater() { return speedThroughWater; } + + @Override + protected String localToString() { + return "STW: "+getSpeedThroughWater(); + } } diff --git a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/impl/SensorImpl.java b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/impl/SensorImpl.java index f4a5c6b2f2c..a0a734adbea 100755 --- a/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/impl/SensorImpl.java +++ b/java/com.sap.sailing.domain.igtimiadapter/src/com/sap/sailing/domain/igtimiadapter/impl/SensorImpl.java @@ -20,6 +20,11 @@ public class SensorImpl implements Sensor { public String getDeviceId() { return deviceId; } + + @Override + public String toString() { + return "Transmitter "+getTransmitterId()+(getDeviceId()==null?"":(", device "+getDeviceId())); + } @Override public int hashCode() {