Merge branch 'update-annotation-preprocessor'

This change allows library users to write SciJava plugins using java 8
language features without warnings and errors from the plugin indexer.

Closes #218.

Author: ctrueden

pom.xml

@@ -114,6 +114,10 @@
 		<url>http://jenkins.imagej.net/job/SciJava-common/</url>
 	</ciManagement>
 
+	<properties>
+		<scijava.jvm.test.version>1.8</scijava.jvm.test.version>
+	</properties>
+
 	<dependencies>
 		<!-- Third-party dependencies -->
 		<dependency>

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

@@ -107,16 +107,19 @@ private double getDoubleConstant(final int index) {
 			getU4(offset + 5));
 	}
 
+	// See https://en.wikipedia.org/wiki/Java_class_file#The_constant_pool for the 
+	// meaning of the offsets behind these numbers 
 	private void getConstantPoolOffsets() {
 		final int poolCount = getU2(8) - 1;
 		poolOffsets = new int[poolCount];
 		int offset = 10;
 		for (int i = 0; i < poolCount; i++) {
 			poolOffsets[i] = offset;
 			final int tag = getU1(offset);
-			if (tag == 7 || tag == 8) offset += 3;
-			else if (tag == 9 || tag == 10 || tag == 11 || tag == 3 || tag == 4 ||
-				tag == 12) offset += 5;
+			if (tag == 7 || tag == 8 || tag == 16) offset += 3;
+			else if (tag == 15) offset += 4;
+			else if (tag == 3 || tag == 4 || tag == 9 || tag == 10 
+					|| tag == 11 || tag == 12 || tag == 18) offset += 5;
 			else if (tag == 5 || tag == 6) {
 				poolOffsets[++i] = offset;
 				offset += 9;

src/test/java/org/scijava/annotations/AnnotatedD.java

@@ -0,0 +1,13 @@
+package org.scijava.annotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Simple(string1 = "adfd")
+public class AnnotatedD {
+
+	public AnnotatedD() {
+		List<String> list = new ArrayList<>();
+		list.stream().reduce(String::concat).get();
+	}
+}

src/test/java/org/scijava/annotations/DirectoryIndexerTest.java

@@ -122,7 +122,7 @@ public void testRepeatedClassPathElements() throws Exception {
 			assertFalse(seen.contains(name));
 			seen.add(name);
 		}
-		assertEquals(2, seen.size());
+		assertEquals(3, seen.size());
 	}
 
 	public static void

src/test/java/org/scijava/annotations/EclipseHelperTest.java

@@ -71,7 +71,7 @@ public void testSkipIndexGeneration() throws Exception {
 	public void testIndexing() throws Exception {
 		final File dir = createTemporaryDirectory("eclipse-test-");
 		copyClasses(dir, Complex.class, Simple.class, Fruit.class,
-			AnnotatedA.class, AnnotatedB.class, AnnotatedC.class);
+			AnnotatedA.class, AnnotatedB.class, AnnotatedC.class, AnnotatedD.class);
 		final File jsonDir = new File(dir, Index.INDEX_PREFIX);
 		for (final Class<?> clazz : new Class<?>[] { Complex.class, Simple.class })
 		{
@@ -104,7 +104,7 @@ public Class<?> loadClass(final String className)
 		// deleted
 		jsonDir.setLastModified(123456789);
 		for (final Class<?> clazz : new Class<?>[] { AnnotatedA.class,
-			AnnotatedB.class, AnnotatedC.class })
+			AnnotatedB.class, AnnotatedC.class, AnnotatedD.class })
 		{
 			assertTrue(new File(dir, DirectoryIndexerTest.getResourcePath(clazz))
 				.delete());