Merge branch 'fix-intellij'

This changes the indexer to use a ConcurrentSkipListMap rather than a
TreeMap, to avoid a compilation issue when using IntelliJ. It also adds
more debugging information for the AbstractIndexWriter and Reader to
show which annotation causes an exception to occur so debugging can be
done more easily.

Closes issues #136 and #140.

Author: ctrueden

src/main/java/org/scijava/annotations/AbstractIndexWriter.java

@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 import javax.lang.model.element.AnnotationValue;
 
@@ -60,7 +61,7 @@
 public abstract class AbstractIndexWriter {
 
 	private final Map<String, Map<String, Object>> map =
-		new TreeMap<String, Map<String, Object>>();
+		new ConcurrentSkipListMap<String, Map<String, Object>>();
 
 	protected synchronized boolean foundAnnotations() {
 		return !map.isEmpty();
@@ -137,7 +138,8 @@ protected synchronized void merge(final String annotationName,
 		int changedCount = map.size();
 		boolean hasObsoletes = false;
 
-		final IndexReader reader = new IndexReader(in);
+		final IndexReader reader =
+			new IndexReader(in, annotationName + " from " + in);
 		try {
 			for (;;) {
 				@SuppressWarnings("unchecked")

src/main/java/org/scijava/annotations/IndexReader.java

@@ -64,11 +64,17 @@
 class IndexReader {
 
 	private final PushbackInputStream in;
+	private final String originalISName;
 
 	IndexReader(final InputStream in) {
+		this(in, "");
+	}
+
+	IndexReader(final InputStream in, final String isName) {
 		this.in =
 			in instanceof PushbackInputStream ? (PushbackInputStream) in
 				: new PushbackInputStream(new BufferedInputStream(in));
+		this.originalISName = isName;
 	}
 
 	public Object next() throws IOException {
@@ -155,7 +161,8 @@ else if (c < '0' || c > '9') {
 		if (c == '"') {
 			return readString();
 		}
-		throw new IOException("Unexpected char: '" + (char) c + "'");
+		throw new IOException("Unexpected char: '" + (char) c + "'"+
+				((originalISName.length()>0) ? " from "+originalISName : ""));
 	}
 
 	public void close() throws IOException {
@@ -206,7 +213,7 @@ private int expect(char a, char b) throws IOException {
 			return 1;
 		}
 		throw new IOException("Expected '" + a + "' or '" + b + "', got '" +
-			(char) c + "'");
+			(char) c + "'"+((originalISName.length()>0) ? " from "+originalISName : ""));
 	}
 
 	private void expect(String match) throws IOException {
@@ -217,6 +224,7 @@ private void expect(String match) throws IOException {
 
 	private IndexReader() {
 		this.in = null;
+		this.originalISName="";
 	}
 
 	static IndexReader getLegacyReader(final InputStream in) throws IOException {