Index: trunk/autoquest-core-assertions-test/.classpath
===================================================================
--- trunk/autoquest-core-assertions-test/.classpath	(revision 2259)
+++ trunk/autoquest-core-assertions-test/.classpath	(revision 2260)
@@ -13,9 +13,4 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
@@ -23,4 +18,5 @@
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
Index: trunk/autoquest-core-assertions-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-assertions-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-assertions-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-assertions/.classpath
===================================================================
--- trunk/autoquest-core-assertions/.classpath	(revision 2259)
+++ trunk/autoquest-core-assertions/.classpath	(revision 2260)
@@ -13,9 +13,4 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
@@ -23,4 +18,5 @@
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
Index: trunk/autoquest-core-assertions/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-assertions/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-assertions/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-coverage-test/.classpath
===================================================================
--- trunk/autoquest-core-coverage-test/.classpath	(revision 2259)
+++ trunk/autoquest-core-coverage-test/.classpath	(revision 2260)
@@ -13,9 +13,4 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
@@ -23,4 +18,5 @@
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
Index: trunk/autoquest-core-coverage-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-coverage-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-coverage-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-coverage/.classpath
===================================================================
--- trunk/autoquest-core-coverage/.classpath	(revision 2259)
+++ trunk/autoquest-core-coverage/.classpath	(revision 2260)
@@ -13,9 +13,4 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
@@ -23,4 +18,5 @@
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
Index: trunk/autoquest-core-coverage/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-coverage/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-coverage/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-events-test/.classpath
===================================================================
--- trunk/autoquest-core-events-test/.classpath	(revision 2259)
+++ trunk/autoquest-core-events-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-events-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-events-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-events-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-events/.classpath
===================================================================
--- trunk/autoquest-core-events/.classpath	(revision 2259)
+++ trunk/autoquest-core-events/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-events/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-events/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-events/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +11,3 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-tasktrees-test/.classpath
===================================================================
--- trunk/autoquest-core-tasktrees-test/.classpath	(revision 2259)
+++ trunk/autoquest-core-tasktrees-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-tasktrees-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-tasktrees-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-tasktrees-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/CondenseSimilarTasksRuleTest.java
===================================================================
--- trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/CondenseSimilarTasksRuleTest.java	(revision 2259)
+++ trunk/autoquest-core-tasktrees-test/src/test/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/CondenseSimilarTasksRuleTest.java	(revision 2260)
@@ -25,5 +25,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_SelectionDetection_01() throws Exception {
         String input =
@@ -35,4 +35,5 @@
             "    Event selAction1 {}" +
             "    Event action3 {}" +
+            "    Event action4 {}" +
             "  }" +
             "  Sequence sequence2 {" +
@@ -43,4 +44,5 @@
             "    Event selAction2 {}" +
             "    Event action3 {}" +
+            "    Event action4 {}" +
             "  }" +
             "}";
@@ -56,4 +58,5 @@
             "    }" +
             "    Event action3 {}" +
+            "    Event action4 {}" +
             "  }" +
             "  Sequence sequence3 {" +
@@ -66,4 +69,5 @@
             "    }" +
             "    Event action3 {}" +
+            "    Event action4 {}" +
             "  }" +
             "}";
@@ -75,5 +79,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_SelectionDetection_02() throws Exception {
         String input =
@@ -125,5 +129,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_SelectionDetection_03() throws Exception {
         String input =
@@ -207,5 +211,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_SelectionDetection_04() throws Exception {
         String input =
@@ -263,5 +267,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_OptionalDetection_01() throws Exception {
         String input =
@@ -300,5 +304,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_OptionalDetection_02() throws Exception {
         String input =
@@ -337,5 +341,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_OptionalDetection_03() throws Exception {
         String input =
@@ -386,5 +390,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_OptionalDetection_04() throws Exception {
         String input =
@@ -462,5 +466,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_OptionalDetection_05() throws Exception {
         String input =
@@ -515,5 +519,5 @@
      *
      */
-    //@Test
+    @Test
     public void test_OptionalDetection_06() throws Exception {
         String input =
@@ -1392,80 +1396,4 @@
             "      Event action5 {}" +
             "      Event action6 {}" +
-            "    }" +
-            "  }" +
-            "}";
-
-        applySessionScopeRule(CondenseSimilarTasksRule.class, input, output);
-    }
-
-    /**
-     * TODO: correct to let it run through
-     */
-    /*@Test
-    public void test_IterationPreservation_07() throws Exception {
-        String input =
-            "UserSession {" +
-            "  Sequence sequence1 {" +
-            "    Sequence sequence2 {" +
-            "      Event action1 {}" +
-            "      Event action2 {}" +
-            "    }" +
-            "    Event action3 {}" +
-            "  }" +
-            "  Sequence sequence3 {" +
-            "    Sequence sequence4 {" +
-            "      Sequence sequence2 {" +
-            "        Event action1 {}" +
-            "        Event action2 {}" +
-            "      }" +
-            "      Iteration it1 {" +
-            "        Event inserted1 {}" +
-            "      }" +
-            "    }" +
-            "    Iteration it2 {" +
-            "      Sequence sequence5 {" +
-            "        Event inserted2 {}" +
-            "        Event action3 {}" +
-            "      }" +
-            "      Sequence sequence5 {" +
-            "        Event inserted2 {}" +
-            "        Event action3 {}" +
-            "      }" +
-            "    }" +
-            "  }" +
-            "}";
-
-        String output =
-            "UserSession {" +
-            "  Selection sel1 {" +
-            "    Sequence sequence1 {" +
-            "      Sequence sequence2 {" +
-            "        Event action1 {}" +
-            "        Event action2 {}" +
-            "      }" +
-            "      Event action3 {}" +
-            "    }" +
-            "  }" +
-            "  Selection sel1 {" +
-            "    Sequence sequence3 {" +
-            "      Sequence sequence4 {" +
-            "        Sequence sequence2 {" +
-            "          Event action1 {}" +
-            "          Event action2 {}" +
-            "        }" +
-            "        Iteration it1 {" +
-            "          Event inserted1 {}" +
-            "        }" +
-            "      }" +
-            "      Iteration it2 {" +
-            "        Sequence sequence5 {" +
-            "          Event inserted2 {}" +
-            "          Event action3 {}" +
-            "        }" +
-            "        Sequence sequence5 {" +
-            "          Event inserted2 {}" +
-            "          Event action3 {}" +
-            "        }" +
-            "      }" +
             "    }" +
             "  }" +
Index: trunk/autoquest-core-tasktrees/.classpath
===================================================================
--- trunk/autoquest-core-tasktrees/.classpath	(revision 2259)
+++ trunk/autoquest-core-tasktrees/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-tasktrees/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-tasktrees/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-tasktrees/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-testgeneration/.classpath
===================================================================
--- trunk/autoquest-core-testgeneration/.classpath	(revision 2259)
+++ trunk/autoquest-core-testgeneration/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-testgeneration/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-testgeneration/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-testgeneration/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-usability-test/.classpath
===================================================================
--- trunk/autoquest-core-usability-test/.classpath	(revision 2259)
+++ trunk/autoquest-core-usability-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-usability-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-usability-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-usability-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-usability/.classpath
===================================================================
--- trunk/autoquest-core-usability/.classpath	(revision 2259)
+++ trunk/autoquest-core-usability/.classpath	(revision 2260)
@@ -24,9 +24,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-usability/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-usability/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-usability/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +11,3 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-usageprofiles-test/.classpath
===================================================================
--- trunk/autoquest-core-usageprofiles-test/.classpath	(revision 2259)
+++ trunk/autoquest-core-usageprofiles-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-usageprofiles-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-usageprofiles-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-usageprofiles-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-core-usageprofiles/.classpath
===================================================================
--- trunk/autoquest-core-usageprofiles/.classpath	(revision 2259)
+++ trunk/autoquest-core-usageprofiles/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-core-usageprofiles/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-core-usageprofiles/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-core-usageprofiles/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-distribution/.classpath
===================================================================
--- trunk/autoquest-distribution/.classpath	(revision 2259)
+++ trunk/autoquest-distribution/.classpath	(revision 2260)
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
Index: trunk/autoquest-distribution/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-distribution/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-distribution/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-generic-event-monitor-test/.classpath
===================================================================
--- trunk/autoquest-generic-event-monitor-test/.classpath	(revision 2259)
+++ trunk/autoquest-generic-event-monitor-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-generic-event-monitor-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-generic-event-monitor-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-generic-event-monitor-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServerTest.java
===================================================================
--- trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServerTest.java	(revision 2259)
+++ trunk/autoquest-generic-event-monitor-test/src/test/java/de/ugoe/cs/autoquest/genericeventmonitor/GenericEventMonitorServerTest.java	(revision 2260)
@@ -634,5 +634,5 @@
                              String[] ...       parameters)
     {
-        assertEquals("event " + index, new Long(timestamp), events[index].getTime());
+        assertEquals("event " + index, Long.valueOf(timestamp), events[index].getTime());
         assertEquals("event " + index, target, events[index].getTarget());
         assertEquals("event " + index, eventType, events[index].getEventType());
Index: trunk/autoquest-generic-event-monitor/.classpath
===================================================================
--- trunk/autoquest-generic-event-monitor/.classpath	(revision 2259)
+++ trunk/autoquest-generic-event-monitor/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-generic-event-monitor/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-generic-event-monitor/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-generic-event-monitor/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-generic-event-monitor/pom.xml
===================================================================
--- trunk/autoquest-generic-event-monitor/pom.xml	(revision 2259)
+++ trunk/autoquest-generic-event-monitor/pom.xml	(revision 2260)
@@ -79,8 +79,7 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
Index: trunk/autoquest-htmlmonitor-test/.classpath
===================================================================
--- trunk/autoquest-htmlmonitor-test/.classpath	(revision 2259)
+++ trunk/autoquest-htmlmonitor-test/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-htmlmonitor-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-htmlmonitor-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-htmlmonitor-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServerTest.java
===================================================================
--- trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServerTest.java	(revision 2259)
+++ trunk/autoquest-htmlmonitor-test/src/test/java/de/ugoe/cs/autoquest/htmlmonitor/HtmlMonitorServerTest.java	(revision 2260)
@@ -649,5 +649,5 @@
                              String         clientId)
     {
-        assertEquals("event " + index, new Long(timestamp), events[index].getTime());
+        assertEquals("event " + index, Long.valueOf(timestamp), events[index].getTime());
         assertEquals("event " + index, targetDOMPath, events[index].getTargetDOMPath());
         assertEquals("event " + index, target, events[index].getTarget());
Index: trunk/autoquest-htmlmonitor/.classpath
===================================================================
--- trunk/autoquest-htmlmonitor/.classpath	(revision 2259)
+++ trunk/autoquest-htmlmonitor/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-htmlmonitor/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-htmlmonitor/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-htmlmonitor/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-htmlmonitor/pom.xml
===================================================================
--- trunk/autoquest-htmlmonitor/pom.xml	(revision 2259)
+++ trunk/autoquest-htmlmonitor/pom.xml	(revision 2260)
@@ -120,8 +120,7 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
Index: trunk/autoquest-httpmonitor-test/.classpath
===================================================================
--- trunk/autoquest-httpmonitor-test/.classpath	(revision 2259)
+++ trunk/autoquest-httpmonitor-test/.classpath	(revision 2260)
@@ -24,9 +24,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-httpmonitor-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-httpmonitor-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-httpmonitor-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -2,7 +2,7 @@
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -11,3 +11,3 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-httpmonitor-test/pom.xml
===================================================================
--- trunk/autoquest-httpmonitor-test/pom.xml	(revision 2259)
+++ trunk/autoquest-httpmonitor-test/pom.xml	(revision 2260)
@@ -23,4 +23,14 @@
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>javax.jws-api</artifactId>
+            <version>1.1</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
Index: trunk/autoquest-httpmonitor/.classpath
===================================================================
--- trunk/autoquest-httpmonitor/.classpath	(revision 2259)
+++ trunk/autoquest-httpmonitor/.classpath	(revision 2260)
@@ -19,9 +19,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-httpmonitor/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-httpmonitor/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-httpmonitor/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-httpmonitor/pom.xml
===================================================================
--- trunk/autoquest-httpmonitor/pom.xml	(revision 2259)
+++ trunk/autoquest-httpmonitor/pom.xml	(revision 2260)
@@ -27,4 +27,9 @@
     </distributionManagement>
     <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180725.0427</version>
+        </dependency>
         <dependency>
             <groupId>de.ugoe.cs</groupId>
@@ -72,8 +77,7 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
Index: trunk/autoquest-jfcmonitor/.classpath
===================================================================
--- trunk/autoquest-jfcmonitor/.classpath	(revision 2259)
+++ trunk/autoquest-jfcmonitor/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-jfcmonitor/pom.xml
===================================================================
--- trunk/autoquest-jfcmonitor/pom.xml	(revision 2259)
+++ trunk/autoquest-jfcmonitor/pom.xml	(revision 2260)
@@ -36,8 +36,7 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
Index: trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCListener.java
===================================================================
--- trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCListener.java	(revision 2259)
+++ trunk/autoquest-jfcmonitor/src/main/java/de/ugoe/cs/autoquest/jfcmonitor/JFCListener.java	(revision 2260)
@@ -77,5 +77,5 @@
                 builder.append(" <param name=\"Button\" value=\"" + mouseEvent.getButton() +
                     "\" />" + StringTools.ENDLINE);
-                builder.append(" <param name=\"Modifiers\" value=\"" + mouseEvent.getModifiers() +
+                builder.append(" <param name=\"Modifiers\" value=\"" + mouseEvent.getModifiersEx() +
                     "\" />" + StringTools.ENDLINE);
                 addSourceInfo(builder, event);
@@ -90,5 +90,5 @@
                 builder.append(" <param name=\"KeyCode\" value=\"" + keyEvent.getKeyCode() +
                     "\" />" + StringTools.ENDLINE);
-                builder.append(" <param name=\"Modifiers\" value=\"" + keyEvent.getModifiers() +
+                builder.append(" <param name=\"Modifiers\" value=\"" + keyEvent.getModifiersEx() +
                     "\" />" + StringTools.ENDLINE);
                 addSourceInfo(builder, event);
Index: trunk/autoquest-misc-test/.classpath
===================================================================
--- trunk/autoquest-misc-test/.classpath	(revision 2259)
+++ trunk/autoquest-misc-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-misc-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-misc-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-misc-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-misc/.classpath
===================================================================
--- trunk/autoquest-misc/.classpath	(revision 2259)
+++ trunk/autoquest-misc/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-misc/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-misc/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-misc/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-android-test/.classpath
===================================================================
--- trunk/autoquest-plugin-android-test/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-android-test/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-android-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-android-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-android-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-android/.classpath
===================================================================
--- trunk/autoquest-plugin-android/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-android/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-android/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-android/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-android/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-core-test/.classpath
===================================================================
--- trunk/autoquest-plugin-core-test/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-core-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-core-test/src/test/java/de/ugoe/cs/autoquest/plugin/PluginLoaderTest.java
===================================================================
--- trunk/autoquest-plugin-core-test/src/test/java/de/ugoe/cs/autoquest/plugin/PluginLoaderTest.java	(revision 2259)
+++ trunk/autoquest-plugin-core-test/src/test/java/de/ugoe/cs/autoquest/plugin/PluginLoaderTest.java	(revision 2260)
@@ -19,6 +19,4 @@
 import java.util.Collection;
 
-import junitx.framework.ArrayAssert;
-
 import org.junit.*;
 
@@ -152,5 +150,5 @@
 	}
 	
-	@Test
+	/*@Test
 	public void testGetClassPathFromJar_1() throws Exception {
 		PluginLoader loader = new PluginLoader(new File("."));
@@ -174,5 +172,5 @@
 		
 		ArrayAssert.assertEquivalenceArrays(expected, result);
-	}
+	}*/
 	
 	@Test 
Index: trunk/autoquest-plugin-core/.classpath
===================================================================
--- trunk/autoquest-plugin-core/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-core/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-core/src/main/java/de/ugoe/cs/autoquest/plugin/PluginLoader.java
===================================================================
--- trunk/autoquest-plugin-core/src/main/java/de/ugoe/cs/autoquest/plugin/PluginLoader.java	(revision 2259)
+++ trunk/autoquest-plugin-core/src/main/java/de/ugoe/cs/autoquest/plugin/PluginLoader.java	(revision 2260)
@@ -16,10 +16,6 @@
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -28,11 +24,9 @@
 import java.util.Collections;
 import java.util.LinkedList;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
+import java.util.List;
 
 /**
  * <p>
- * This class provides the functionality to load AutoQUEST plug-ins from a
- * pre-defined folder.
+ * This class provides the functionality to load AutoQUEST plug-ins from a pre-defined folder.
  * </p>
  * 
@@ -40,220 +34,200 @@
  * @version 1.0
  */
-public class PluginLoader {
-
-	/**
-	 * <p>
-	 * Handle of the plug-in directory.
-	 * </p>
-	 */
-	private final File pluginDir;
-
-	/**
-	 * <p>
-	 * Collection of the loaded plug-ins.
-	 * </p>
-	 */
-	private final Collection<AutoQUESTPlugin> plugins;
-
-	/**
-	 * <p>
-	 * Constructor. Creates a new PluginLoader that can load plug-ins the
-	 * defined directory.
-	 * </p>
-	 * 
-	 * @param pluginDir
-	 *            handle of the directory; in case the handle is
-	 *            <code>null</code> or does not describe a directory, an
-	 *            {@link IllegalArgumentException} is thrown
-	 */
-	public PluginLoader(File pluginDir) {
-		if (pluginDir == null) {
-			throw new IllegalArgumentException(
-					"Parameter pluginDir must not be null!");
-		}
-		if (!pluginDir.isDirectory()) {
-			throw new IllegalArgumentException("File " + pluginDir.getPath()
-					+ " is not a directory");
-		}
-		this.pluginDir = pluginDir;
-		plugins = new LinkedList<AutoQUESTPlugin>();
-	}
-
-	/**
-	 * <p>
-	 * Loads plug-ins from {@link #pluginDir}.
-	 * </p>
-	 * 
-	 * @throws PluginLoaderException
-	 *             thrown if there is a problem loading a plug-in or updating
-	 *             the classpath
-	 */
-	public void load() throws PluginLoaderException {
-		File[] jarFiles = pluginDir.listFiles(new FilenameFilter() {
-			@Override
-			public boolean accept(File dir, String name) {
-				return checkNameConformity(name);
-			}
-		});
-
-		if (jarFiles != null) {
-			for (File jarFile : jarFiles) {
-				updateClassLoader(jarFile);
-
-				String pluginName = jarFile.getName().split("-")[2];
-				String pluginClassName = "de.ugoe.cs.autoquest.plugin." + pluginName
-						+ "." + pluginName.toUpperCase() + "Plugin";
-
-				Class<?> pluginClass = null;
-				try {
-					pluginClass = Class.forName(pluginClassName);
-				} catch (ClassNotFoundException e) {
-					throw new PluginLoaderException("No class '" + pluginClassName
-							+ "' found in " + pluginDir + "/" + jarFile.getName());
-				}
-				try {
-					AutoQUESTPlugin pluginObject = (AutoQUESTPlugin) pluginClass
-							.newInstance();
-					plugins.add(pluginObject);
-				} catch (InstantiationException e) {
-					throw new PluginLoaderException("Could not instantiate "
-							+ pluginClassName);
-				} catch (IllegalAccessException e) {
-					throw new PluginLoaderException("Could not access "
-							+ pluginClassName);
-				} catch (ClassCastException e) {
-					throw new PluginLoaderException("Class " + pluginClassName
-							+ " not instance of AutoQUESTPlugin");
-				}
-			}
-		}
-	}
-
-	/**
-	 * <p>
-	 * Retrieves the classpath from a Jar file's MANIFEST.
-	 * </p>
-	 */
-	protected String[] getClassPathFromJar(File jarFile) {
-		String[] classPath;
-
-		JarInputStream jarInputStream = null;
-		Manifest manifest = null;
-		try {
-		    FileInputStream fileStream = new FileInputStream(jarFile);
-		    try {
-		        jarInputStream = new JarInputStream(fileStream);
-		        manifest = jarInputStream.getManifest();
-		    } finally {
-		        jarInputStream.close();
-		        fileStream.close();
-		    }
-		} catch (FileNotFoundException e) {
-			throw new AssertionError(
-					"FileNotFoundException should be impossible!");
-		} catch (IOException e) {
-			throw new PluginLoaderException(e);
-		}
-
-		String jarClassPath = manifest.getMainAttributes().getValue(
-				"Class-Path");
-
-		if (jarClassPath != null) {
-			String[] jarClassPathElements = jarClassPath.split(" ");
-			classPath = new String[jarClassPathElements.length];
-			for (int i = 0; i < jarClassPathElements.length; i++) {
-				classPath[i] = "file:"
-						+ jarFile.getParentFile().getAbsolutePath() + "/"
-						+ jarClassPathElements[i];
-			}
-			try {
-				jarInputStream.close();
-			} catch (IOException e) {
-				throw new PluginLoaderException(e);
-			}
-		} else {
-			classPath = new String[] {};
-		}
-		return classPath;
-	}
-
-	/**
-	 * <p>
-	 * Updates the classpath of the {@link ClassLoader} to include the plug-in
-	 * jar as well as further libraries required by the plug-in jar as defined
-	 * in the <code>Class-Path</code> section of its manifest.
-	 * </p>
-	 * 
-	 * @param jarFile
-	 *            handle of the plug-in jar file
-	 * @throws PluginLoaderException
-	 *             thrown if there is a problem updating the class loader or
-	 *             loading the plug-in jar
-	 */
-	private void updateClassLoader(File jarFile) throws PluginLoaderException {
-		String[] classPath = getClassPathFromJar(jarFile);
-		URLClassLoader classLoader = (URLClassLoader) ClassLoader
-				.getSystemClassLoader();
-		Method method;
-
-		try {
-			method = URLClassLoader.class.getDeclaredMethod("addURL",
-					new Class[] { URL.class });
-		} catch (SecurityException e) {
-			throw new PluginLoaderException(
-					"addURL method of URLClassLoader not accessible via reflection.");
-		} catch (NoSuchMethodException e) {
-			throw new AssertionError(
-					"URLClassLoader does not have addURL method. Should be impossible!!");
-		}
-		method.setAccessible(true);
-
-		try {
-			method.invoke(
-					classLoader,
-					new Object[] { new URL("file:" + jarFile.getAbsoluteFile()) });
-			for (String element : classPath) {
-				method.invoke(classLoader, new Object[] { new URL(element) });
-			}
-		} catch (IllegalArgumentException e) {
-			throw new AssertionError(
-					"Illegal arguments for addURL method. Should be impossible!!");
-		} catch (MalformedURLException e) {
-			throw new PluginLoaderException(e);
-		} catch (IllegalAccessException e) {
-			throw new PluginLoaderException(
-					"addURL method of URLClassLoader not accessible via reflection.");
-		} catch (InvocationTargetException e) {
-			throw new PluginLoaderException(e);
-		}
-	}
-
-	/**
-	 * <p>
-	 * Checks if the name of a file indicates that it defines a AutoQUEST plug-in.
-	 * The structure of valid plug-in filenames is
-	 * <code>autoquest-plugin-%PLUGIN_NAME%-version.jar</code>, where
-	 * <code>%PLUGIN_NAME%</code> is replaced by the name of the plug-in. Note
-	 * that plug-in names must not contain any dashes.
-	 * </p>
-	 * 
-	 * @param filename
-	 *            filename that is checked
-	 * @return true if filename matches pattern of AutoQUEST plug-in; false
-	 *         otherwise
-	 */
-	protected boolean checkNameConformity(String filename) {
-		if (filename == null) {
-			return false;
-		}
-		return filename.startsWith("autoquest-plugin-") && !filename.startsWith("autoquest-plugin-core")
-				&&
-				((filename.split("-").length == 4 && filename.endsWith(".jar")) ||
-				  filename.split("-").length == 5 && filename.endsWith("SNAPSHOT.jar") ||
-				  filename.split("-").length == 6 && filename.endsWith(".jar"));
-	}
-	
-	public Collection<AutoQUESTPlugin> getPlugins() {
-		return Collections.unmodifiableCollection(plugins);
-	}
+public class PluginLoader implements AutoCloseable {
+
+    /**
+     * <p>
+     * Handle of the plug-in directory.
+     * </p>
+     */
+    private final File pluginDir;
+
+    /**
+     * <p>
+     * Collection of the loaded plug-ins.
+     * </p>
+     */
+    private final Collection<AutoQUESTPlugin> plugins;
+    
+    /**
+     * <p>
+     * the class loaders instantiated internally
+     * </p>
+     */
+    private List<URLClassLoader> instantiatedClassLoaders = new LinkedList<>();
+
+    /**
+     * <p>
+     * Constructor. Creates a new PluginLoader that can load plug-ins the defined directory.
+     * </p>
+     * 
+     * @param pluginDir
+     *            handle of the directory; in case the handle is <code>null</code> or does not
+     *            describe a directory, an {@link IllegalArgumentException} is thrown
+     */
+    public PluginLoader(File pluginDir) {
+        if (pluginDir == null) {
+            throw new IllegalArgumentException("Parameter pluginDir must not be null!");
+        }
+        if (!pluginDir.isDirectory()) {
+            throw new IllegalArgumentException("File " + pluginDir.getPath() +
+                " is not a directory");
+        }
+        this.pluginDir = pluginDir;
+        plugins = new LinkedList<AutoQUESTPlugin>();
+    }
+
+    /**
+     * <p>
+     * Loads plug-ins from {@link #pluginDir}.
+     * </p>
+     * 
+     * @throws PluginLoaderException
+     *             thrown if there is a problem loading a plug-in or updating the classpath
+     */
+    public void load() throws PluginLoaderException {
+        File[] jarFiles = pluginDir.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                return checkNameConformity(name);
+            }
+        });
+
+        if (jarFiles != null) {
+            for (File jarFile : jarFiles) {
+                updateClassLoader(jarFile);
+
+                String pluginName = jarFile.getName().split("-")[2];
+                String pluginClassName = "de.ugoe.cs.autoquest.plugin." + pluginName + "." +
+                    pluginName.toUpperCase() + "Plugin";
+
+                Class<?> pluginClass = null;
+                try {
+                    pluginClass = Class.forName(pluginClassName);
+                }
+                catch (ClassNotFoundException e) {
+                    throw new PluginLoaderException("No class '" + pluginClassName + "' found in " +
+                        pluginDir + "/" + jarFile.getName());
+                }
+                try {
+                    AutoQUESTPlugin pluginObject =
+                        (AutoQUESTPlugin) pluginClass.getDeclaredConstructor().newInstance();
+                    plugins.add(pluginObject);
+                }
+                catch (InstantiationException e) {
+                    throw new PluginLoaderException("Could not instantiate " + pluginClassName);
+                }
+                catch (IllegalAccessException e) {
+                    throw new PluginLoaderException("Could not access " + pluginClassName);
+                }
+                catch (ClassCastException e) {
+                    throw new PluginLoaderException("Class " + pluginClassName +
+                        " not instance of AutoQUESTPlugin");
+                }
+                catch (IllegalArgumentException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                catch (InvocationTargetException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                catch (NoSuchMethodException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+                catch (SecurityException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * <p>
+     * Retrieves the classpath from a Jar file's MANIFEST.
+     * </p>
+     */
+    /*
+     * protected String[] getClassPathFromJar(File jarFile) { String[] classPath;
+     * 
+     * JarInputStream jarInputStream = null; Manifest manifest = null; try { FileInputStream
+     * fileStream = new FileInputStream(jarFile); try { jarInputStream = new
+     * JarInputStream(fileStream); manifest = jarInputStream.getManifest(); } finally {
+     * jarInputStream.close(); fileStream.close(); } } catch (FileNotFoundException e) { throw new
+     * AssertionError( "FileNotFoundException should be impossible!"); } catch (IOException e) {
+     * throw new PluginLoaderException(e); }
+     * 
+     * String jarClassPath = manifest.getMainAttributes().getValue( "Class-Path");
+     * 
+     * if (jarClassPath != null) { String[] jarClassPathElements = jarClassPath.split(" ");
+     * classPath = new String[jarClassPathElements.length]; for (int i = 0; i <
+     * jarClassPathElements.length; i++) { classPath[i] = "file:" +
+     * jarFile.getParentFile().getAbsolutePath() + "/" + jarClassPathElements[i]; } try {
+     * jarInputStream.close(); } catch (IOException e) { throw new PluginLoaderException(e); } }
+     * else { classPath = new String[] {}; } return classPath; }
+     */
+
+    /**
+     * <p>
+     * Updates the classpath of the {@link ClassLoader} to include the plug-in jar as well as
+     * further libraries required by the plug-in jar as defined in the <code>Class-Path</code>
+     * section of its manifest.
+     * </p>
+     * 
+     * @param jarFile
+     *            handle of the plug-in jar file
+     * @throws PluginLoaderException
+     *             thrown if there is a problem updating the class loader or loading the plug-in jar
+     */
+    private void updateClassLoader(File jarFile) throws PluginLoaderException {
+        // String[] classPath = getClassPathFromJar(jarFile);
+
+        try {
+            URLClassLoader loader = new URLClassLoader(new URL[]
+                { new URL("file:" + jarFile.getAbsoluteFile()) },
+                                                    ClassLoader.getSystemClassLoader());
+            
+            instantiatedClassLoaders.add(loader);
+        }
+        catch (MalformedURLException e) {
+            throw new PluginLoaderException(e);
+        }
+    }
+
+    /**
+     * <p>
+     * Checks if the name of a file indicates that it defines a AutoQUEST plug-in. The structure of
+     * valid plug-in filenames is <code>autoquest-plugin-%PLUGIN_NAME%-version.jar</code>, where
+     * <code>%PLUGIN_NAME%</code> is replaced by the name of the plug-in. Note that plug-in names
+     * must not contain any dashes.
+     * </p>
+     * 
+     * @param filename
+     *            filename that is checked
+     * @return true if filename matches pattern of AutoQUEST plug-in; false otherwise
+     */
+    protected boolean checkNameConformity(String filename) {
+        if (filename == null) {
+            return false;
+        }
+        return filename.startsWith("autoquest-plugin-") &&
+            !filename.startsWith("autoquest-plugin-core") &&
+            ((filename.split("-").length == 4 && filename.endsWith(".jar")) ||
+                filename.split("-").length == 5 && filename.endsWith("SNAPSHOT.jar") ||
+                filename.split("-").length == 6 && filename.endsWith(".jar"));
+    }
+
+    public Collection<AutoQUESTPlugin> getPlugins() {
+        return Collections.unmodifiableCollection(plugins);
+    }
+
+    @Override
+    public void close() throws Exception {
+        for (URLClassLoader loader : instantiatedClassLoaders) {
+            loader.close();
+        }
+    }
+
 }
Index: trunk/autoquest-plugin-exports/.classpath
===================================================================
--- trunk/autoquest-plugin-exports/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-exports/.classpath	(revision 2260)
@@ -24,9 +24,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-exports/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-exports/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-exports/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-exports/pom.xml
===================================================================
--- trunk/autoquest-plugin-exports/pom.xml	(revision 2259)
+++ trunk/autoquest-plugin-exports/pom.xml	(revision 2260)
@@ -20,4 +20,9 @@
     </scm>
     <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180725.0427</version>
+        </dependency>
         <dependency>
             <groupId>de.ugoe.cs.autoquest</groupId>
Index: trunk/autoquest-plugin-genericevents/.classpath
===================================================================
--- trunk/autoquest-plugin-genericevents/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-genericevents/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-genericevents/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-genericevents/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-genericevents/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-guitar/.classpath
===================================================================
--- trunk/autoquest-plugin-guitar/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-guitar/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-guitar/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-guitar/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-guitar/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-html-test/.classpath
===================================================================
--- trunk/autoquest-plugin-html-test/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-html-test/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-html-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-html-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-html-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-html/.classpath
===================================================================
--- trunk/autoquest-plugin-html/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-html/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-html/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-html/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-html/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-http-test/.classpath
===================================================================
--- trunk/autoquest-plugin-http-test/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-http-test/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-http-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-http-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-http-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-http/.classpath
===================================================================
--- trunk/autoquest-plugin-http/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-http/.classpath	(revision 2260)
@@ -24,9 +24,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-http/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-http/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-http/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-http/pom.xml
===================================================================
--- trunk/autoquest-plugin-http/pom.xml	(revision 2259)
+++ trunk/autoquest-plugin-http/pom.xml	(revision 2260)
@@ -20,4 +20,14 @@
     </scm>
     <dependencies>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180725.0427</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.soap</groupId>
+            <artifactId>javax.xml.soap-api</artifactId>
+            <version>1.4.0</version>
+        </dependency>
         <dependency>
             <groupId>de.ugoe.cs</groupId>
Index: trunk/autoquest-plugin-jfc-test/.classpath
===================================================================
--- trunk/autoquest-plugin-jfc-test/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-jfc-test/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-jfc-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-jfc-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-jfc-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-jfc/.classpath
===================================================================
--- trunk/autoquest-plugin-jfc/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-jfc/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-jfc/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-jfc/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-jfc/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-mfc-test/.classpath
===================================================================
--- trunk/autoquest-plugin-mfc-test/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-mfc-test/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-mfc-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-mfc-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-mfc-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-mfc/.classpath
===================================================================
--- trunk/autoquest-plugin-mfc/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-mfc/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-mfc/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-mfc/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-mfc/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-php/.classpath
===================================================================
--- trunk/autoquest-plugin-php/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-php/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-php/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-php/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-php/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-uml-test/.classpath
===================================================================
--- trunk/autoquest-plugin-uml-test/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-uml-test/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-uml-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-uml-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-uml-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +11,3 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-plugin-uml/.classpath
===================================================================
--- trunk/autoquest-plugin-uml/.classpath	(revision 2259)
+++ trunk/autoquest-plugin-uml/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-plugin-uml/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-plugin-uml/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-plugin-uml/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +11,3 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-runner/.classpath
===================================================================
--- trunk/autoquest-runner/.classpath	(revision 2259)
+++ trunk/autoquest-runner/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-runner/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-runner/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-runner/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-test-utils/.classpath
===================================================================
--- trunk/autoquest-test-utils/.classpath	(revision 2259)
+++ trunk/autoquest-test-utils/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-test-utils/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-test-utils/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-test-utils/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/test/CommandRunner.java
===================================================================
--- trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/test/CommandRunner.java	(revision 2259)
+++ trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/test/CommandRunner.java	(revision 2260)
@@ -44,5 +44,5 @@
         Command command;
         try {
-            command = commandType.newInstance();
+            command = commandType.getDeclaredConstructor().newInstance();
         }
         catch (Exception e) {
Index: trunk/autoquest-test/pom.xml
===================================================================
--- trunk/autoquest-test/pom.xml	(revision 2259)
+++ trunk/autoquest-test/pom.xml	(revision 2260)
@@ -82,8 +82,7 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
@@ -113,5 +112,5 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>3.1.1</version>
                         <executions>
                             <execution>
Index: trunk/autoquest-ui-core-test/.classpath
===================================================================
--- trunk/autoquest-ui-core-test/.classpath	(revision 2259)
+++ trunk/autoquest-ui-core-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-ui-core-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-ui-core-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-ui-core-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-ui-core/.classpath
===================================================================
--- trunk/autoquest-ui-core/.classpath	(revision 2259)
+++ trunk/autoquest-ui-core/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-ui-core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-ui-core/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-ui-core/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +11,3 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDremoveEventDuplicates.java
===================================================================
--- trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDremoveEventDuplicates.java	(revision 2260)
+++ trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDremoveEventDuplicates.java	(revision 2260)
@@ -0,0 +1,290 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.commands.sequences;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import de.ugoe.cs.autoquest.CommandHelpers;
+import de.ugoe.cs.autoquest.SequenceInstanceOf;
+import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget;
+import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonDown;
+import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonInteraction;
+import de.ugoe.cs.autoquest.eventcore.gui.MouseClick;
+import de.ugoe.cs.autoquest.eventcore.gui.MouseDoubleClick;
+import de.ugoe.cs.autoquest.eventcore.gui.ValueSelection;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
+import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.Console;
+import de.ugoe.cs.util.console.GlobalDataContainer;
+
+/**
+ * <p>
+ * TODO comment
+ * </p>
+ * 
+ * @author Patrick Harms
+ * @version 1.0
+ */
+public class CMDremoveEventDuplicates implements Command {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#help()
+     */
+    @Override
+    public String help() {
+        return "removeEventDuplicates <sequences> {<new sequences>}";
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#run(java.util.List)
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public void run(List<Object> parameters) {
+        String sequencesName;
+        String newSequencesName;
+        try {
+            sequencesName = (String) parameters.get(0);
+            if (parameters.size() > 1) {
+                newSequencesName = (String) parameters.get(1);
+            }
+            else {
+                newSequencesName = sequencesName;
+            }
+        }
+        catch (Exception e) {
+            throw new IllegalArgumentException("must provide a sequences name");
+        }
+
+        Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName);
+        if (dataObject == null) {
+            CommandHelpers.objectNotFoundMessage(sequencesName);
+            return;
+        }
+        if (!SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
+            CommandHelpers.objectNotType(sequencesName, "Collection<List<Event<?>>>");
+            return;
+        }
+
+        Collection<List<Event>> newSequences =
+            removeEventDuplicates((Collection<List<Event>>) dataObject);
+
+        if (GlobalDataContainer.getInstance().addData(newSequencesName, newSequences)) {
+            CommandHelpers.dataOverwritten(newSequencesName);
+        }
+        
+    }
+
+    /**
+     *
+     */
+    private Collection<List<Event>> removeEventDuplicates(Collection<List<Event>> sequences) {
+        Collection<List<Event>> newSequences = new LinkedList<List<Event>>();
+        
+        //long[] diffCounter = new long[1000];
+        //Map<String, long[]> diffCounterForPairs = new HashMap<>();
+        
+        int eventsRemoved = 0;
+        
+        for (List<Event> sequence : sequences) {
+            Event predecessor = null;
+            List<Event> result = new ArrayList<Event>();
+            
+            System.out.println("sequence");
+            
+            for (Event event : sequence) {
+                long diff = (predecessor != null) ?
+                    (event.getTimestamp() - predecessor.getTimestamp()) : Long.MAX_VALUE;
+                
+                System.out.println("  " + event.getType() + "\t" + ((IHierarchicalEventTarget) event.getTarget()).getSpecification().toString() + "\t" + event.getTimestamp() + "\t" + diff);
+                /*if (diff < diffCounter.length) {
+                    diffCounter[(int) diff]++;
+                    
+                    long[] specCounter = diffCounterForPairs.get(getKey(predecessor, event));
+                    
+                    if (specCounter == null) {
+                        specCounter = new long[diffCounter.length];
+                        diffCounterForPairs.put(getKey(predecessor, event), specCounter);
+                    }
+                    
+                    specCounter[(int) diff]++;
+                }*/
+                
+                // this border of 30 milliseconds was determined by plotting the time differences
+                // and seeing that there is a real drop of time differences above 30 milliseconds.
+                // And 30 milliseconds is still small enough to expect, that this is not triggered
+                // by a human.
+                if (diff < 30) {
+                    Event toPrefer = getEventToPrefer(predecessor, event);
+
+                    if (toPrefer != null) {
+                        result.set(result.size() - 1, toPrefer);
+                        eventsRemoved++;
+                    }
+                    else {
+                        // do not prefer any of them
+                        result.add(event);
+                    }
+                }
+                else {
+                    result.add(event);
+                }
+                
+                predecessor = result.get(result.size() - 1);
+            }
+            
+            newSequences.add(result);
+        }
+        
+        /*for (int i = 0; i < diffCounter.length; i++) {
+            System.out.print((i + 1) + "ms :\t ");
+            for (int j = 0; j < diffCounter[i]; j = j + 10) {
+                System.out.print('|');
+            }
+            
+            System.out.println();
+        }
+        
+        for (Map.Entry<String, long[]> entry : diffCounterForPairs.entrySet()) {
+            System.out.println("\n\n" + entry.getKey());
+            for (int i = 0; i < entry.getValue().length; i++) {
+                if (entry.getValue()[i] > 0) {
+                    System.out.print((i + 1) + "ms :\t ");
+                    for (int j = 0; j < entry.getValue()[i]; j = j + 10) {
+                        System.out.print('|');
+                    }
+                    
+                    System.out.println();
+                }
+            }
+        }*/
+        
+        Console.println("removed " + eventsRemoved + " events");
+        
+        return newSequences;
+    }
+
+    /**
+     *
+     */
+    /*private String getKey(Event event1, Event event2) {
+        return event1.getType().getClass().getSimpleName() + " on " + event1.getTarget().getClass()
+            + "  -->  " + event2.getType().getClass().getSimpleName() + " on " +
+            event2.getTarget().getClass();
+    }*/
+
+    /**
+     *
+     */
+    private Event getEventToPrefer(Event event1, Event event2) {
+        Event result = null;
+        
+        if (!isSameEventType(event1, event2)) {
+            if (isSameEventTarget(event1, event2) ||
+                oneIsParentTargetOfOtherTarget(event1, event2))
+            {
+                // in a combination of click and value selection on the same element or an element
+                // and its parent, prefer the value selection as it is triggered by the click
+                if (isLeftMouseButtonInteraction(event1) && isValueSelection(event2)) {
+                    result = event2;
+                }
+                else if (isLeftMouseButtonInteraction(event2) && isValueSelection(event1)) {
+                    result = event1;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     *
+     */
+    private boolean isSameEventType(Event event1, Event event2) {
+        return event1.getType().getName().equals(event2.getType().getName());
+    }
+
+    /**
+     * 
+     */
+    private boolean isSameEventTarget(Event event1, Event event2) {
+        return event1.getTarget().equals(event2.getTarget());
+    }
+
+    /**
+     *
+     */
+    private boolean oneIsParentTargetOfOtherTarget(Event event1, Event event2) {
+        if ((event1.getTarget() instanceof IGUIElement) &&
+            (event2.getTarget() instanceof IGUIElement))
+        {
+            IGUIElement elem1 = (IGUIElement) event1.getTarget();
+            IGUIElement elem2 = (IGUIElement) event2.getTarget();
+            
+            return isParent(elem1, elem2) || isParent(elem2, elem1);
+        }
+        
+        return false;
+    }
+
+    /**
+     *
+     */
+    private boolean isParent(IGUIElement elem1, IGUIElement elem2) {
+        IGUIElement parent = elem2.getParent();
+        
+        while (parent != null) {
+            if (parent.equals(elem1)) {
+                return true;
+            }
+            
+            parent = parent.getParent();
+        }
+        
+        return false;
+    }
+
+    /**
+     * 
+     */
+    private boolean isLeftMouseButtonInteraction(Event event) {
+        if (((event.getType() instanceof MouseClick) ||
+             (event.getType() instanceof MouseDoubleClick) ||
+             (event.getType() instanceof MouseButtonDown)) &&
+            (((MouseButtonInteraction) event.getType()).getButton() ==
+                MouseButtonInteraction.Button.LEFT))
+        {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * 
+     */
+    private boolean isValueSelection(Event event) {
+        return event.getType() instanceof ValueSelection;
+    }
+}
Index: trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDusabilityAutoTagger.java
===================================================================
--- trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDusabilityAutoTagger.java	(revision 2260)
+++ trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDusabilityAutoTagger.java	(revision 2260)
@@ -0,0 +1,183 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.commands.usability;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import de.ugoe.cs.autoquest.CommandHelpers;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.DefaultTaskTraversingVisitor;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
+import de.ugoe.cs.autoquest.usability.UsabilityEvaluationResult;
+import de.ugoe.cs.autoquest.usability.UsabilitySmell;
+import de.ugoe.cs.autoquest.usability.UsabilitySmell.ManualLabel;
+import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.GlobalDataContainer;
+
+/**
+ * <p>
+ * TODO comment
+ * </p>
+ * 
+ * @author Patrick Harms
+ * @version 1.0
+ */
+public class CMDusabilityAutoTagger implements Command {
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#run(java.util.List)
+     */
+    @Override
+    public void run(List<Object> parameters) {
+        List<String> usabilityResultNames = new ArrayList<>(parameters.size());
+        try {
+            for (Object parameter : parameters) {
+                usabilityResultNames.add((String) parameter);
+            }
+        }
+        catch (Exception e) {
+            throw new IllegalArgumentException();
+        }
+
+        List<UsabilityEvaluationResult> usabilityResults = new ArrayList<>(usabilityResultNames.size());
+        
+        for (String usabilityResultName : usabilityResultNames) {
+            Object dataObject = GlobalDataContainer.getInstance().getData(usabilityResultName);
+            if (dataObject == null) {
+                CommandHelpers.objectNotFoundMessage(usabilityResultName);
+                return;
+            }
+            if (!(dataObject instanceof UsabilityEvaluationResult)) {
+                CommandHelpers.objectNotType(usabilityResultName, "UsabilityEvaluationResult");
+                return;
+            }
+            
+            usabilityResults.add((UsabilityEvaluationResult) dataObject);
+        }
+        
+        for (UsabilityEvaluationResult result : usabilityResults) {
+            for (UsabilitySmell smell : result.getAllSmells()) {
+                if (smell.getSmellingTask() != null) {
+                    smell.setManualLabel(ManualLabel.TRUE_POSITIVE);
+                    
+                    final Set<String> usedObjectNames = new HashSet<>();
+                    
+                    smell.getSmellingTask().accept(new DefaultTaskTraversingVisitor() {
+                       @Override
+                        public void visit(IEventTask eventTask) {
+                           usedObjectNames.add(((IEventTaskInstance) eventTask.getInstances().iterator().next()).getEvent().getTarget().toString()); 
+                        }
+                    });
+                    
+                    for (String tag : new LinkedList<String>(smell.getTags())) {
+                        smell.removeTag(tag);
+                    }
+                    
+                    if (usedObjectNames.remove("Cup")) {
+                        if (!smell.getTags().contains("Cup")) {
+                            smell.addTag("Cup");
+                        }
+                    }
+                    if (usedObjectNames.remove("StrongCoffee")) {
+                        if (!smell.getTags().contains("Strong Coffee")) {
+                            smell.addTag("Strong Coffee");
+                        }
+                        if (!smell.getTags().contains("Right Button")) {
+                            smell.addTag("Right Button");
+                        }
+                    }
+                    if (usedObjectNames.remove("LightCoffee")) {
+                        if (!smell.getTags().contains("Light Coffee")) {
+                            smell.addTag("Light Coffee");
+                        }
+                        if (!smell.getTags().contains("Right Button")) {
+                            smell.addTag("Right Button");
+                        }
+                    }
+                    if (usedObjectNames.remove("TwoLightCoffees")) {
+                        if (!smell.getTags().contains("Two Light Coffees")) {
+                            smell.addTag("Two Light Coffees");
+                        }
+                        if (!smell.getTags().contains("Right Button")) {
+                            smell.addTag("Right Button");
+                        }
+                    }
+                    if (usedObjectNames.remove("ButtonCopy")) {
+                        if (!smell.getTags().contains("Copy Button")) {
+                            smell.addTag("Copy Button");
+                        }
+                        if (!smell.getTags().contains("Right Button")) {
+                            smell.addTag("Right Button");
+                        }
+                    }
+                    if (usedObjectNames.remove("PrinterTop")) {
+                        if (!smell.getTags().contains("Printer Top")) {
+                            smell.addTag("Printer Top");
+                        }
+                    }
+                    if (usedObjectNames.remove("Paper")) {
+                        if (!smell.getTags().contains("Paper")) {
+                            smell.addTag("Paper");
+                        }
+                    }
+                    if (usedObjectNames.remove("Paper(Clone)1")) {
+                        if (!smell.getTags().contains("Paper")) {
+                            smell.addTag("Paper");
+                        }
+                    }
+                    if (usedObjectNames.remove("Paper(Clone)2")) {
+                        if (!smell.getTags().contains("Paper")) {
+                            smell.addTag("Paper");
+                        }
+                    }
+                    if (usedObjectNames.remove("Buzzer")) {
+                        if (!smell.getTags().contains("Reset")) {
+                            smell.addTag("Reset");
+                        }
+                    }
+                    if (usedObjectNames.remove("Camera (eye)")) {
+                        // ignore
+                    }
+                    if (usedObjectNames.remove("CenterEyeAnchor")) {
+                        // ignore
+                    }
+                    
+                    if (usedObjectNames.size() > 0) {
+                        if (!smell.getTags().contains("Wrong Button")) {
+                            smell.addTag("Wrong Button");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see de.ugoe.cs.util.console.Command#help()
+     */
+    @Override
+    public String help() {
+        return "eventStatistics [<sequencesName>]*";
+    }
+
+}
Index: trunk/autoquest-ui-swt/.classpath
===================================================================
--- trunk/autoquest-ui-swt/.classpath	(revision 2259)
+++ trunk/autoquest-ui-swt/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/autoquest-ui-swt/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest-ui-swt/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest-ui-swt/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowUsabilityEvaluationResultDialog.java
===================================================================
--- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowUsabilityEvaluationResultDialog.java	(revision 2259)
+++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowUsabilityEvaluationResultDialog.java	(revision 2260)
@@ -797,4 +797,6 @@
      */
     private List<ITask> getInvolvedTasks(UsabilitySmell smell) {
+        System.out.println(smell.getSmellingTask());
+        
         List<Object> fragments = smell.getDescriptionFragments();
         List<ITask> involvedTasks = new ArrayList<ITask>();
Index: trunk/autoquest/.classpath
===================================================================
--- trunk/autoquest/.classpath	(revision 2259)
+++ trunk/autoquest/.classpath	(revision 2260)
@@ -6,5 +6,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-11.0.2"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
Index: trunk/autoquest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/autoquest/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/autoquest/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,8 +1,13 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/autoquest/pom.xml
===================================================================
--- trunk/autoquest/pom.xml	(revision 2259)
+++ trunk/autoquest/pom.xml	(revision 2260)
@@ -51,13 +51,12 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
@@ -86,5 +85,5 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
+                <version>3.1.1</version>
                 <configuration>
                     <!-- switch on dependency-driven aggregation -->
Index: trunk/java-utils-test/.classpath
===================================================================
--- trunk/java-utils-test/.classpath	(revision 2259)
+++ trunk/java-utils-test/.classpath	(revision 2260)
@@ -13,9 +13,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/java-utils-test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/java-utils-test/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/java-utils-test/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,5 +1,13 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=9
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/java-utils-test/pom.xml
===================================================================
--- trunk/java-utils-test/pom.xml	(revision 2259)
+++ trunk/java-utils-test/pom.xml	(revision 2260)
@@ -91,8 +91,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>1.8</release>
                 </configuration>
             </plugin>
@@ -100,5 +99,5 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
@@ -134,5 +133,5 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.1.2</version>
                 <executions>
                     <execution>
Index: trunk/java-utils/.classpath
===================================================================
--- trunk/java-utils/.classpath	(revision 2259)
+++ trunk/java-utils/.classpath	(revision 2260)
@@ -18,9 +18,5 @@
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
Index: trunk/java-utils/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/java-utils/.settings/org.eclipse.jdt.core.prefs	(revision 2259)
+++ trunk/java-utils/.settings/org.eclipse.jdt.core.prefs	(revision 2260)
@@ -1,7 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=9
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -10,3 +11,3 @@
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=9
Index: trunk/java-utils/pom.xml
===================================================================
--- trunk/java-utils/pom.xml	(revision 2259)
+++ trunk/java-utils/pom.xml	(revision 2260)
@@ -41,8 +41,7 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
Index: trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java
===================================================================
--- trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java	(revision 2259)
+++ trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java	(revision 2260)
@@ -20,4 +20,5 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -189,5 +190,5 @@
         try {
             Class<?> cmdClass = Class.forName(className);
-            cmd = (Command) cmdClass.newInstance();
+            cmd = (Command) cmdClass.getDeclaredConstructor().newInstance();
         }
         catch (NoClassDefFoundError e) {
@@ -199,4 +200,6 @@
         catch (IllegalAccessException e) {}
         catch (InstantiationException e) {}
+        catch (InvocationTargetException e) {}
+        catch (NoSuchMethodException e) {}
         catch (ClassCastException e) {
             Console.traceln(Level.WARNING, className + "found, but does not implement Command");
