diff --git a/common-navigation/src/main/java/slash/navigation/common/BoundingBox.java b/common-navigation/src/main/java/slash/navigation/common/BoundingBox.java
index 013e5154d..0a5c91780 100644
--- a/common-navigation/src/main/java/slash/navigation/common/BoundingBox.java
+++ b/common-navigation/src/main/java/slash/navigation/common/BoundingBox.java
@@ -136,8 +136,8 @@ public boolean equals(Object o) {
BoundingBox that = (BoundingBox) o;
- return !(!Objects.equals(northEast, that.northEast)) &&
- !(!Objects.equals(southWest, that.southWest));
+ return Objects.equals(northEast, that.northEast) &&
+ Objects.equals(southWest, that.southWest);
}
public int hashCode() {
diff --git a/common-navigation/src/main/java/slash/navigation/common/SimpleNavigationPosition.java b/common-navigation/src/main/java/slash/navigation/common/SimpleNavigationPosition.java
index 329877557..d54fec1a4 100644
--- a/common-navigation/src/main/java/slash/navigation/common/SimpleNavigationPosition.java
+++ b/common-navigation/src/main/java/slash/navigation/common/SimpleNavigationPosition.java
@@ -144,12 +144,12 @@ public boolean equals(Object o) {
SimpleNavigationPosition that = (SimpleNavigationPosition) o;
- return !(!Objects.equals(description, that.description)) &&
- !(!Objects.equals(speed, that.speed)) &&
- !(!Objects.equals(elevation, that.elevation)) &&
- !(!Objects.equals(latitude, that.latitude)) &&
- !(!Objects.equals(longitude, that.longitude)) &&
- !(!Objects.equals(time, that.time));
+ return Objects.equals(description, that.description) &&
+ Objects.equals(speed, that.speed) &&
+ Objects.equals(elevation, that.elevation) &&
+ Objects.equals(latitude, that.latitude) &&
+ Objects.equals(longitude, that.longitude) &&
+ Objects.equals(time, that.time);
}
public int hashCode() {
diff --git a/common/src/main/java/slash/common/type/ISO8601.java b/common/src/main/java/slash/common/type/ISO8601.java
index d8af1b306..c496dd2fb 100644
--- a/common/src/main/java/slash/common/type/ISO8601.java
+++ b/common/src/main/java/slash/common/type/ISO8601.java
@@ -39,7 +39,7 @@
*
* The currently supported format is:
*
- * +-YYY-MM-DDThh:mm:ss[.SSS]TZD
+ * +-YYYY-MM-DDThh:mm:ss[.SSS]TZD
*
* where:
*
diff --git a/download/src/main/java/slash/navigation/download/Checksum.java b/download/src/main/java/slash/navigation/download/Checksum.java
index 2459ddf78..71e668241 100644
--- a/download/src/main/java/slash/navigation/download/Checksum.java
+++ b/download/src/main/java/slash/navigation/download/Checksum.java
@@ -86,9 +86,9 @@ public boolean equals(Object o) {
Checksum checksum = (Checksum) o;
- return !(!Objects.equals(contentLength, checksum.contentLength)) &&
- !(!Objects.equals(lastModified, checksum.lastModified)) &&
- !(!Objects.equals(sha1, checksum.sha1));
+ return Objects.equals(contentLength, checksum.contentLength) &&
+ Objects.equals(lastModified, checksum.lastModified) &&
+ Objects.equals(sha1, checksum.sha1);
}
public int hashCode() {
diff --git a/download/src/main/java/slash/navigation/download/Download.java b/download/src/main/java/slash/navigation/download/Download.java
index 1d8538327..b9541ef9e 100644
--- a/download/src/main/java/slash/navigation/download/Download.java
+++ b/download/src/main/java/slash/navigation/download/Download.java
@@ -186,7 +186,7 @@ public boolean equals(Object o) {
Download download = (Download) o;
- return !(!Objects.equals(url, download.url));
+ return Objects.equals(url, download.url);
}
public int hashCode() {
diff --git a/geonames/src/main/java/slash/navigation/geonames/PostalCode.java b/geonames/src/main/java/slash/navigation/geonames/PostalCode.java
index 9d59a4a82..9c7bfe0dc 100644
--- a/geonames/src/main/java/slash/navigation/geonames/PostalCode.java
+++ b/geonames/src/main/java/slash/navigation/geonames/PostalCode.java
@@ -43,9 +43,9 @@ public boolean equals(Object o) {
PostalCode that = (PostalCode) o;
- return !(!Objects.equals(countryCode, that.countryCode)) &&
- !(!Objects.equals(placeName, that.placeName)) &&
- !(!Objects.equals(postalCode, that.postalCode));
+ return Objects.equals(countryCode, that.countryCode) &&
+ Objects.equals(placeName, that.placeName) &&
+ Objects.equals(postalCode, that.postalCode);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/base/GkPosition.java b/navigation-formats/src/main/java/slash/navigation/base/GkPosition.java
index 5e4b37c08..0d18cafc3 100644
--- a/navigation-formats/src/main/java/slash/navigation/base/GkPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/base/GkPosition.java
@@ -136,7 +136,7 @@ public boolean equals(Object o) {
return Double.compare(that.height, height) == 0 &&
Double.compare(that.right, right) == 0 &&
- !(!Objects.equals(description, that.description)) &&
+ Objects.equals(description, that.description) &&
!(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime());
}
diff --git a/navigation-formats/src/main/java/slash/navigation/base/MercatorPosition.java b/navigation-formats/src/main/java/slash/navigation/base/MercatorPosition.java
index 50e1d39bc..bc8b75474 100644
--- a/navigation-formats/src/main/java/slash/navigation/base/MercatorPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/base/MercatorPosition.java
@@ -123,10 +123,10 @@ public boolean equals(Object o) {
MercatorPosition that = (MercatorPosition) o;
- return !(!Objects.equals(description, that.description)) &&
+ return Objects.equals(description, that.description) &&
!(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
- !(!Objects.equals(x, that.x)) &&
- !(!Objects.equals(y, that.y)) &&
+ Objects.equals(x, that.x) &&
+ Objects.equals(y, that.y) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime());
}
diff --git a/navigation-formats/src/main/java/slash/navigation/base/SimpleRoute.java b/navigation-formats/src/main/java/slash/navigation/base/SimpleRoute.java
index 9ea8da508..c468942b3 100644
--- a/navigation-formats/src/main/java/slash/navigation/base/SimpleRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/base/SimpleRoute.java
@@ -205,7 +205,7 @@ public boolean equals(Object o) {
SimpleRoute route = (SimpleRoute) o;
- return !(!Objects.equals(name, route.name)) &&
+ return Objects.equals(name, route.name) &&
getCharacteristics().equals(route.getCharacteristics()) &&
positions.equals(route.positions);
}
diff --git a/navigation-formats/src/main/java/slash/navigation/base/Wgs84Position.java b/navigation-formats/src/main/java/slash/navigation/base/Wgs84Position.java
index 8b776df98..d3d528e88 100644
--- a/navigation-formats/src/main/java/slash/navigation/base/Wgs84Position.java
+++ b/navigation-formats/src/main/java/slash/navigation/base/Wgs84Position.java
@@ -248,16 +248,16 @@ public boolean equals(Object o) {
Wgs84Position that = (Wgs84Position) o;
- return !(!Objects.equals(description, that.description)) &&
+ return Objects.equals(description, that.description) &&
!(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
- !(!Objects.equals(heading, that.heading)) &&
- !(!Objects.equals(latitude, that.latitude)) &&
- !(!Objects.equals(longitude, that.longitude)) &&
+ Objects.equals(heading, that.heading) &&
+ Objects.equals(latitude, that.latitude) &&
+ Objects.equals(longitude, that.longitude) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime()) &&
- !(!Objects.equals(hdop, that.hdop)) &&
- !(!Objects.equals(pdop, that.pdop)) &&
- !(!Objects.equals(vdop, that.vdop)) &&
- !(!Objects.equals(satellites, that.satellites));
+ Objects.equals(hdop, that.hdop) &&
+ Objects.equals(pdop, that.pdop) &&
+ Objects.equals(vdop, that.vdop) &&
+ Objects.equals(satellites, that.satellites);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/bcr/BcrPosition.java b/navigation-formats/src/main/java/slash/navigation/bcr/BcrPosition.java
index 09fa6401b..40d0969dd 100644
--- a/navigation-formats/src/main/java/slash/navigation/bcr/BcrPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/bcr/BcrPosition.java
@@ -163,12 +163,12 @@ public boolean equals(Object o) {
BcrPosition that = (BcrPosition) o;
return altitude == that.altitude &&
- !(!Objects.equals(x, that.x)) &&
- !(!Objects.equals(y, that.y)) &&
- !(!Objects.equals(description, that.description)) &&
- !(!Objects.equals(street, that.street)) &&
- !(!Objects.equals(type, that.type)) &&
- !(!Objects.equals(zipCode, that.zipCode));
+ Objects.equals(x, that.x) &&
+ Objects.equals(y, that.y) &&
+ Objects.equals(description, that.description) &&
+ Objects.equals(street, that.street) &&
+ Objects.equals(type, that.type) &&
+ Objects.equals(zipCode, that.zipCode);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/excel/ExcelRoute.java b/navigation-formats/src/main/java/slash/navigation/excel/ExcelRoute.java
index ac92de09c..00587fc3b 100644
--- a/navigation-formats/src/main/java/slash/navigation/excel/ExcelRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/excel/ExcelRoute.java
@@ -310,8 +310,8 @@ public boolean equals(Object o) {
ExcelRoute that = (ExcelRoute) o;
return !(getName() != null ? !getName().equals(that.getName()) : that.getName() != null) &&
- !(!Objects.equals(mapping, that.mapping)) &&
- !(!Objects.equals(positions, that.positions));
+ Objects.equals(mapping, that.mapping) &&
+ Objects.equals(positions, that.positions);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanPosition.java b/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanPosition.java
index d06e8a691..b62e7e691 100644
--- a/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanPosition.java
@@ -95,8 +95,8 @@ public boolean equals(Object o) {
GarminFlightPlanPosition that = (GarminFlightPlanPosition) o;
- return !(!Objects.equals(countryCode, that.countryCode)) &&
- !(!Objects.equals(identifier, that.identifier)) &&
+ return Objects.equals(countryCode, that.countryCode) &&
+ Objects.equals(identifier, that.identifier) &&
waypointType == that.waypointType;
}
diff --git a/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanRoute.java b/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanRoute.java
index 8f09151df..3acb92548 100644
--- a/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/fpl/GarminFlightPlanRoute.java
@@ -210,8 +210,8 @@ public boolean equals(Object o) {
GarminFlightPlanRoute that = (GarminFlightPlanRoute) o;
- return !(!Objects.equals(name, that.name)) &&
- !(!Objects.equals(positions, that.positions));
+ return Objects.equals(name, that.name) &&
+ Objects.equals(positions, that.positions);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/gopal/GoPalPosition.java b/navigation-formats/src/main/java/slash/navigation/gopal/GoPalPosition.java
index 12f0d886b..a06b940a9 100644
--- a/navigation-formats/src/main/java/slash/navigation/gopal/GoPalPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/gopal/GoPalPosition.java
@@ -125,15 +125,15 @@ public boolean equals(Object o) {
GoPalPosition that = (GoPalPosition) o;
- return !(!Objects.equals(x, that.x)) &&
- !(!Objects.equals(y, that.y)) &&
- !(!Objects.equals(country, that.country)) &&
- !(!Objects.equals(zipCode, that.zipCode)) &&
- !(!Objects.equals(description, that.description)) &&
- !(!Objects.equals(suburb, that.suburb)) &&
- !(!Objects.equals(street, that.street)) &&
- !(!Objects.equals(sideStreet, that.sideStreet)) &&
- !(!Objects.equals(houseNumber, that.houseNumber));
+ return Objects.equals(x, that.x) &&
+ Objects.equals(y, that.y) &&
+ Objects.equals(country, that.country) &&
+ Objects.equals(zipCode, that.zipCode) &&
+ Objects.equals(description, that.description) &&
+ Objects.equals(suburb, that.suburb) &&
+ Objects.equals(street, that.street) &&
+ Objects.equals(sideStreet, that.sideStreet) &&
+ Objects.equals(houseNumber, that.houseNumber);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/gopal/GoPalRoute.java b/navigation-formats/src/main/java/slash/navigation/gopal/GoPalRoute.java
index 47063f8f5..83784703a 100644
--- a/navigation-formats/src/main/java/slash/navigation/gopal/GoPalRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/gopal/GoPalRoute.java
@@ -213,8 +213,8 @@ public boolean equals(Object o) {
GoPalRoute gopalRoute = (GoPalRoute) o;
- return !(!Objects.equals(name, gopalRoute.name)) &&
- !(!Objects.equals(positions, gopalRoute.positions));
+ return Objects.equals(name, gopalRoute.name) &&
+ Objects.equals(positions, gopalRoute.positions);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/gpx/GpxPosition.java b/navigation-formats/src/main/java/slash/navigation/gpx/GpxPosition.java
index 4c0686636..219188027 100644
--- a/navigation-formats/src/main/java/slash/navigation/gpx/GpxPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/gpx/GpxPosition.java
@@ -212,17 +212,17 @@ public boolean equals(Object o) {
GpxPosition that = (GpxPosition) o;
- return !(!Objects.equals(description, that.description)) &&
+ return Objects.equals(description, that.description) &&
!(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
- !(!Objects.equals(heading, that.heading)) &&
- !(!Objects.equals(temperature, that.temperature)) &&
- !(!Objects.equals(latitude, that.latitude)) &&
- !(!Objects.equals(longitude, that.longitude)) &&
+ Objects.equals(heading, that.heading) &&
+ Objects.equals(temperature, that.temperature) &&
+ Objects.equals(latitude, that.latitude) &&
+ Objects.equals(longitude, that.longitude) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime()) &&
- !(!Objects.equals(hdop, that.hdop)) &&
- !(!Objects.equals(pdop, that.pdop)) &&
- !(!Objects.equals(vdop, that.vdop)) &&
- !(!Objects.equals(satellites, that.satellites));
+ Objects.equals(hdop, that.hdop) &&
+ Objects.equals(pdop, that.pdop) &&
+ Objects.equals(vdop, that.vdop) &&
+ Objects.equals(satellites, that.satellites);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/gpx/GpxRoute.java b/navigation-formats/src/main/java/slash/navigation/gpx/GpxRoute.java
index 0a1546d4f..d97b1ad9a 100644
--- a/navigation-formats/src/main/java/slash/navigation/gpx/GpxRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/gpx/GpxRoute.java
@@ -240,8 +240,8 @@ public boolean equals(Object o) {
final GpxRoute gpxRoute = (GpxRoute) o;
- return !(!Objects.equals(description, gpxRoute.description)) &&
- !(!Objects.equals(name, gpxRoute.name)) &&
+ return Objects.equals(description, gpxRoute.description) &&
+ Objects.equals(name, gpxRoute.name) &&
getCharacteristics().equals(gpxRoute.getCharacteristics()) &&
positions.equals(gpxRoute.positions);
}
diff --git a/navigation-formats/src/main/java/slash/navigation/itn/TomTomPosition.java b/navigation-formats/src/main/java/slash/navigation/itn/TomTomPosition.java
index 4b8e4e95e..832ddf870 100644
--- a/navigation-formats/src/main/java/slash/navigation/itn/TomTomPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/itn/TomTomPosition.java
@@ -190,12 +190,12 @@ public boolean equals(Object o) {
TomTomPosition that = (TomTomPosition) o;
- return !(!Objects.equals(city, that.city)) &&
+ return Objects.equals(city, that.city) &&
!(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
- !(!Objects.equals(heading, that.heading)) &&
- !(!Objects.equals(latitude, that.latitude)) &&
- !(!Objects.equals(longitude, that.longitude)) &&
- !(!Objects.equals(reason, that.reason)) &&
+ Objects.equals(heading, that.heading) &&
+ Objects.equals(latitude, that.latitude) &&
+ Objects.equals(longitude, that.longitude) &&
+ Objects.equals(reason, that.reason) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime());
}
diff --git a/navigation-formats/src/main/java/slash/navigation/itn/TomTomRoute.java b/navigation-formats/src/main/java/slash/navigation/itn/TomTomRoute.java
index 7ed41e328..b5115d474 100644
--- a/navigation-formats/src/main/java/slash/navigation/itn/TomTomRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/itn/TomTomRoute.java
@@ -209,7 +209,7 @@ public boolean equals(Object o) {
TomTomRoute route = (TomTomRoute) o;
- return !(!Objects.equals(name, route.name)) &&
+ return Objects.equals(name, route.name) &&
getCharacteristics().equals(route.getCharacteristics()) &&
positions.equals(route.positions);
}
diff --git a/navigation-formats/src/main/java/slash/navigation/klicktel/KlickTelRoute.java b/navigation-formats/src/main/java/slash/navigation/klicktel/KlickTelRoute.java
index 16dac0992..a973079f3 100644
--- a/navigation-formats/src/main/java/slash/navigation/klicktel/KlickTelRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/klicktel/KlickTelRoute.java
@@ -223,8 +223,8 @@ public boolean equals(Object o) {
KlickTelRoute klicktelRoute = (KlickTelRoute) o;
- return !(!Objects.equals(name, klicktelRoute.name)) &&
- !(!Objects.equals(positions, klicktelRoute.positions));
+ return Objects.equals(name, klicktelRoute.name) &&
+ Objects.equals(positions, klicktelRoute.positions);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/kml/KmlPosition.java b/navigation-formats/src/main/java/slash/navigation/kml/KmlPosition.java
index 8fb730020..c0a4ed6e6 100644
--- a/navigation-formats/src/main/java/slash/navigation/kml/KmlPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/kml/KmlPosition.java
@@ -48,9 +48,9 @@ public boolean equals(Object o) {
KmlPosition that = (KmlPosition) o;
return !(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
- !(!Objects.equals(description, that.description)) &&
- !(!Objects.equals(latitude, that.latitude)) &&
- !(!Objects.equals(longitude, that.longitude)) &&
+ Objects.equals(description, that.description) &&
+ Objects.equals(latitude, that.latitude) &&
+ Objects.equals(longitude, that.longitude) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime());
}
diff --git a/navigation-formats/src/main/java/slash/navigation/kml/KmlRoute.java b/navigation-formats/src/main/java/slash/navigation/kml/KmlRoute.java
index 1ceb9feca..df5ae40f4 100644
--- a/navigation-formats/src/main/java/slash/navigation/kml/KmlRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/kml/KmlRoute.java
@@ -201,8 +201,8 @@ public boolean equals(Object o) {
final KmlRoute kmlRoute = (KmlRoute) o;
- return !(!Objects.equals(description, kmlRoute.description)) &&
- !(!Objects.equals(name, kmlRoute.name)) &&
+ return Objects.equals(description, kmlRoute.description) &&
+ Objects.equals(name, kmlRoute.name) &&
getCharacteristics().equals(kmlRoute.getCharacteristics()) &&
positions.equals(kmlRoute.positions);
}
diff --git a/navigation-formats/src/main/java/slash/navigation/lmx/NokiaLandmarkExchangeRoute.java b/navigation-formats/src/main/java/slash/navigation/lmx/NokiaLandmarkExchangeRoute.java
index f4af1dd95..7ce8bbbcf 100644
--- a/navigation-formats/src/main/java/slash/navigation/lmx/NokiaLandmarkExchangeRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/lmx/NokiaLandmarkExchangeRoute.java
@@ -223,8 +223,8 @@ public boolean equals(Object o) {
NokiaLandmarkExchangeRoute other = (NokiaLandmarkExchangeRoute) o;
- return !(!Objects.equals(name, other.name)) &&
- !(!Objects.equals(positions, other.positions));
+ return Objects.equals(name, other.name) &&
+ Objects.equals(positions, other.positions);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/mm/MagicMapsIktRoute.java b/navigation-formats/src/main/java/slash/navigation/mm/MagicMapsIktRoute.java
index ae8d9b50c..f8cd22388 100644
--- a/navigation-formats/src/main/java/slash/navigation/mm/MagicMapsIktRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/mm/MagicMapsIktRoute.java
@@ -214,8 +214,8 @@ public boolean equals(Object o) {
final MagicMapsIktRoute magicMapsIktRoute = (MagicMapsIktRoute) o;
- return !(!Objects.equals(description, magicMapsIktRoute.description)) &&
- !(!Objects.equals(name, magicMapsIktRoute.name)) &&
+ return Objects.equals(description, magicMapsIktRoute.description) &&
+ Objects.equals(name, magicMapsIktRoute.name) &&
getCharacteristics().equals(magicMapsIktRoute.getCharacteristics()) &&
positions.equals(magicMapsIktRoute.positions);
}
diff --git a/navigation-formats/src/main/java/slash/navigation/msfs/MSFSFlightPlanRoute.java b/navigation-formats/src/main/java/slash/navigation/msfs/MSFSFlightPlanRoute.java
index c662fb26b..1eeb3db62 100644
--- a/navigation-formats/src/main/java/slash/navigation/msfs/MSFSFlightPlanRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/msfs/MSFSFlightPlanRoute.java
@@ -223,8 +223,8 @@ public boolean equals(Object o) {
MSFSFlightPlanRoute other = (MSFSFlightPlanRoute) o;
- return !(!Objects.equals(name, other.name)) &&
- !(!Objects.equals(positions, other.positions));
+ return Objects.equals(name, other.name) &&
+ Objects.equals(positions, other.positions);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/nmea/NmeaPosition.java b/navigation-formats/src/main/java/slash/navigation/nmea/NmeaPosition.java
index 550154435..1e0b3c0f5 100644
--- a/navigation-formats/src/main/java/slash/navigation/nmea/NmeaPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/nmea/NmeaPosition.java
@@ -205,16 +205,16 @@ public boolean equals(Object o) {
NmeaPosition that = (NmeaPosition) o;
- return !(!Objects.equals(description, that.description)) &&
+ return Objects.equals(description, that.description) &&
!(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
- !(!Objects.equals(heading, that.heading)) &&
- !(!Objects.equals(latitude, that.latitude)) &&
- !(!Objects.equals(longitude, that.longitude)) &&
+ Objects.equals(heading, that.heading) &&
+ Objects.equals(latitude, that.latitude) &&
+ Objects.equals(longitude, that.longitude) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime()) &&
- !(!Objects.equals(hdop, that.hdop)) &&
- !(!Objects.equals(pdop, that.pdop)) &&
- !(!Objects.equals(vdop, that.vdop)) &&
- !(!Objects.equals(satellites, that.satellites)); }
+ Objects.equals(hdop, that.hdop) &&
+ Objects.equals(pdop, that.pdop) &&
+ Objects.equals(vdop, that.vdop) &&
+ Objects.equals(satellites, that.satellites); }
public int hashCode() {
int result;
diff --git a/navigation-formats/src/main/java/slash/navigation/nmn/NmnPosition.java b/navigation-formats/src/main/java/slash/navigation/nmn/NmnPosition.java
index 11966f001..e6236186a 100644
--- a/navigation-formats/src/main/java/slash/navigation/nmn/NmnPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/nmn/NmnPosition.java
@@ -112,12 +112,12 @@ public boolean equals(Object o) {
NmnPosition that = (NmnPosition) o;
- return !(!Objects.equals(description, that.description)) &&
- !(!Objects.equals(street, that.street)) &&
- !(!Objects.equals(number, that.number)) &&
+ return Objects.equals(description, that.description) &&
+ Objects.equals(street, that.street) &&
+ Objects.equals(number, that.number) &&
!(getElevation() != null ? !getElevation().equals(that.getElevation()) : that.getElevation() != null) &&
- !(!Objects.equals(latitude, that.latitude)) &&
- !(!Objects.equals(longitude, that.longitude)) &&
+ Objects.equals(latitude, that.latitude) &&
+ Objects.equals(longitude, that.longitude) &&
!(hasTime() ? !getTime().equals(that.getTime()) : that.hasTime());
}
diff --git a/navigation-formats/src/main/java/slash/navigation/ovl/OvlRoute.java b/navigation-formats/src/main/java/slash/navigation/ovl/OvlRoute.java
index a9a2ff453..3233bf85c 100644
--- a/navigation-formats/src/main/java/slash/navigation/ovl/OvlRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/ovl/OvlRoute.java
@@ -233,10 +233,10 @@ public boolean equals(Object o) {
OvlRoute ovlRoute = (OvlRoute) o;
- return !(!Objects.equals(mapLage, ovlRoute.mapLage)) &&
- !(!Objects.equals(overlay, ovlRoute.overlay)) &&
- !(!Objects.equals(positions, ovlRoute.positions)) &&
- !(!Objects.equals(symbol, ovlRoute.symbol));
+ return Objects.equals(mapLage, ovlRoute.mapLage) &&
+ Objects.equals(overlay, ovlRoute.overlay) &&
+ Objects.equals(positions, ovlRoute.positions) &&
+ Objects.equals(symbol, ovlRoute.symbol);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/tcx/TcxRoute.java b/navigation-formats/src/main/java/slash/navigation/tcx/TcxRoute.java
index 1dd2670ac..599489e96 100644
--- a/navigation-formats/src/main/java/slash/navigation/tcx/TcxRoute.java
+++ b/navigation-formats/src/main/java/slash/navigation/tcx/TcxRoute.java
@@ -203,8 +203,8 @@ public boolean equals(Object o) {
TcxRoute nokiaLandmarkExchangeRoute = (TcxRoute) o;
- return !(!Objects.equals(name, nokiaLandmarkExchangeRoute.name)) &&
- !(!Objects.equals(positions, nokiaLandmarkExchangeRoute.positions));
+ return Objects.equals(name, nokiaLandmarkExchangeRoute.name) &&
+ Objects.equals(positions, nokiaLandmarkExchangeRoute.positions);
}
public int hashCode() {
diff --git a/navigation-formats/src/main/java/slash/navigation/tour/TourPosition.java b/navigation-formats/src/main/java/slash/navigation/tour/TourPosition.java
index 733296a2d..68714cbf4 100644
--- a/navigation-formats/src/main/java/slash/navigation/tour/TourPosition.java
+++ b/navigation-formats/src/main/java/slash/navigation/tour/TourPosition.java
@@ -136,14 +136,14 @@ public boolean equals(Object o) {
TourPosition that = (TourPosition) o;
- return !(!Objects.equals(x, that.x)) &&
- !(!Objects.equals(y, that.y)) &&
- !(!Objects.equals(name, that.name)) &&
- !(!Objects.equals(zipCode, that.zipCode)) &&
- !(!Objects.equals(description, that.description)) &&
- !(!Objects.equals(street, that.street)) &&
- !(!Objects.equals(houseNo, that.houseNo)) &&
- !(!Objects.equals(nameValues, that.nameValues));
+ return Objects.equals(x, that.x) &&
+ Objects.equals(y, that.y) &&
+ Objects.equals(name, that.name) &&
+ Objects.equals(zipCode, that.zipCode) &&
+ Objects.equals(description, that.description) &&
+ Objects.equals(street, that.street) &&
+ Objects.equals(houseNo, that.houseNo) &&
+ Objects.equals(nameValues, that.nameValues);
}
public int hashCode() {
diff --git a/navigation-formats/src/test/java/slash/navigation/base/AppendIT.java b/navigation-formats/src/test/java/slash/navigation/base/AppendIT.java
index ab66d569f..00fc647ff 100644
--- a/navigation-formats/src/test/java/slash/navigation/base/AppendIT.java
+++ b/navigation-formats/src/test/java/slash/navigation/base/AppendIT.java
@@ -60,7 +60,7 @@ private void append(String testFileName, String appendFileName) throws IOExcepti
assertNotNull(appendResult.getTheRoute());
assertNotNull(appendResult.getFormat());
assertNotNull(appendResult.getAllRoutes());
- assertTrue(!appendResult.getAllRoutes().isEmpty());
+ assertFalse(appendResult.getAllRoutes().isEmpty());
int appendPositionCount = appendResult.getTheRoute().getPositionCount();
List appendPositions = appendResult.getTheRoute().getPositions();
diff --git a/navigation-formats/src/test/java/slash/navigation/base/ConvertBase.java b/navigation-formats/src/test/java/slash/navigation/base/ConvertBase.java
index 411461639..34b35f4af 100644
--- a/navigation-formats/src/test/java/slash/navigation/base/ConvertBase.java
+++ b/navigation-formats/src/test/java/slash/navigation/base/ConvertBase.java
@@ -60,7 +60,7 @@ public static void convertRoundtrip(String testFileName,
assertNotNull(result.getFormat());
assertNotNull(result.getTheRoute());
assertNotNull(result.getAllRoutes());
- assertTrue(!result.getAllRoutes().isEmpty());
+ assertFalse(result.getAllRoutes().isEmpty());
// check append
NavigationPosition sourcePosition = result.getTheRoute().getPositions().get(0);
diff --git a/navigation-formats/src/test/java/slash/navigation/base/NavigationFormatParserIT.java b/navigation-formats/src/test/java/slash/navigation/base/NavigationFormatParserIT.java
index 671a7b976..bedafe93c 100644
--- a/navigation-formats/src/test/java/slash/navigation/base/NavigationFormatParserIT.java
+++ b/navigation-formats/src/test/java/slash/navigation/base/NavigationFormatParserIT.java
@@ -44,7 +44,7 @@ ParserResult read(String testFileName) throws IOException {
ParserResult result = parser.read(source);
assertNotNull(result.getFormat());
assertNotNull(result.getAllRoutes());
- assertTrue(!result.getAllRoutes().isEmpty());
+ assertFalse(result.getAllRoutes().isEmpty());
assertNotNull("Cannot read route from " + source, result.getTheRoute());
assertTrue(result.getTheRoute().getPositionCount() > 0);
return result;
diff --git a/navigation-formats/src/test/java/slash/navigation/base/ReadIT.java b/navigation-formats/src/test/java/slash/navigation/base/ReadIT.java
index c957b37ed..bbc966c15 100644
--- a/navigation-formats/src/test/java/slash/navigation/base/ReadIT.java
+++ b/navigation-formats/src/test/java/slash/navigation/base/ReadIT.java
@@ -37,6 +37,7 @@
import static java.util.Arrays.asList;
import static java.util.Arrays.sort;
import static java.util.Collections.singletonList;
+import static junit.framework.TestCase.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static slash.common.TestCase.assertEquals;
import static slash.common.io.Files.collectFiles;
@@ -74,7 +75,7 @@ public void test(File file) throws IOException {
assertNotNull(result.getFormat());
assertNotNull("Cannot get route from " + file, result.getTheRoute());
assertNotNull(result.getAllRoutes());
- assertTrue(!result.getAllRoutes().isEmpty());
+ assertFalse(result.getAllRoutes().isEmpty());
for (BaseRoute route : result.getAllRoutes()) {
List positions = route.getPositions();
for (NavigationPosition position : positions) {
diff --git a/navigation-formats/src/test/java/slash/navigation/base/ReadWriteBase.java b/navigation-formats/src/test/java/slash/navigation/base/ReadWriteBase.java
index 9e9c7ebab..35e7492b8 100644
--- a/navigation-formats/src/test/java/slash/navigation/base/ReadWriteBase.java
+++ b/navigation-formats/src/test/java/slash/navigation/base/ReadWriteBase.java
@@ -45,7 +45,7 @@ public static void readWriteRoundtrip(String testFileName, ReadWriteTestCallback
assertNotNull(result);
assertNotNull(result.getFormat());
assertNotNull(result.getAllRoutes());
- assertTrue(!result.getAllRoutes().isEmpty());
+ assertFalse(result.getAllRoutes().isEmpty());
File target = createTempFile("target", getExtension(source));
// see AlanWaypointsAndRoutesFormat#isSupportsMultipleRoutes
diff --git a/navigation-formats/src/test/java/slash/navigation/base/SplitIT.java b/navigation-formats/src/test/java/slash/navigation/base/SplitIT.java
index 2f4809aea..8819db845 100644
--- a/navigation-formats/src/test/java/slash/navigation/base/SplitIT.java
+++ b/navigation-formats/src/test/java/slash/navigation/base/SplitIT.java
@@ -52,7 +52,7 @@ private void splitReadWriteRoundtrip(String testFileName, boolean duplicateFirst
BaseRoute sourceRoute = result.getTheRoute();
assertNotNull(sourceRoute);
assertNotNull(result.getAllRoutes());
- assertTrue(!result.getAllRoutes().isEmpty());
+ assertFalse(result.getAllRoutes().isEmpty());
int maximumPositionCount = result.getFormat().getMaximumPositionCount();
if (maximumPositionCount == UNLIMITED_MAXIMUM_POSITION_COUNT) {
@@ -178,7 +178,7 @@ void convertSplitRoundtrip(String testFileName, BaseNavigationFormat sourceForma
assertNotNull(result.getFormat());
assertNotNull(result.getTheRoute());
assertNotNull(result.getAllRoutes());
- assertTrue(!result.getAllRoutes().isEmpty());
+ assertFalse(result.getAllRoutes().isEmpty());
BaseRoute sourceRoute = result.getTheRoute();
int maximumPositionCount = targetFormat.getMaximumPositionCount();
diff --git a/route-converter-build/buildNumber.properties b/route-converter-build/buildNumber.properties
index 22e94e2ec..adb6fcc9e 100644
--- a/route-converter-build/buildNumber.properties
+++ b/route-converter-build/buildNumber.properties
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
-#Thu Jun 15 13:05:12 CEST 2023
-buildNumber0=358
+#Wed Sep 06 17:16:11 CEST 2023
+buildNumber0=360