Merge pull request #1361 from dkpro/feature/1358-Improve-error-messag…

…es-in-TSV3 #1358 - Improve error messages in TSV3
dkpro · May 4, 2019 · 7097287 · 7097287
2 parents 9911dba + e9eb9ed
commit 7097287
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/...l/src/main/java/org/dkpro/core/io/webanno/tsv/internal/tsv3x/Tsv3XCasDocumentBuilder.java b/...l/src/main/java/org/dkpro/core/io/webanno/tsv/internal/tsv3x/Tsv3XCasDocumentBuilder.java
@@ -37,6 +37,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
@@ -133,8 +134,24 @@ public static TsvDocument of(TsvSchema aSchema, JCas aJCas)
                     end = targetFS.getEnd();
                 }
 
-                TsvToken beginToken = tokenBeginIndex.floorEntry(begin).getValue();
-                TsvToken endToken = tokenEndIndex.ceilingEntry(end).getValue();
+                Entry<Integer, TsvToken> beginTokenEntry = tokenBeginIndex.floorEntry(begin);
+                if (beginTokenEntry == null) {
+                    throw new IllegalStateException(
+                            "Unable to find begin token starting at or before " + begin
+                                    + " (first token starts at "
+                                    + tokenBeginIndex.pollFirstEntry().getKey()
+                                    + ") for annotation: " + annotation);
+                }
+
+                Entry<Integer, TsvToken> endTokenEntry = tokenEndIndex.ceilingEntry(end);
+                if (endTokenEntry == null) {
+                    throw new IllegalStateException("Unable to find end token ending at or after "
+                            + end + " (last token ends at " + tokenEndIndex.pollLastEntry().getKey()
+                            + ") for annotation: " + annotation);
+                }
+
+                TsvToken beginToken = beginTokenEntry.getValue();
+                TsvToken endToken = endTokenEntry.getValue();
 
                 // For zero-width annotations, the begin token must match the end token.
                 // Zero-width annotations between two directly adjacent tokens are always