Remove useless imports of classes in same package.

Eclipse JDT 4.15 now marks these as warnings.

Change-Id: Id134898da20ebf2e4d784dcb9348376363b11d57
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java
index 1c19912..398a876 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/HtmlToMarkupTaskTest.java
@@ -18,8 +18,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.eclipse.mylyn.wikitext.ant.internal.HtmlToMarkupTask;
-
 /**
  * @author David Green
  */
@@ -49,7 +47,6 @@
 		assertTrue("Expecting file: " + markupFile, markupFile.exists() && markupFile.isFile());
 
 		String content = getContent(markupFile);
-		
 
 		assertTrue(content.equals("h1. First Heading\n\nsome content\n\nh1. Second Heading\n\nsome more content\n\n"));
 	}
@@ -58,7 +55,8 @@
 		File htmlFile = new File(tempFolder, "markup.html");
 		PrintWriter writer = new PrintWriter(new FileWriter(htmlFile));
 		try {
-			writer.println("<html><body>\n<h1>First Heading</h1>\n\n<p>some content</p>\n<h1>Second Heading</h1>\n<p>some more content</p></body></html>");
+			writer.println(
+					"<html><body>\n<h1>First Heading</h1>\n\n<p>some content</p>\n<h1>Second Heading</h1>\n<p>some more content</p></body></html>");
 		} finally {
 			writer.close();
 		}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java
index a8600d9..c41a5ca 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDitaTaskTest.java
@@ -18,8 +18,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.eclipse.mylyn.wikitext.ant.internal.MarkupToDitaTask;
-
 public class MarkupToDitaTaskTest extends AbstractTestAntTask {
 
 	private MarkupToDitaTask ditaTask;
@@ -111,7 +109,8 @@
 		String ditamapContent = getContent(ditamapFile);
 		assertTrue(ditamapContent.contains("<bookmap>"));
 		assertTrue(ditamapContent.contains("<chapter href=\"topics/FirstHeading.dita\" navtitle=\"First Heading\"/>"));
-		assertTrue(ditamapContent.contains("<chapter href=\"topics/SecondHeading.dita\" navtitle=\"Second Heading\"/>"));
+		assertTrue(
+				ditamapContent.contains("<chapter href=\"topics/SecondHeading.dita\" navtitle=\"Second Heading\"/>"));
 
 		String firstTopicContent = getContent(firstHeadingFile);
 //		<?xml version='1.0' ?><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA 1.1 Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd">
@@ -145,9 +144,8 @@
 
 		String ditamapContent = getContent(ditamapFile);
 
-		
-
-		assertTrue(ditamapContent.contains("<bookmap><title>Sample Title</title><chapter href=\"topics/FirstHeading.dita\" navtitle=\"First Heading\"/><chapter href=\"topics/SecondHeading.dita\" navtitle=\"Second Heading\"/></bookmap>"));
+		assertTrue(ditamapContent.contains(
+				"<bookmap><title>Sample Title</title><chapter href=\"topics/FirstHeading.dita\" navtitle=\"First Heading\"/><chapter href=\"topics/SecondHeading.dita\" navtitle=\"Second Heading\"/></bookmap>"));
 
 		String firstTopicContent = getContent(firstHeadingFile);
 //		<?xml version='1.0' ?><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA 1.1 Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd">
@@ -157,9 +155,9 @@
 //				<p>some content</p>
 //			</body>
 //		</topic>
-		
 
-		assertTrue(firstTopicContent.contains("<topic id=\"FirstHeading\"><title>First Heading</title><body><p>some content</p></body></topic>"));
+		assertTrue(firstTopicContent.contains(
+				"<topic id=\"FirstHeading\"><title>First Heading</title><body><p>some content</p></body></topic>"));
 	}
 
 	public void testCreatesSingleTopic() throws IOException {
@@ -180,8 +178,6 @@
 
 		String firstTopicContent = getContent(firstHeadingFile);
 
-		
-
 		assertTrue(firstTopicContent.contains("<topic id=\"FirstHeading\">"));
 		assertTrue(firstTopicContent.contains("<title>First Heading</title>"));
 		assertTrue(firstTopicContent.contains("<p>some content</p>"));
@@ -209,9 +205,8 @@
 
 		String firstTopicContent = getContent(firstHeadingFile);
 
-		
-
-		assertTrue(firstTopicContent.contains("<topic><title>Sample Title</title><topic id=\"FirstHeading\"><title>First Heading</title><body><p>some content</p></body></topic><topic id=\"SecondHeading\"><title>Second Heading</title><body><p>some more content</p></body></topic></topic>"));
+		assertTrue(firstTopicContent.contains(
+				"<topic><title>Sample Title</title><topic id=\"FirstHeading\"><title>First Heading</title><body><p>some content</p></body></topic><topic id=\"SecondHeading\"><title>Second Heading</title><body><p>some more content</p></body></topic></topic>"));
 	}
 
 	public void testMapbookXRef() throws IOException {
@@ -254,9 +249,6 @@
 		String firstTopicContent = getContent(firstHeadingFile);
 		String secondTopicContent = getContent(secondHeadingFile);
 
-		
-		
-
 		assertTrue(firstTopicContent.contains("<xref href=\"Id2.dita#Id2\">ref to 2</xref>"));
 		assertTrue(secondTopicContent.contains("<xref href=\"Id1.dita#Id1\">ref to 1</xref>"));
 		assertTrue(secondTopicContent.contains("<xref href=\"#Id2\">ref to 2</xref>"));
@@ -280,8 +272,6 @@
 
 		String firstTopicContent = getContent(firstHeadingFile);
 
-		
-
 		assertTrue(firstTopicContent.contains("<topic id=\"Id1\">"));
 		assertTrue(firstTopicContent.contains("<title>First Heading</title>"));
 		assertTrue(firstTopicContent.contains("<xref href=\"#Id2\">ref to 2</xref>"));
@@ -308,8 +298,6 @@
 
 		String firstTopicContent = getContent(firstHeadingFile);
 
-		
-
 		assertTrue(firstTopicContent.contains("<topic id=\"Id1\">"));
 		assertTrue(firstTopicContent.contains("<title>First Heading</title>"));
 		assertTrue(firstTopicContent.contains("<xref href=\"#Id2\">ref to 2</xref>"));
@@ -341,7 +329,8 @@
 		assertTrue(ditamapContent.contains("<bookmap>"));
 		assertTrue(ditamapContent.contains("<chapter href=\"topics/" + MarkupToDitaTaskTest.class.getName()
 				+ ".dita\" navtitle=\"" + MarkupToDitaTaskTest.class.getName() + "\"/>"));
-		assertTrue(ditamapContent.contains("<chapter href=\"topics/SecondHeading.dita\" navtitle=\"Second Heading\"/>"));
+		assertTrue(
+				ditamapContent.contains("<chapter href=\"topics/SecondHeading.dita\" navtitle=\"Second Heading\"/>"));
 
 		String firstTopicContent = getContent(firstHeadingFile);
 //		<?xml version='1.0' ?><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA 1.1 Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd">
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java
index b52feee..20d27d2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToDocbookTaskTest.java
@@ -19,9 +19,6 @@
 import java.io.PrintWriter;
 import java.util.regex.Pattern;
 
-import org.eclipse.mylyn.wikitext.ant.internal.MarkupToDocbookTask;
-
-
 public class MarkupToDocbookTaskTest extends AbstractTestAntTask {
 
 	private MarkupToDocbookTask task;
@@ -44,21 +41,17 @@
 		assertTrue(docbookFile.exists() && docbookFile.isFile());
 
 		String content = getContent(docbookFile);
-//		
+//
 
 		assertTrue(content.contains("<book"));
 		assertTrue(content.contains("</book>"));
 		assertTrue(content.contains("<title>markup</title>"));
 		assertTrue(Pattern.compile(
 				"<chapter id=\"FirstHeading\">\\s*<title>First Heading</title>\\s*<para>some content</para>\\s*</chapter>",
-				Pattern.MULTILINE)
-				.matcher(content)
-				.find());
+				Pattern.MULTILINE).matcher(content).find());
 		assertTrue(Pattern.compile(
 				"<chapter id=\"SecondHeading\">\\s*<title>Second Heading</title>\\s*<para>some more content</para>\\s*</chapter>",
-				Pattern.MULTILINE)
-				.matcher(content)
-				.find());
+				Pattern.MULTILINE).matcher(content).find());
 
 	}
 
