diff options
| -rw-r--r-- | main/src/cgeo/geocaching/files/GPXImporter.java | 16 | ||||
| -rw-r--r-- | tests/src/cgeo/geocaching/files/GPXImporterTest.java | 16 |
2 files changed, 0 insertions, 32 deletions
diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java index 6e11679..a500fe7 100644 --- a/main/src/cgeo/geocaching/files/GPXImporter.java +++ b/main/src/cgeo/geocaching/files/GPXImporter.java @@ -394,22 +394,6 @@ public class GPXImporter { };
/**
- * @param name
- * the gpx file name
- * @return the expected file name of the waypoints file
- *
- * @deprecated use {@link #getWaypointsFileNameForGpxFile(File)} instead
- */
- @Deprecated
- static String getWaypointsFileNameForGpxFileName(String name) {
- if (StringUtils.endsWithIgnoreCase(name, GPX_FILE_EXTENSION) && (StringUtils.length(name) > GPX_FILE_EXTENSION.length())) {
- return StringUtils.substringBeforeLast(name, ".") + WAYPOINTS_FILE_SUFFIX_AND_EXTENSION;
- } else {
- return null;
- }
- }
-
- /**
* @param gpxfile
* the gpx file
* @return the expected file name of the waypoints file
diff --git a/tests/src/cgeo/geocaching/files/GPXImporterTest.java b/tests/src/cgeo/geocaching/files/GPXImporterTest.java index 681db0f..5684530 100644 --- a/tests/src/cgeo/geocaching/files/GPXImporterTest.java +++ b/tests/src/cgeo/geocaching/files/GPXImporterTest.java @@ -25,22 +25,6 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase { private int listId; private File tempDir; - @SuppressWarnings("deprecation") - public static void testGetWaypointsFileNameForGpxFileName() { - assertEquals("1234567-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("1234567.gpx")); - assertEquals("/mnt/sdcard/1234567-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("/mnt/sdcard/1234567.gpx")); - assertEquals("/mnt/sdcard/1-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("/mnt/sdcard/1.gpx")); - assertEquals("/mnt/sd.card/1-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("/mnt/sd.card/1.gpx")); - assertEquals("1234567.9-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("1234567.9.gpx")); - assertEquals("1234567-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("1234567.GPX")); - assertEquals("gpx.gpx-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("gpx.gpx.gpx")); - assertEquals("/mnt/sdcard/-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("/mnt/sdcard/.gpx")); - assertEquals("1234567_query-wpts.gpx", GPXImporter.getWaypointsFileNameForGpxFileName("1234567_query.gpx")); - assertNull(GPXImporter.getWaypointsFileNameForGpxFileName("123.gpy")); - assertNull(GPXImporter.getWaypointsFileNameForGpxFileName("gpx")); - assertNull(GPXImporter.getWaypointsFileNameForGpxFileName(".gpx")); - } - public void testGetWaypointsFileNameForGpxFile() { String[] gpxFiles = new String[] { "1234567.gpx", "1.gpx", "1234567.9.gpx", "1234567.GPX", "gpx.gpx.gpx", ".gpx", |