aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/files/LocParser.java
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2011-10-24 23:49:36 +0200
committerSamuel Tardieu <sam@rfc1149.net>2011-10-24 23:49:36 +0200
commit3bec4991410eabe8d8c80c214e30c149bb6bee3d (patch)
treed875c6a342d121d8c20eb175fb7b6051b1f4ca9c /main/src/cgeo/geocaching/files/LocParser.java
parent980756db69a32c6a845c51f4a229c583c6dec70f (diff)
parentb6d19eeea75e255c40756b59e1c977988082589f (diff)
downloadcgeo-3bec4991410eabe8d8c80c214e30c149bb6bee3d.zip
cgeo-3bec4991410eabe8d8c80c214e30c149bb6bee3d.tar.gz
cgeo-3bec4991410eabe8d8c80c214e30c149bb6bee3d.tar.bz2
Merge branch 'fix-707' into upstream
Diffstat (limited to 'main/src/cgeo/geocaching/files/LocParser.java')
-rw-r--r--main/src/cgeo/geocaching/files/LocParser.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/files/LocParser.java b/main/src/cgeo/geocaching/files/LocParser.java
index ddd368a..ba86dc4 100644
--- a/main/src/cgeo/geocaching/files/LocParser.java
+++ b/main/src/cgeo/geocaching/files/LocParser.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -140,7 +139,7 @@ public final class LocParser extends FileParser {
return coords;
}
- public static UUID parseLoc(File file, int listId,
+ public static cgSearch parseLoc(File file, int listId,
Handler handler) {
final cgSearch search = new cgSearch();
@@ -170,6 +169,6 @@ public final class LocParser extends FileParser {
Log.e(Settings.tag, "LocParser.parseLoc: " + e.toString());
}
- return search.getCurrentId();
+ return search;
}
}