@@ -74,21 +67,17 @@
 		assertTrue(docbookFile.exists() && docbookFile.isFile());
 
 		String content = getContent(docbookFile);
-//		
+//
 
 		assertTrue(content.contains("<book"));
 		assertTrue(content.contains("</book>"));
 		assertTrue(content.contains("<title>Alternate Title</title>"));
 		assertTrue(Pattern.compile(
 				"<chapter id=\"FirstHeading\">\\s*<title>First Heading</title>\\s*<para>some content</para>\\s*</chapter>",
-				Pattern.MULTILINE)
-				.matcher(content)
-				.find());
+				Pattern.MULTILINE).matcher(content).find());
 		assertTrue(Pattern.compile(
 				"<chapter id=\"SecondHeading\">\\s*<title>Second Heading</title>\\s*<para>some more content</para>\\s*</chapter>",
-				Pattern.MULTILINE)
-				.matcher(content)
-				.find());
+				Pattern.MULTILINE).matcher(content).find());
 
 	}
 
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java
index afa2d4c..5ab7a9c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToEclipseHelpTaskTest.java
@@ -18,9 +18,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.eclipse.mylyn.wikitext.ant.internal.MarkupToEclipseHelpTask;
-import org.eclipse.mylyn.wikitext.ant.internal.MarkupToHtmlTask;
-
 public class MarkupToEclipseHelpTaskTest extends MarkupToHtmlTaskTest {
 
 	@Override
@@ -36,7 +33,6 @@
 		assertTrue(tocFile.exists());
 
 		String tocContent = getContent(tocFile);
-		
 
 		assertTrue(tocContent.contains("<toc topic=\"markup.html\" label=\"markup\">"));
 		assertTrue(tocContent.contains("<topic href=\"markup.html\" label=\"First Heading\""));
@@ -51,7 +47,6 @@
 		assertTrue(tocFile.exists());
 
 		String tocContent = getContent(tocFile);
-		
 
 		assertTrue(tocContent.contains("<toc topic=\"markup.html\" label=\"markup\">"));
 		assertTrue(tocContent.contains("<topic href=\"markup.html\" label=\"First Heading\""));
@@ -66,7 +61,6 @@
 		assertTrue(tocFile.exists());
 
 		String tocContent = getContent(tocFile);
-		
 
 		assertTrue(tocContent.contains("<toc topic=\"markup.html\" label=\"Alternate Title\">"));
 		assertTrue(tocContent.contains("<topic href=\"markup.html\" label=\"First Heading\""));
@@ -85,7 +79,6 @@
 		assertTrue(tocFile.exists());
 
 		String tocContent = getContent(tocFile);
-		
 
 		assertTrue(tocContent.contains("<toc topic=\"markup.html\" label=\"markup\">"));
 		assertTrue(tocContent.contains("<topic href=\"markup.html\" label=\"First Heading\""));
@@ -122,6 +115,7 @@
 
 	@Override
 	public void testTaskdef() {
-		assertEquals(MarkupToEclipseHelpTask.class.getName(), loadTaskdefBundle().getString("wikitext-to-eclipse-help"));
+		assertEquals(MarkupToEclipseHelpTask.class.getName(),
+				loadTaskdefBundle().getString("wikitext-to-eclipse-help"));
 	}
 }
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java
index 5dacb80..4348e90 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.ant/src/test/java/org/eclipse/mylyn/wikitext/ant/internal/MarkupToXslfoTaskTest.java
@@ -18,9 +18,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.eclipse.mylyn.wikitext.ant.internal.MarkupToXslfoTask;
-
-
 public class MarkupToXslfoTaskTest extends AbstractTestAntTask {
 
 	private MarkupToXslfoTask task;
@@ -43,7 +40,7 @@
 		assertTrue(targetFile.exists() && targetFile.isFile());
 
 		String content = getContent(targetFile);
-//		
+//
 
 		assertTrue(content.contains("<root xmlns=\"http://www.w3.org/1999/XSL/Format\""));
 		assertTrue(content.contains("</root>"));
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java
index dfb7622..9aa55f9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java
@@ -20,12 +20,6 @@
 
 import java.util.List;
 
-import org.eclipse.mylyn.wikitext.html.internal.BlockStrategies;
-import org.eclipse.mylyn.wikitext.html.internal.BlockStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.NoOpBlockStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SubstitutionBlockStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SupportedBlockStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.UnsupportedBlockStrategy;
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
 import org.junit.Rule;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java
index 9c7e874..44353f2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/CompositeSpanStrategyTest.java
@@ -15,9 +15,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.html.internal.CompositeSpanStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SpanStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SubstitutionWithoutCssSpanStrategy;
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.eclipse.mylyn.wikitext.parser.builder.EventDocumentBuilder;
@@ -43,15 +40,17 @@
 
 	@Test
 	public void test() {
-		CompositeSpanStrategy strategy = new CompositeSpanStrategy(Lists.<SpanStrategy> newArrayList(
-				new SubstitutionWithoutCssSpanStrategy(SpanType.BOLD), new SubstitutionWithoutCssSpanStrategy(
-						SpanType.ITALIC)));
+		CompositeSpanStrategy strategy = new CompositeSpanStrategy(
+				Lists.<SpanStrategy> newArrayList(new SubstitutionWithoutCssSpanStrategy(SpanType.BOLD),
+						new SubstitutionWithoutCssSpanStrategy(SpanType.ITALIC)));
 		EventDocumentBuilder builder = new EventDocumentBuilder();
 		strategy.beginSpan(builder, SpanType.DELETED, new Attributes());
 		strategy.endSpan(builder);
 		DocumentBuilderEvents events = builder.getDocumentBuilderEvents();
-		assertEquals(ImmutableList.of(new BeginSpanEvent(SpanType.BOLD, new Attributes()), new BeginSpanEvent(
-				SpanType.ITALIC, new Attributes()), new EndSpanEvent(), new EndSpanEvent()), events.getEvents());
+		assertEquals(
+				ImmutableList.of(new BeginSpanEvent(SpanType.BOLD, new Attributes()),
+						new BeginSpanEvent(SpanType.ITALIC, new Attributes()), new EndSpanEvent(), new EndSpanEvent()),
+				events.getEvents());
 
 	}
 }
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java
index 7c206c1..a4ca1b8 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/FontElementStrategyTest.java
@@ -23,8 +23,6 @@
 import java.util.Arrays;
 
 import org.eclipse.mylyn.wikitext.html.HtmlLanguage;
