From a35680df33e1ecb00380edf768dffd508e8fba68 Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 7 Jul 2013 18:54:43 +0200
Subject: refactoring: minor cleanup, experimenting with Checkstyle

---
 main/src/cgeo/geocaching/SelectMapfileActivity.java    |  2 +-
 main/src/cgeo/geocaching/connector/gc/GCConnector.java |  4 ++--
 main/src/cgeo/geocaching/connector/oc/OCConnector.java |  4 ++--
 main/src/cgeo/geocaching/files/GPXParser.java          | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/SelectMapfileActivity.java b/main/src/cgeo/geocaching/SelectMapfileActivity.java
index aa6d46a..95b6e46 100644
--- a/main/src/cgeo/geocaching/SelectMapfileActivity.java
+++ b/main/src/cgeo/geocaching/SelectMapfileActivity.java
@@ -19,7 +19,7 @@ public class SelectMapfileActivity extends AbstractFileListActivity<FileSelectio
         super("map");
     }
 
-    String mapFile;
+    private String mapFile;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/main/src/cgeo/geocaching/connector/gc/GCConnector.java b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
index 33bb1ce..5ef2e7b 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCConnector.java
@@ -38,7 +38,7 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
      * Pocket queries downloaded from the website use a numeric prefix. The pocket query creator Android app adds a
      * verbatim "pocketquery" prefix.
      */
-    private static final Pattern gpxZipFilePattern = Pattern.compile("((\\d{7,})|(pocketquery))" + "(_.+)?" + "\\.zip", Pattern.CASE_INSENSITIVE);
+    private static final Pattern GPX_ZIP_FILE_PATTERN = Pattern.compile("((\\d{7,})|(pocketquery))" + "(_.+)?" + "\\.zip", Pattern.CASE_INSENSITIVE);
 
     /**
      * Pattern for GC codes
@@ -171,7 +171,7 @@ public class GCConnector extends AbstractConnector implements ISearchByGeocode,
 
     @Override
     public boolean isZippedGPXFile(final String fileName) {
-        return gpxZipFilePattern.matcher(fileName).matches();
+        return GPX_ZIP_FILE_PATTERN.matcher(fileName).matches();
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/connector/oc/OCConnector.java b/main/src/cgeo/geocaching/connector/oc/OCConnector.java
index 01738c0..29cdd10 100644
--- a/main/src/cgeo/geocaching/connector/oc/OCConnector.java
+++ b/main/src/cgeo/geocaching/connector/oc/OCConnector.java
@@ -12,7 +12,7 @@ public class OCConnector extends AbstractConnector {
     private final String host;
     private final String name;
     private final Pattern codePattern;
-    private static final Pattern gpxZipFilePattern = Pattern.compile("oc[a-z]{2,3}\\d{5,}\\.zip", Pattern.CASE_INSENSITIVE);
+    private static final Pattern GPX_ZIP_FILE_PATTERN = Pattern.compile("oc[a-z]{2,3}\\d{5,}\\.zip", Pattern.CASE_INSENSITIVE);
 
     public OCConnector(final String name, final String host, final String prefix) {
         this.name = name;
@@ -45,7 +45,7 @@ public class OCConnector extends AbstractConnector {
 
     @Override
     public boolean isZippedGPXFile(String fileName) {
-        return gpxZipFilePattern.matcher(fileName).matches();
+        return GPX_ZIP_FILE_PATTERN.matcher(fileName).matches();
     }
 
     @Override
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index f5ae381..76e3713 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -54,13 +54,13 @@ public abstract class GPXParser extends FileParser {
     /**
      * Attention: case sensitive geocode pattern to avoid matching normal words in the name or description of the cache.
      */
-    private static final Pattern patternGeocode = Pattern.compile("([A-Z][0-9A-Z]+)");
-    private static final Pattern patternGuid = Pattern.compile(".*" + Pattern.quote("guid=") + "([0-9a-z\\-]+)", Pattern.CASE_INSENSITIVE);
-    private static final Pattern patternUrlGeocode = Pattern.compile(".*" + Pattern.quote("wp=") + "([A-Z][0-9A-Z]+)", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN_GEOCODE = Pattern.compile("([A-Z][0-9A-Z]+)");
+    private static final Pattern PATTERN_GUID = Pattern.compile(".*" + Pattern.quote("guid=") + "([0-9a-z\\-]+)", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PATTERN_URL_GEOCODE = Pattern.compile(".*" + Pattern.quote("wp=") + "([A-Z][0-9A-Z]+)", Pattern.CASE_INSENSITIVE);
     /**
      * supported groundspeak extensions of the GPX format
      */
-    private static final String[] nsGCList = new String[] {
+    private static final String[] GROUNDSPEAK_NAMESPACE = new String[] {
             "http://www.groundspeak.com/cache/1/1", // PQ 1.1
             "http://www.groundspeak.com/cache/1/0/1", // PQ 1.0.1
             "http://www.groundspeak.com/cache/1/0", // PQ 1.0
@@ -434,14 +434,14 @@ public abstract class GPXParser extends FileParser {
 
             @Override
             public void end(String url) {
-                final MatcherWrapper matcher = new MatcherWrapper(patternGuid, url);
+                final MatcherWrapper matcher = new MatcherWrapper(PATTERN_GUID, url);
                 if (matcher.matches()) {
                     final String guid = matcher.group(1);
                     if (StringUtils.isNotBlank(guid)) {
                         cache.setGuid(guid);
                     }
                 }
-                final MatcherWrapper matcherCode = new MatcherWrapper(patternUrlGeocode, url);
+                final MatcherWrapper matcherCode = new MatcherWrapper(PATTERN_URL_GEOCODE, url);
                 if (matcherCode.matches()) {
                     final String geocode = matcherCode.group(1);
                     cache.setGeocode(geocode);
@@ -483,7 +483,7 @@ public abstract class GPXParser extends FileParser {
         }
 
         // 3 different versions of the GC schema
-        for (final String nsGC : nsGCList) {
+        for (final String nsGC : GROUNDSPEAK_NAMESPACE) {
             // waypoints.cache
             final Element gcCache = cacheParent.getChild(nsGC, "cache");
 
@@ -849,7 +849,7 @@ public abstract class GPXParser extends FileParser {
             return;
         }
         final String trimmed = input.trim();
-        final MatcherWrapper matcherGeocode = new MatcherWrapper(patternGeocode, trimmed);
+        final MatcherWrapper matcherGeocode = new MatcherWrapper(PATTERN_GEOCODE, trimmed);
         if (matcherGeocode.find()) {
             final String geocode = matcherGeocode.group(1);
             // a geocode should not be part of a word
-- 
cgit v1.1