1 files changed, 13 insertions, 15 deletions

diff --git a/main/src/cgeo/geocaching/files/FileParser.java b/main/src/cgeo/geocaching/files/FileParser.java
index 973e65f..9c70a0d 100644
--- a/main/src/cgeo/geocaching/files/FileParser.java
+++ b/main/src/cgeo/geocaching/files/FileParser.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.Geocache;
 import cgeo.geocaching.utils.CancellableHandler;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.CharEncoding;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -15,7 +16,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Collection;
-import java.util.Date;
 import java.util.concurrent.CancellationException;
 
 public abstract class FileParser {
@@ -23,27 +23,24 @@ public abstract class FileParser {
      * Parses caches from input stream.
      *
      * @param stream
+     *         the input stream
      * @param progressHandler
-     *            for reporting parsing progress (in bytes read from input stream)
+     *         for reporting parsing progress (in bytes read from input stream)
      * @return collection of caches
      * @throws IOException
-     *             if the input stream can't be read
+     *         if the input stream can't be read
      * @throws ParserException
-     *             if the input stream contains data not matching the file format of the parser
+     *         if the input stream contains data not matching the file format of the parser
      */
+    @NonNull
     public abstract Collection<Geocache> parse(@NonNull final InputStream stream, @Nullable final CancellableHandler progressHandler) throws IOException, ParserException;
 
     /**
      * Convenience method for parsing a file.
-     *
-     * @param file
-     * @param progressHandler
-     * @return
-     * @throws IOException
-     * @throws ParserException
      */
+    @NonNull
     public Collection<Geocache> parse(final File file, final CancellableHandler progressHandler) throws IOException, ParserException {
-        BufferedInputStream stream = new BufferedInputStream(new FileInputStream(file));
+        final BufferedInputStream stream = new BufferedInputStream(new FileInputStream(file));
         try {
             return parse(stream, progressHandler);
         } finally {
@@ -51,10 +48,11 @@ public abstract class FileParser {
         }
     }
 
+    @NonNull
     protected static StringBuilder readStream(@NonNull final InputStream is, @Nullable final CancellableHandler progressHandler) throws IOException {
         final StringBuilder buffer = new StringBuilder();
-        ProgressInputStream progressInputStream = new ProgressInputStream(is);
-        final BufferedReader input = new BufferedReader(new InputStreamReader(progressInputStream, "UTF-8"));
+        final ProgressInputStream progressInputStream = new ProgressInputStream(is);
+        final BufferedReader input = new BufferedReader(new InputStreamReader(progressInputStream, CharEncoding.UTF_8));
 
         try {
             String line;
@@ -77,13 +75,13 @@ public abstract class FileParser {
         }
     }
 
-    protected static void fixCache(Geocache cache) {
+    protected static void fixCache(final Geocache cache) {
         if (cache.getInventory() != null) {
             cache.setInventoryItems(cache.getInventory().size());
         } else {
             cache.setInventoryItems(0);
         }
-        final long time = new Date().getTime();
+        final long time = System.currentTimeMillis();
         cache.setUpdated(time);
         cache.setDetailedUpdate(time);
     }