-import org.eclipse.mylyn.wikitext.html.internal.FontElementStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SpanStrategy;
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
@@ -57,14 +55,14 @@
 
 	@Test
 	public void matchesSpanWithFontFamily() {
-		assertTrue(strategy.matcher()
-				.matches(SpanType.SPAN, new Attributes(null, null, "font-family: something", null)));
+		assertTrue(
+				strategy.matcher().matches(SpanType.SPAN, new Attributes(null, null, "font-family: something", null)));
 	}
 
 	@Test
 	public void matchesSpanWithColorAndFontSize() {
-		assertTrue(strategy.matcher().matches(SpanType.SPAN,
-				new Attributes(null, null, "color: blue;font-size: 10", null)));
+		assertTrue(strategy.matcher()
+				.matches(SpanType.SPAN, new Attributes(null, null, "color: blue;font-size: 10", null)));
 	}
 
 	@Test
@@ -94,8 +92,10 @@
 		builder.characters("test");
 		spanStrategy.endSpan(builder);
 
-		assertEquals(Arrays.asList(new BeginSpanEvent(SpanType.SPAN, new Attributes(null, null, "color: red", null)),
-				new CharactersEvent("test"), new EndSpanEvent()), builder.getDocumentBuilderEvents().getEvents());
+		assertEquals(
+				Arrays.asList(new BeginSpanEvent(SpanType.SPAN, new Attributes(null, null, "color: red", null)),
+						new CharactersEvent("test"), new EndSpanEvent()),
+				builder.getDocumentBuilderEvents().getEvents());
 	}
 
 	@Test
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java
index 89fc3c3..151df1f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java
@@ -19,13 +19,6 @@
 
 import java.util.Collections;
 
-import org.eclipse.mylyn.wikitext.html.internal.SpanHtmlElementStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SpanStrategies;
-import org.eclipse.mylyn.wikitext.html.internal.SpanStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SubstitutionSpanStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SubstitutionWithoutCssSpanStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.SupportedSpanStrategy;
-import org.eclipse.mylyn.wikitext.html.internal.UnsupportedSpanStrategy;
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.junit.Rule;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java
index 6288e04..c24dfea 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionBlockStrategyTest.java
@@ -17,7 +17,6 @@
 
 import java.io.StringWriter;
 
-import org.eclipse.mylyn.wikitext.html.internal.SubstitutionBlockStrategy;
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
 import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java
index 13dda0e..7a99451 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionSpanStrategyTest.java
@@ -17,7 +17,6 @@
 
 import java.io.StringWriter;
 
-import org.eclipse.mylyn.wikitext.html.internal.SubstitutionSpanStrategy;
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java
index e65608d..317d89e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.html/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SubstitutionWithoutCssSpanStrategyTest.java
@@ -17,7 +17,6 @@
 
 import java.util.List;
 
-import org.eclipse.mylyn.wikitext.html.internal.SubstitutionWithoutCssSpanStrategy;
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.eclipse.mylyn.wikitext.parser.builder.EventDocumentBuilder;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java
index c7d6bca..86784f1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.markdown/src/test/java/org/eclipse/mylyn/wikitext/markdown/internal/GfmIdGenerationStrategyTest.java
@@ -15,7 +15,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.markdown.internal.GfmIdGenerationStrategy;
 import org.junit.Test;
 
 public class GfmIdGenerationStrategyTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/.settings/org.eclipse.jdt.core.prefs b/wikitext/core/org.eclipse.mylyn.wikitext.maven/.settings/org.eclipse.jdt.core.prefs
index 8ccab65..72da35e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/.settings/org.eclipse.jdt.core.prefs
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/.settings/org.eclipse.jdt.core.prefs
@@ -33,6 +33,7 @@
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -76,6 +77,7 @@
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java
index 58847dc..22d7fe5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/FileToMarkupLanguageTest.java
@@ -21,7 +21,6 @@
 
 import java.io.File;
 
-import org.eclipse.mylyn.wikitext.maven.internal.FileToMarkupLanguage;
 import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java
index dbe79cd..ea1fadd 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.maven/src/test/java/org/eclipse/mylyn/wikitext/maven/internal/SourceFileTraversalTest.java
@@ -13,8 +13,8 @@
 
 package org.eclipse.mylyn.wikitext.maven.internal;
 
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -22,7 +22,6 @@
 
 import java.io.File;
 
-import org.eclipse.mylyn.wikitext.maven.internal.SourceFileTraversal;
 import org.eclipse.mylyn.wikitext.maven.internal.SourceFileTraversal.Visitor;
 import org.junit.Rule;
 import org.junit.Test;
