From f3406229775fde8a69dcee0db42ff6caa391fe4f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 29 Mar 2020 12:38:17 +0200 Subject: [PATCH] Automated code analysis improvements. --- .../opentracks/content/SearchEngineTest.java | 16 ++++++++-------- .../content/provider/ShareContentProvider.java | 2 +- .../io/file/exporter/FileTrackExporter.java | 2 +- .../file/importer/AbstractFileTrackImporter.java | 2 +- .../io/file/importer/KmlFileTrackImporter.java | 2 +- .../opentracks/settings/BluetoothLeAdapter.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java index aea56ee26..a6e58857e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java @@ -153,7 +153,7 @@ public class SearchEngineTest { long allMatchId = insertTrack("aa", "ba", "ca"); SearchQuery query = new SearchQuery("a", null, -1, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Title > Description > Category. assertTrackResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId); @@ -178,7 +178,7 @@ public class SearchEngineTest { long allMatchId = insertWaypoint("aa", "ba", "ca"); SearchQuery query = new SearchQuery("a", null, -1, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Title > Description > Category. assertWaypointResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId); @@ -199,7 +199,7 @@ public class SearchEngineTest { long trackId = insertTrack("aa", "bb", "cc"); SearchQuery query = new SearchQuery("a", null, -1, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Title > Description > Category. Assert.assertEquals(results.toString(), 3, results.size()); @@ -216,7 +216,7 @@ public class SearchEngineTest { long farId = insertWaypoint("ac", 0.2); SearchQuery query = new SearchQuery("a", HERE, -1, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Distance order. assertWaypointResults(results, nearId, farId, farFarAwayId); @@ -229,7 +229,7 @@ public class SearchEngineTest { long oldId = insertTrack("ac", 2); SearchQuery query = new SearchQuery("a", null, -1, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Reverse time order. assertTrackResults(results, recentId, oldId, oldestId); @@ -243,7 +243,7 @@ public class SearchEngineTest { long oldId = insertWaypoint("ac", 1); SearchQuery query = new SearchQuery("a", null, -1, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Reverse time order. assertWaypointResults(results, recentId, oldId, oldestId); @@ -256,7 +256,7 @@ public class SearchEngineTest { long otherId = insertTrack("aa", 1); SearchQuery query = new SearchQuery("a", null, currentId, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Current track should be demoted. assertTrackResults(results, otherId, currentId); @@ -269,7 +269,7 @@ public class SearchEngineTest { long currentId = insertWaypoint("ab", 1, 123); SearchQuery query = new SearchQuery("a", null, 123, NOW); - ArrayList results = new ArrayList(engine.search(query)); + ArrayList results = new ArrayList<>(engine.search(query)); // Waypoint in current track should be promoted. assertWaypointResults(results, currentId, otherId); diff --git a/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java b/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java index 0d9ac6c24..edf001c06 100644 --- a/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java +++ b/src/main/java/de/dennisguse/opentracks/content/provider/ShareContentProvider.java @@ -101,7 +101,7 @@ public class ShareContentProvider extends CustomContentProvider implements ICont long[] trackIds = new long[uriTrackIds.length]; for (int i = 0; i < trackIds.length; i++) { - trackIds[i] = Long.valueOf(uriTrackIds[i]); + trackIds[i] = Long.parseLong(uriTrackIds[i]); } return trackIds; } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java index 1c8c1b308..db012f3f9 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/FileTrackExporter.java @@ -206,7 +206,7 @@ public class FileTrackExporter implements TrackExporter { * * @author Jimmy Shih */ - private class TrackWriterTrackPointFactory extends TrackPointFactory { + private static class TrackWriterTrackPointFactory extends TrackPointFactory { TrackPoint currentTrackPoint; TrackPoint lastTrackPoint; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java index 026ab9ac5..ef6cde14f 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java @@ -464,7 +464,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track * @author Jimmy Shih */ // TODO Why private inner class? - private class TrackData { + private static class TrackData { // The current track final Track track = new Track(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java index ece2647fe..5721b6011 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java @@ -297,7 +297,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter { } float value; try { - value = Float.valueOf(content); + value = Float.parseFloat(content); } catch (NumberFormatException e) { throw new SAXException(createErrorMessage("Unable to parse gx:value:" + content), e); } diff --git a/src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java b/src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java index 634eb3c3b..8b6c035eb 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/settings/BluetoothLeAdapter.java @@ -72,7 +72,7 @@ public class BluetoothLeAdapter extends BaseAdapter { return devices.get(index); } - public class Device { + public static class Device { private String name; private final String address;