X-Git-Url: http://gitweb.fperrin.net/?p=DictionaryPC.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fparser%2FDictFileParser.java;h=0fa43060086ffce54d1567d9ecd3530c7b94586e;hp=6d8c5610042eadd9e453b2dd866fb2d9b026d83f;hb=6c9b88ee08f4fd4cba28714b93fceda740f313e5;hpb=5a1b9f8a37d03dc675e1d895817422e9743a5b5b

diff --git a/src/com/hughes/android/dictionary/parser/DictFileParser.java b/src/com/hughes/android/dictionary/parser/DictFileParser.java
index 6d8c561..0fa4306 100644
--- a/src/com/hughes/android/dictionary/parser/DictFileParser.java
+++ b/src/com/hughes/android/dictionary/parser/DictFileParser.java
@@ -110,9 +110,8 @@ public class DictFileParser implements Parser {
             return;
         }
         final String[] fields = fieldSplit.split(line);
-        // dictcc now has a part of speech field as field #3.
-        if (fields.length < 2 || fields.length > 3) {
-            logger.warning("Malformed line: " + line);
+        if (fields.length < 2 || fields.length > 4) {
+            logger.warning("Malformed line, expected 3 or 4 fields, got " + fields.length + ": " + line);
             return;
         }
 
@@ -293,9 +292,9 @@ public class DictFileParser implements Parser {
         return field;
     }
 
-    public static final Set<String> tokenize(final String text, final Pattern pattern) {
+    public static Set<String> tokenize(final String text, final Pattern pattern) {
         final String[] split = pattern.split(text);
-        final Set<String> result = new LinkedHashSet<String>(Arrays.asList(split));
+        final Set<String> result = new LinkedHashSet<>(Arrays.asList(split));
         result.remove("");
         return result;
     }