@@ -52,8 +51,8 @@
 	@Test
 	public void traverseMatchWithPath() {
 		File file = mockFile("one.Test");
-		SourceFileTraversal traversal = new SourceFileTraversal(mockFolder("test",
-				mockFolder("depth1", mockFolder("depth2", file))));
+		SourceFileTraversal traversal = new SourceFileTraversal(
+				mockFolder("test", mockFolder("depth1", mockFolder("depth2", file))));
 		Visitor visitor = mock(Visitor.class);
 		traversal.traverse(visitor);
 		verify(visitor).accept(eq("depth1" + File.separator + "depth2"), same(file));
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java
index d92cfd0..2b51d5f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/WikiTemplateResolverTest.java
@@ -16,9 +16,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage;
-import org.eclipse.mylyn.wikitext.mediawiki.Template;
-import org.eclipse.mylyn.wikitext.mediawiki.WikiTemplateResolver;
 import org.eclipse.mylyn.wikitext.mediawiki.internal.TemplateProcessor;
 
 import junit.framework.TestCase;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java
index ad73310..19850ad 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/MediaWikiIdGenerationStrategyTest.java
@@ -13,8 +13,6 @@
 
 package org.eclipse.mylyn.wikitext.mediawiki.internal;
 
-import org.eclipse.mylyn.wikitext.mediawiki.internal.MediaWikiIdGenerationStrategy;
-
 import junit.framework.TestCase;
 
 public class MediaWikiIdGenerationStrategyTest extends TestCase {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java
index 30adbc0..9e6b54d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/TemplateProcessorTest.java
@@ -20,7 +20,6 @@
 import org.eclipse.mylyn.wikitext.mediawiki.MediaWikiLanguage;
 import org.eclipse.mylyn.wikitext.mediawiki.Template;
 import org.eclipse.mylyn.wikitext.mediawiki.TemplateResolver;
-import org.eclipse.mylyn.wikitext.mediawiki.internal.TemplateProcessor;
 
 import junit.framework.TestCase;
 
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java
index bf8c6c1..0c0d07a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.mediawiki/src/test/java/org/eclipse/mylyn/wikitext/mediawiki/internal/validation/CommentValidationRuleTest.java
@@ -13,7 +13,6 @@
 
 package org.eclipse.mylyn.wikitext.mediawiki.internal.validation;
 
-import org.eclipse.mylyn.wikitext.mediawiki.internal.validation.CommentValidationRule;
 import org.eclipse.mylyn.wikitext.validation.ValidationProblem;
 
 import junit.framework.TestCase;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java
index 749bc3a..11585eb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilder2Test.java
@@ -32,7 +32,6 @@
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.eclipse.mylyn.wikitext.parser.LinkAttributes;
 import org.eclipse.mylyn.wikitext.parser.MarkupParser;
-import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
 import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder.Stylesheet;
 import org.eclipse.mylyn.wikitext.textile.TextileLanguage;
 
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java
index 007ab86..7818c3a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlDocumentBuilderIntegrationTest.java
@@ -18,7 +18,6 @@
 import java.net.URISyntaxException;
 
 import org.eclipse.mylyn.wikitext.parser.MarkupParser;
-import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
 import org.eclipse.mylyn.wikitext.textile.TextileLanguage;
 
 import junit.framework.TestCase;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java
index 05943c2..9723b0f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/SplittingHtmlDocumentBuilderTest.java
@@ -25,7 +25,6 @@
 import java.nio.charset.StandardCharsets;
 
 import org.eclipse.mylyn.wikitext.parser.MarkupParser;
-import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
 import org.eclipse.mylyn.wikitext.splitter.DefaultSplittingStrategy;
 import org.eclipse.mylyn.wikitext.splitter.SplitOutlineItem;
 import org.eclipse.mylyn.wikitext.splitter.SplittingHtmlDocumentBuilder;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java
index 917c6c9..dbc3ba1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileDocumentBuilderDefinitionListTest.java
@@ -19,7 +19,6 @@
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
-import org.eclipse.mylyn.wikitext.textile.internal.TextileDocumentBuilder;
 import org.eclipse.mylyn.wikitext.parser.ListAttributes;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java
index eabb40b..35992c6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/TextileTest.java
@@ -16,7 +16,6 @@
 import java.util.regex.Pattern;
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
-import org.eclipse.mylyn.wikitext.textile.internal.Textile;
 
 import junit.framework.TestCase;
 
@@ -70,16 +69,15 @@
 		int i = 0;
 		for (String value : values) {
 			Matcher matcher = pattern.matcher(value);
-			
+
 			if (matcher.matches()) {
-				
-				
+
 				for (int x = 1; x <= matcher.groupCount(); ++x) {
-					
+
 					assertEquals(verify[i][x], matcher.group(x));
 				}
 			} else {
-				
+
 			}
 			++i;
 		}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java
index 6980c73..cd0d0c2 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/block/CommentBlockTest.java
@@ -16,7 +16,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.eclipse.mylyn.wikitext.textile.internal.block.CommentBlock;
 import org.junit.Test;
 
 public class CommentBlockTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java
index 9280402..a29232c 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/EscapeTextilePhraseModifierTest.java
@@ -19,7 +19,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.mylyn.wikitext.textile.internal.phrase.EscapeTextilePhraseModifier;
 import org.junit.Test;
 
 public class EscapeTextilePhraseModifierTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java
index 2c6c01a..e34eb11 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/phrase/TagEscapeTextilePhraseModifierTest.java
@@ -19,7 +19,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.mylyn.wikitext.textile.internal.phrase.TagEscapeTextilePhraseModifier;
 import org.junit.Test;
 
 public class TagEscapeTextilePhraseModifierTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java
index 5fe7a55..e67f8b5 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/BlockWhitespaceRuleTest.java
@@ -14,7 +14,6 @@
 
 import java.util.List;
 
-import org.eclipse.mylyn.wikitext.textile.internal.validation.BlockWhitespaceRule;
 import org.eclipse.mylyn.wikitext.validation.MarkupValidator;
 import org.eclipse.mylyn.wikitext.validation.ValidationProblem;
 
@@ -40,21 +39,21 @@
 	public void testNoMatch() {
 		final String markup = "bc. \nfoo";
 		ValidationProblem problem = rule.findProblem(markup, 0, markup.length());
-		
+
 		assertNull(problem);
 	}
 
 	public void testNoMatch2() {
 		final String markup = "\nabc.\nfoo";
 		ValidationProblem problem = rule.findProblem(markup, 0, markup.length());
-		
+
 		assertNull(problem);
 	}
 
 	public void testMatch() {
 		final String markup = "bc.\nfoo";
 		ValidationProblem problem = rule.findProblem(markup, 0, markup.length());
-		
+
 		assertNotNull(problem);
 		assertEquals(0, problem.getOffset());
 	}
@@ -62,7 +61,7 @@
 	public void testMatch2() {
 		final String markup = "\nbc.\nfoo";
 		ValidationProblem problem = rule.findProblem(markup, 0, markup.length());
-		
+
 		assertNotNull(problem);
 		assertEquals(1, problem.getOffset());
 	}
@@ -70,7 +69,7 @@
 	public void testMatch3() {
 		final String markup = "\n\n\nbc..\nfoo";
 		ValidationProblem problem = rule.findProblem(markup, 0, markup.length());
-		
+
 		assertNotNull(problem);
 		assertEquals(3, problem.getOffset());
 	}
@@ -79,7 +78,7 @@
 		String markup = "h1. Foo\n\nbc. bar\n\npre.\nsdf\n\nbc.\n\n";
 		List<ValidationProblem> result = validator.validate(markup);
 		assertEquals(2, result.size());
-		
+
 		assertEquals(18, result.get(0).getOffset());
 		assertEquals(4, result.get(0).getLength());
 		assertEquals(28, result.get(1).getOffset());
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java
index 428f8e8..cbeeb0f 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.textile/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/validation/TextileReferenceValidationRuleTest.java
@@ -15,7 +15,6 @@
 
 import java.util.List;
 
-import org.eclipse.mylyn.wikitext.textile.internal.validation.TextileReferenceValidationRule;
 import org.eclipse.mylyn.wikitext.validation.MarkupValidator;
 import org.eclipse.mylyn.wikitext.validation.ValidationProblem;
 
@@ -39,7 +38,7 @@
 	public void testNoErrors() {
 		final String markup = "h1. Title\n\n\"a link\":#Title";
 		List<ValidationProblem> problems = rule.findProblems(markup, 0, markup.length());
-		
+
 		assertNotNull(problems);
 		assertTrue(problems.isEmpty());
 	}
@@ -47,7 +46,7 @@
 	public void testErrors() {
 		final String markup = "h1. Title\n\nsome text \"a link\":#BADTitle more text";
 		List<ValidationProblem> problems = rule.findProblems(markup, 0, markup.length());
-		
+
 		assertNotNull(problems);
 		assertEquals(1, problems.size());
 		assertEquals(21, problems.get(0).getOffset());
@@ -57,7 +56,7 @@
 	public void testFootnoteReference() {
 		String markup = "some text with a footnote reference[1]\n\nfn1. a footnote";
 		List<ValidationProblem> problems = rule.findProblems(markup, 0, markup.length());
-		
+
 		assertNotNull(problems);
 		assertEquals(0, problems.size());
 	}
@@ -65,7 +64,7 @@
 	public void testFootnoteReferenceWithErrors() {
 		String markup = "some text with a footnote reference[1]\n\nfn2. a footnote";
 		List<ValidationProblem> problems = rule.findProblems(markup, 0, markup.length());
-		
+
 		assertNotNull(problems);
 		assertEquals(1, problems.size());
 		assertEquals(35, problems.get(0).getOffset());
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java
index 88e6c85..74bfd41 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.tracwiki/src/test/java/org/eclipse/mylyn/wikitext/tracwiki/TracWikiLanguageTest.java
@@ -20,7 +20,6 @@
 import org.eclipse.mylyn.wikitext.parser.MarkupParser;
 import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage;
 import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguageConfiguration;
-import org.eclipse.mylyn.wikitext.tracwiki.TracWikiLanguage;
 import org.eclipse.mylyn.wikitext.util.ServiceLocator;
 
 import junit.framework.TestCase;
@@ -80,9 +79,8 @@
 		String html = parser.parseToHtml(
 				"there is a macro [[Image(local_attachment.png)]] in the [[Image(http://www.example.com/external.png)]] page");
 
-		assertTrue(Pattern
-				.compile(
-						"<body><p>there is a macro <img border=\"0\" src=\"local_attachment.png\"/> in the <img border=\"0\" src=\"http://www.example.com/external.png\"/> page</p></body>")
+		assertTrue(Pattern.compile(
+				"<body><p>there is a macro <img border=\"0\" src=\"local_attachment.png\"/> in the <img border=\"0\" src=\"http://www.example.com/external.png\"/> page</p></body>")
 				.matcher(html)
 				.find());
 	}
@@ -94,9 +92,8 @@
 		String html = parser.parseToHtml(
 				"there is a macro [[Image(local_attachment.png, alt=Alt Text, title=Title Text, border=5)]] in the page");
 
-		assertTrue(Pattern
-				.compile(
-						"<body><p>there is a macro <img alt=\"Alt Text\" title=\"Title Text\" border=\"5\" src=\"local_attachment.png\"/> in the page</p></body>")
+		assertTrue(Pattern.compile(
+				"<body><p>there is a macro <img alt=\"Alt Text\" title=\"Title Text\" border=\"5\" src=\"local_attachment.png\"/> in the page</p></body>")
 				.matcher(html)
 				.find());
 	}
@@ -108,9 +105,8 @@
 		String html = parser
 				.parseToHtml("there is a macro [[Image(local_attachment.png, 100px, height=10%)]] in the page");
 
-		assertTrue(Pattern
-				.compile(
-						"<body><p>there is a macro <img height=\"10%\" width=\"100\" border=\"0\" src=\"local_attachment.png\"/> in the page</p></body>")
+		assertTrue(Pattern.compile(
+				"<body><p>there is a macro <img height=\"10%\" width=\"100\" border=\"0\" src=\"local_attachment.png\"/> in the page</p></body>")
 				.matcher(html)
 				.find());
 	}
@@ -122,9 +118,8 @@
 		String html = parser.parseToHtml(
 				"there is a macro [[Image(local_attachment.png, right)]] in the [[Image(local_attachment.png, align=left)]] page");
 
-		assertTrue(Pattern
-				.compile(
-						"<body><p>there is a macro <img style=\"float:right;\" border=\"0\" src=\"local_attachment.png\"/> in the <img style=\"float:left;\" border=\"0\" src=\"local_attachment.png\"/> page</p></body>")
+		assertTrue(Pattern.compile(
+				"<body><p>there is a macro <img style=\"float:right;\" border=\"0\" src=\"local_attachment.png\"/> in the <img style=\"float:left;\" border=\"0\" src=\"local_attachment.png\"/> page</p></body>")
 				.matcher(html)
 				.find());
 	}
@@ -136,9 +131,8 @@
 		String html = parser.parseToHtml(
 				"there is a macro [[Image(local_attachment.png, beans, align=beans, border=b, width=10ee)]] in the page");
 
-		assertTrue(Pattern
-				.compile(
-						"<body><p>there is a macro <img border=\"0\" src=\"local_attachment.png\"/> in the page</p></body>")
+		assertTrue(Pattern.compile(
+				"<body><p>there is a macro <img border=\"0\" src=\"local_attachment.png\"/> in the page</p></body>")
 				.matcher(html)
 				.find());
 	}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java
index ed5f518..58ffbb4 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext.twiki/src/test/java/org/eclipse/mylyn/wikitext/twiki/internal/validation/ListWhitespaceValidationRuleTest.java
@@ -13,7 +13,6 @@
 
 package org.eclipse.mylyn.wikitext.twiki.internal.validation;
 
-import org.eclipse.mylyn.wikitext.twiki.internal.validation.ListWhitespaceValidationRule;
 import org.eclipse.mylyn.wikitext.validation.ValidationProblem;
 
 import junit.framework.TestCase;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java
index ad7fdc0..caa654d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/internal/parser/html/XHtmlParserTest.java
@@ -13,9 +13,6 @@
 
 package org.eclipse.mylyn.wikitext.internal.parser.html;
 
-import org.eclipse.mylyn.wikitext.internal.parser.html.AbstractSaxHtmlParser;
-import org.eclipse.mylyn.wikitext.internal.parser.html.XHtmlParser;
-
 public class XHtmlParserTest extends HtmlParserTest {
 	@Override
 	protected AbstractSaxHtmlParser createParser() {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java
index 676ff2d..9235442 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/HtmlParserTest.java
@@ -22,7 +22,6 @@
 import java.io.StringReader;
 import java.io.StringWriter;
 
-import org.eclipse.mylyn.wikitext.parser.HtmlParser;
 import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
 import org.junit.Assert;
 import org.junit.Test;
@@ -61,7 +60,8 @@
 		assertNotNull(instance);
 		assertNotNull(instance.getDelegate());
 		assertTrue(instance.getDelegate() instanceof org.eclipse.mylyn.wikitext.internal.parser.html.HtmlParser);
-		org.eclipse.mylyn.wikitext.internal.parser.html.HtmlParser delegate = (org.eclipse.mylyn.wikitext.internal.parser.html.HtmlParser) instance.getDelegate();
+		org.eclipse.mylyn.wikitext.internal.parser.html.HtmlParser delegate = (org.eclipse.mylyn.wikitext.internal.parser.html.HtmlParser) instance
+				.getDelegate();
 		assertFalse(delegate.getProcessors().isEmpty());
 	}
 
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java
index a40dfa1..e2ad3df 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/IdGeneratorTest.java
@@ -17,7 +17,6 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.eclipse.mylyn.wikitext.parser.IdGenerator;
 import org.eclipse.mylyn.wikitext.parser.markup.IdGenerationStrategy;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java
index 2d41eb9..e1de8ac 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EntityReferencesTest.java
@@ -18,7 +18,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-import org.eclipse.mylyn.wikitext.parser.builder.EntityReferences;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java
index 55aef24..0558394 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/EventDocumentBuilderTest.java
@@ -21,12 +21,11 @@
 import java.util.List;
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
+import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
+import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.eclipse.mylyn.wikitext.parser.HeadingAttributes;
 import org.eclipse.mylyn.wikitext.parser.ImageAttributes;
 import org.eclipse.mylyn.wikitext.parser.LinkAttributes;
-import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
-import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
-import org.eclipse.mylyn.wikitext.parser.builder.EventDocumentBuilder;
 import org.eclipse.mylyn.wikitext.parser.builder.event.AcronymEvent;
 import org.eclipse.mylyn.wikitext.parser.builder.event.BeginBlockEvent;
 import org.eclipse.mylyn.wikitext.parser.builder.event.BeginDocumentEvent;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java
index c349e6a..ca3f22a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/HtmlEntitiesTest.java
@@ -17,7 +17,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
-import org.eclipse.mylyn.wikitext.parser.builder.HtmlEntities;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableList;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java
index 95a0507..13519f6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/MultiplexingDocumentBuilderTest.java
@@ -24,15 +24,12 @@
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder;
+import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
+import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.eclipse.mylyn.wikitext.parser.HeadingAttributes;
 import org.eclipse.mylyn.wikitext.parser.ImageAttributes;
 import org.eclipse.mylyn.wikitext.parser.LinkAttributes;
 import org.eclipse.mylyn.wikitext.parser.Locator;
-import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
-import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
-import org.eclipse.mylyn.wikitext.parser.builder.EventDocumentBuilder;
-import org.eclipse.mylyn.wikitext.parser.builder.MultiplexingDocumentBuilder;
-import org.eclipse.mylyn.wikitext.parser.builder.NoOpDocumentBuilder;
 import org.eclipse.mylyn.wikitext.parser.builder.event.AcronymEvent;
 import org.eclipse.mylyn.wikitext.parser.builder.event.BeginBlockEvent;
 import org.eclipse.mylyn.wikitext.parser.builder.event.BeginDocumentEvent;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java
index 1c4d84f..3c39607 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/AcronymEventTest.java
@@ -17,7 +17,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertInequality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.AcronymEvent;
 import org.junit.Test;
 
 public class AcronymEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java
index 9672fe6..4fdd035 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginBlockEventTest.java
@@ -19,7 +19,6 @@
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
-import org.eclipse.mylyn.wikitext.parser.builder.event.BeginBlockEvent;
 import org.junit.Test;
 
 public class BeginBlockEventTest {
@@ -31,11 +30,11 @@
 
 	@Test
 	public void equals() {
-		assertEquality(new BeginBlockEvent(BlockType.CODE, new Attributes()), new BeginBlockEvent(BlockType.CODE,
-				new Attributes()));
-		assertInequality(new BeginBlockEvent(BlockType.CODE, new Attributes()), new BeginBlockEvent(
-				BlockType.BULLETED_LIST, new Attributes()));
-		assertInequality(new BeginBlockEvent(BlockType.CODE, new Attributes()), new BeginBlockEvent(
-				BlockType.PREFORMATTED, new Attributes()));
+		assertEquality(new BeginBlockEvent(BlockType.CODE, new Attributes()),
+				new BeginBlockEvent(BlockType.CODE, new Attributes()));
+		assertInequality(new BeginBlockEvent(BlockType.CODE, new Attributes()),
+				new BeginBlockEvent(BlockType.BULLETED_LIST, new Attributes()));
+		assertInequality(new BeginBlockEvent(BlockType.CODE, new Attributes()),
+				new BeginBlockEvent(BlockType.PREFORMATTED, new Attributes()));
 	}
 }
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java
index a6d1e8b..ba5cab6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginDocumentEventTest.java
@@ -16,7 +16,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertEquality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.BeginDocumentEvent;
 import org.junit.Test;
 
 public class BeginDocumentEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java
index e27e676..b03b33e 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginHeadingEventTest.java
@@ -18,7 +18,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
-import org.eclipse.mylyn.wikitext.parser.builder.event.BeginHeadingEvent;
 import org.junit.Test;
 
 public class BeginHeadingEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java
index 812dfd8..460c4eb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/BeginSpanEventTest.java
@@ -19,7 +19,6 @@
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
-import org.eclipse.mylyn.wikitext.parser.builder.event.BeginSpanEvent;
 import org.junit.Test;
 
 public class BeginSpanEventTest {
@@ -31,9 +30,9 @@
 
 	@Test
 	public void equals() {
-		assertEquality(new BeginSpanEvent(SpanType.CODE, new Attributes()), new BeginSpanEvent(SpanType.CODE,
-				new Attributes()));
-		assertInequality(new BeginSpanEvent(SpanType.CODE, new Attributes()), new BeginSpanEvent(SpanType.BOLD,
-				new Attributes()));
+		assertEquality(new BeginSpanEvent(SpanType.CODE, new Attributes()),
+				new BeginSpanEvent(SpanType.CODE, new Attributes()));
+		assertInequality(new BeginSpanEvent(SpanType.CODE, new Attributes()),
+				new BeginSpanEvent(SpanType.BOLD, new Attributes()));
 	}
 }
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java
index c41b996..daa2e3a 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersEventTest.java
@@ -17,7 +17,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertInequality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.CharactersEvent;
 import org.junit.Test;
 
 public class CharactersEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java
index 7a2ab21..6f5ab26 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/CharactersUnescapedEventTest.java
@@ -17,7 +17,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertInequality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.CharactersUnescapedEvent;
 import org.junit.Test;
 
 public class CharactersUnescapedEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java
index c11908f..85c7ed9 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/DocumentBuilderEventsTest.java
@@ -19,9 +19,6 @@
 
 import java.util.List;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.BeginDocumentEvent;
-import org.eclipse.mylyn.wikitext.parser.builder.event.DocumentBuilderEvent;
-import org.eclipse.mylyn.wikitext.parser.builder.event.DocumentBuilderEvents;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java
index 3ba6dcc..70b0b25 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndBlockEventTest.java
@@ -16,7 +16,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertEquality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.EndBlockEvent;
 import org.junit.Test;
 
 public class EndBlockEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java
index 2b054f2..66eb210 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndDocumentEventTest.java
@@ -16,7 +16,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertEquality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.EndDocumentEvent;
 import org.junit.Test;
 
 public class EndDocumentEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java
index abe7ff0..f749cf6 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndHeadingEventTest.java
@@ -16,7 +16,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertEquality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.EndHeadingEvent;
 import org.junit.Test;
 
 public class EndHeadingEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java
index b4b7bae..7f37d03 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EndSpanEventTest.java
@@ -16,7 +16,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertEquality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.EndSpanEvent;
 import org.junit.Test;
 
 public class EndSpanEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java
index d4e1dff..027b527 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/EntityReferenceEventTest.java
@@ -17,7 +17,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertInequality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.EntityReferenceEvent;
 import org.junit.Test;
 
 public class EntityReferenceEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java
index c34719d..888a85d 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/HorizontalRuleEventTest.java
@@ -16,7 +16,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertEquality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.HorizontalRuleEvent;
 import org.junit.Test;
 
 public class HorizontalRuleEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java
index 01855fa..8e394cb 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageEventTest.java
@@ -18,7 +18,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
-import org.eclipse.mylyn.wikitext.parser.builder.event.ImageEvent;
 import org.junit.Test;
 
 public class ImageEventTest {
@@ -31,9 +30,9 @@
 
 	@Test
 	public void equals() {
-		assertEquality(new ImageEvent(new Attributes(), "http://example.com/img.png"), new ImageEvent(new Attributes(),
-				"http://example.com/img.png"));
-		assertInequality(new ImageEvent(new Attributes(), "http://example.com/img.png"), new ImageEvent(
-				new Attributes(), "http://example.com/img2.png"));
+		assertEquality(new ImageEvent(new Attributes(), "http://example.com/img.png"),
+				new ImageEvent(new Attributes(), "http://example.com/img.png"));
+		assertInequality(new ImageEvent(new Attributes(), "http://example.com/img.png"),
+				new ImageEvent(new Attributes(), "http://example.com/img2.png"));
 	}
 }
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java
index e3a44a6..35b7aee 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/ImageLinkEventTest.java
@@ -19,7 +19,6 @@
 
 import org.eclipse.mylyn.wikitext.parser.ImageAttributes;
 import org.eclipse.mylyn.wikitext.parser.LinkAttributes;
-import org.eclipse.mylyn.wikitext.parser.builder.event.ImageLinkEvent;
 import org.junit.Test;
 
 public class ImageLinkEventTest {
@@ -33,14 +32,20 @@
 
 	@Test
 	public void equals() {
-		assertEquality(new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
-				"http://example.com/img.png"), new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(),
-				"http://example.com", "http://example.com/img.png"));
-		assertInequality(new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
-				"http://example.com/img.png"), new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(),
-				"http://example.com", "http://example.com/img2.png"));
-		assertInequality(new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
-				"http://example.com/img.png"), new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(),
-				"http://example.com/2", "http://example.com/img.png"));
+		assertEquality(
+				new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
+						"http://example.com/img.png"),
+				new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
+						"http://example.com/img.png"));
+		assertInequality(
+				new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
+						"http://example.com/img.png"),
+				new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
+						"http://example.com/img2.png"));
+		assertInequality(
+				new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com",
+						"http://example.com/img.png"),
+				new ImageLinkEvent(new LinkAttributes(), new ImageAttributes(), "http://example.com/2",
+						"http://example.com/img.png"));
 	}
 }
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java
index a73ca39..1efe624 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LineBreakEventTest.java
@@ -16,7 +16,6 @@
 import static org.eclipse.mylyn.internal.wikitext.test.EqualityAsserts.assertEquality;
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.parser.builder.event.LineBreakEvent;
 import org.junit.Test;
 
 public class LineBreakEventTest {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java
index 30c4fe3..7852001 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/builder/event/LinkEventTest.java
@@ -18,7 +18,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.eclipse.mylyn.wikitext.parser.Attributes;
-import org.eclipse.mylyn.wikitext.parser.builder.event.LinkEvent;
 import org.junit.Test;
 
 public class LinkEventTest {
@@ -30,11 +29,11 @@
 
 	@Test
 	public void equals() {
-		assertEquality(new LinkEvent(new Attributes(), "#name", "text"), new LinkEvent(new Attributes(), "#name",
-				"text"));
-		assertInequality(new LinkEvent(new Attributes(), "#name", "text"), new LinkEvent(new Attributes(), "#name2",
-				"text"));
-		assertInequality(new LinkEvent(new Attributes(), "#name", "text"), new LinkEvent(new Attributes(), "#name",
-				"text2"));
+		assertEquality(new LinkEvent(new Attributes(), "#name", "text"),
+				new LinkEvent(new Attributes(), "#name", "text"));
+		assertInequality(new LinkEvent(new Attributes(), "#name", "text"),
+				new LinkEvent(new Attributes(), "#name2", "text"));
+		assertInequality(new LinkEvent(new Attributes(), "#name", "text"),
+				new LinkEvent(new Attributes(), "#name", "text2"));
 	}
 }
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java
index 0d2cbb6..5c696cf 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/CssParserTest.java
@@ -21,17 +21,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.mylyn.wikitext.parser.css.Block;
-import org.eclipse.mylyn.wikitext.parser.css.CompositeSelector;
-import org.eclipse.mylyn.wikitext.parser.css.CssClassSelector;
-import org.eclipse.mylyn.wikitext.parser.css.CssParser;
-import org.eclipse.mylyn.wikitext.parser.css.CssRule;
-import org.eclipse.mylyn.wikitext.parser.css.DescendantSelector;
-import org.eclipse.mylyn.wikitext.parser.css.IdSelector;
-import org.eclipse.mylyn.wikitext.parser.css.NameSelector;
-import org.eclipse.mylyn.wikitext.parser.css.Selector;
-import org.eclipse.mylyn.wikitext.parser.css.Stylesheet;
-
 import junit.framework.TestCase;
 
 /**
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java
index ae42376..b9ba868 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/css/SparseCharSequenceTest.java
@@ -15,8 +15,6 @@
 
 import java.util.regex.Pattern;
 
-import org.eclipse.mylyn.wikitext.parser.css.SparseCharSequence;
-
 import junit.framework.TestCase;
 
 /**
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java
index af7b81a..d655593 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/parser/markup/MarkupLanguageProviderTest.java
@@ -19,8 +19,6 @@
 import java.util.Set;
 
 import org.eclipse.mylyn.internal.wikitext.MockMarkupLanguage;
-import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage;
-import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguageProvider;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java
index 6a658cb..20ba2b1 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/splitter/DefaultSplittingStrategyTest.java
@@ -15,7 +15,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.mylyn.wikitext.splitter.DefaultSplittingStrategy;
 import org.junit.Test;
 
 public class DefaultSplittingStrategyTest {
@@ -72,9 +71,7 @@
 	@Test
 	public void normalizesUnsafeCharacters() {
 		// ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝàáâãäåçèéêëìíîïñòóôõöùúûüýÿ
-		strategy.heading(
-				1,
-				null,
+		strategy.heading(1, null,
 				"\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00C7\u00C8\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00D1\u00D2\u00D3\u00D4\u00D5\u00D6\u00D9\u00DA\u00DB\u00DC\u00DD\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u00E7\u00E8\u00E9\u00EA\u00EB\u00EC\u00ED\u00EE\u00EF\u00F1\u00F2\u00F3\u00F4\u00F5\u00F6\u00F9\u00FA\u00FB\u00FC\u00FD\u00FF");
 		assertEquals("AAAAAACEEEEIIIINOOOOOUUUUYaaaaaaceeeeiiiinooooouuuuyy", strategy.computeSplitTargetCandidate());
 	}
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java
index 5818c6c..f3ed147 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/DefaultXmlStreamWriterTest.java
@@ -18,7 +18,6 @@
 
 import java.io.StringWriter;
 
-import org.eclipse.mylyn.wikitext.util.DefaultXmlStreamWriter;
 import org.junit.Test;
 
 public class DefaultXmlStreamWriterTest {
@@ -48,7 +47,8 @@
 		writer.writeAttribute("px", "uri:urn:test2", "a", "testv");
 		writer.writeAttribute("b", "test");
 		writer.writeEndElement();
-		assertXml("<?xml version='1.1' encoding='utf-8' ?><test xmlns:pf=\"uri:urn:test\" xmlns:px=\"uri:urn:test2\" pf:a=\"testv\" px:a=\"testv\" b=\"test\"></test>");
+		assertXml(
+				"<?xml version='1.1' encoding='utf-8' ?><test xmlns:pf=\"uri:urn:test\" xmlns:px=\"uri:urn:test2\" pf:a=\"testv\" px:a=\"testv\" b=\"test\"></test>");
 	}
 
 	@Test
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java
index 94a70ca..98c8e44 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/util/FormattingXMLStreamWriterTest.java
@@ -17,8 +17,6 @@
 
 import java.io.StringWriter;
 
-import org.eclipse.mylyn.wikitext.util.DefaultXmlStreamWriter;
-import org.eclipse.mylyn.wikitext.util.FormattingXMLStreamWriter;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -90,8 +88,7 @@
 		writer.writeComment("test one two");
 		writer.writeEndElement();
 		writer.writeEndDocument();
-		assertEquals(
-				"<?xml version='1.0' encoding='utf-8' ?>\n" + "<root>\n" + "\t<!-- test one two -->\n" + "</root>",
+		assertEquals("<?xml version='1.0' encoding='utf-8' ?>\n" + "<root>\n" + "\t<!-- test one two -->\n" + "</root>",
 				out.toString());
 	}
 
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java
index 0da8412..775f078 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/StandaloneMarkupValidatorTest.java
@@ -15,8 +15,6 @@
 
 import java.util.List;
 
-import org.eclipse.mylyn.wikitext.validation.StandaloneMarkupValidator;
-import org.eclipse.mylyn.wikitext.validation.ValidationProblem;
 import org.eclipse.mylyn.wikitext.validation.ValidationProblem.Severity;
 
 import junit.framework.TestCase;
@@ -30,7 +28,8 @@
 		super.setUp();
 		validator = new StandaloneMarkupValidator();
 		validator.setClassLoader(StandaloneMarkupValidatorTest.class.getClassLoader());
-		validator.computeRules("TestMarkupLanguage", StandaloneMarkupValidatorTest.class.getResource("test-plugin.xml"));
+		validator.computeRules("TestMarkupLanguage",
+				StandaloneMarkupValidatorTest.class.getResource("test-plugin.xml"));
 	}
 
 	public void testSimple() {
diff --git a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java
index 705d066..c15f615 100644
--- a/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java
+++ b/wikitext/core/org.eclipse.mylyn.wikitext/src/test/java/org/eclipse/mylyn/wikitext/validation/TestMarkupValidationRule.java
@@ -15,13 +15,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.mylyn.wikitext.validation.ValidationProblem;
-import org.eclipse.mylyn.wikitext.validation.ValidationRule;
 import org.eclipse.mylyn.wikitext.validation.ValidationProblem.Severity;
 
 /**
  * a test markup validation rule that creates errors for text matching "ERROR" or "WARNING".
- * 
+ *
  * @author David Green
  */
 public class TestMarkupValidationRule extends ValidationRule {