Checkstyle should run on src/test

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/AbstractTokenMakerFactory.java

@@ -116,7 +116,7 @@ private static class TokenMakerCreator {
 		private String className;
 		private ClassLoader cl;
 
-		public TokenMakerCreator(String className, ClassLoader cl) {
+		 TokenMakerCreator(String className, ClassLoader cl) {
 			this.className = className;
 			this.cl = cl!=null ? cl : getClass().getClassLoader();
 		}

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/CodeTemplateManager.java

@@ -341,7 +341,7 @@ private synchronized void sortTemplates() {
 	 * to compare the template's ID to the segment's text.
 	 */
 	private static final class TemplateComparator implements Comparator<Object>,
-			Serializable{
+			Serializable {
 
 		@Override
 		public int compare(Object template, Object segment) {

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java

@@ -559,7 +559,7 @@ public String getMacroID() {
 	/**
 	 * Collapses all comment folds.
 	 */
-	public static class CollapseAllCommentFoldsAction extends FoldRelatedAction{
+	public static class CollapseAllCommentFoldsAction extends FoldRelatedAction {
 
 		private static final long serialVersionUID = 1L;
 

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerFactory.java

@@ -32,7 +32,7 @@ public abstract class TokenMakerFactory {
 	/**
 	 * The singleton default <code>TokenMakerFactory</code> instance.
 	 */
-	private static TokenMakerFactory DEFAULT_INSTANCE;
+	private static TokenMakerFactory defaultInstance;
 
 
 	/**
@@ -43,7 +43,7 @@ public abstract class TokenMakerFactory {
 	 * @see #setDefaultInstance(TokenMakerFactory)
 	 */
 	public static synchronized TokenMakerFactory getDefaultInstance() {
-		if (DEFAULT_INSTANCE==null) {
+		if (defaultInstance ==null) {
 			String clazz;
 			try {
 				clazz= System.getProperty(PROPERTY_DEFAULT_TOKEN_MAKER_FACTORY);
@@ -54,7 +54,7 @@ public static synchronized TokenMakerFactory getDefaultInstance() {
 				clazz = "org.fife.ui.rsyntaxtextarea.DefaultTokenMakerFactory";
 			}
 			try {
-				DEFAULT_INSTANCE = (TokenMakerFactory)Class.forName(clazz).
+				defaultInstance = (TokenMakerFactory)Class.forName(clazz).
 					getDeclaredConstructor().newInstance();
 			} catch (RuntimeException re) { // FindBugs
 				throw re;
@@ -64,7 +64,7 @@ public static synchronized TokenMakerFactory getDefaultInstance() {
 											clazz);
 			}
 		}
-		return DEFAULT_INSTANCE;
+		return defaultInstance;
 	}
 
 
@@ -117,7 +117,7 @@ public static synchronized void setDefaultInstance(TokenMakerFactory tmf) {
 		if (tmf==null) {
 			throw new IllegalArgumentException("tmf cannot be null");
 		}
-		DEFAULT_INSTANCE = tmf;
+		defaultInstance = tmf;
 	}
 
 

RSyntaxTextArea/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex

@@ -1,8 +1,4 @@
 /*
- * 02/11/2008
- *
- * JSPTokenMaker.java - Generates tokens for JSP syntax highlighting.
- * 
  * This library is distributed under a modified BSD license.  See the included
  * LICENSE file for details.
  */
@@ -837,7 +833,6 @@ CSS_Number					= ({CSS_Digits}|{CSS_Hex})
 
 <COMMENT> {
 	[^hwf\n\-]+				{}
-	{URL}					{ int temp=zzStartRead; addToken(start,zzStartRead-1, Token.MARKUP_COMMENT); addHyperlinkToken(temp,zzMarkedPos-1, Token.MARKUP_COMMENT); start = zzMarkedPos; }
 	{URL}					{
                                 int temp = zzStartRead;
                                 if (start <= zzStartRead - 1) {
@@ -1660,6 +1655,8 @@ CSS_Number					= ({CSS_Digits}|{CSS_Hex})
     "FilenameFilter" |
     "Flushable" |
     "ObjectInput" |
+    "ObjectInputFilter" |
+    "ObjectInputFilter.FilterInfo" |
     "ObjectInputValidation" |
     "ObjectOutput" |
     "ObjectStreamConstants" |
@@ -1691,6 +1688,7 @@ CSS_Number					= ({CSS_Digits}|{CSS_Hex})
     "InputStreamReader" |
     "LineNumberInputStream" |
     "LineNumberReader" |
+    "ObjectInputFilter.Config" |
     "ObjectInputStream" |
     "ObjectInputStream.GetField" |
     "ObjectOutputStream" |
@@ -1737,6 +1735,8 @@ CSS_Number					= ({CSS_Digits}|{CSS_Hex})
 
     "IOError" |
 
+    "Serial" |
+
 	/* java.util classes */
     "Collection" |
     "Comparator" |

RSyntaxTextArea/src/test/java/org/fife/TestUtil.java

@@ -1,4 +1,4 @@
-/**
+/*
  * This library is distributed under a modified BSD license.  See the included
  * LICENSE file for details.
  */
@@ -16,7 +16,7 @@
  */
 public final class TestUtil {
 
-	private static String DEFAULT_TEMP_FILE_EXTENSION = ".tmp";
+	private static final String DEFAULT_TEMP_FILE_EXTENSION = ".tmp";
 
 
 	/**

RSyntaxTextArea/src/test/java/org/fife/io/UnicodeReaderTest.java

@@ -22,7 +22,7 @@
 class UnicodeReaderTest {
 
 	private static final String CONTENT = "Hello world";
-	private static boolean origWriteUtf8Bom = false;
+	private static boolean origWriteUtf8Bom;
 
 	private static File createTempFile(Charset charset)	throws IOException {
 		return createTempFile(charset.name());

RSyntaxTextArea/src/test/java/org/fife/io/UnicodeWriterTest.java

@@ -24,7 +24,7 @@
 class UnicodeWriterTest {
 
 	private static final String CONTENT = "Hello world";
-	private static boolean origWriteUtf8Bom = false;
+	private static boolean origWriteUtf8Bom;
 
 	private static File createTempFile() throws IOException {
 		File file = File.createTempFile("unitTest", ".tmp");

RSyntaxTextArea/src/test/java/org/fife/ui/SwingRunnerExtension.java

@@ -1,3 +1,7 @@
+/*
+ * This library is distributed under a modified BSD license.  See the included
+ * LICENSE file for details.
+ */
 package org.fife.ui;
 
 import java.lang.reflect.Method;

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/AbstractTokenMakerTest.java

@@ -43,7 +43,7 @@ void testRemoveLastToken_multipleTokensFoundSoFar() {
 	/**
 	 * A concrete implementation for test purposes.
 	 */
-	private static class ConcreteTestTokenMaker extends AbstractTokenMaker {
+	private static final class ConcreteTestTokenMaker extends AbstractTokenMaker {
 
 		@Override
 		public TokenMap getWordsToHighlight() {

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/CodeTemplateManagerTest.java

@@ -157,8 +157,8 @@ void testSaveTemplates_deletesOldFiles() throws IOException {
 		File tempDir = Files.createTempDirectory("testDir").toFile();
 		manager.setTemplateDirectory(tempDir);
 
-		File oldFile = TestUtil.createFile(
-			".xml", "<test/>", tempDir);
+		// Directory starts out with a file in it
+		TestUtil.createFile(".xml", "<test/>", tempDir);
 
 		manager.saveTemplates();
 		Assertions.assertEquals(0, tempDir.listFiles().length);

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/ErrorStripTest.java

@@ -193,7 +193,7 @@ void testSetMarkerToolTipProvider_notNull() {
 	/**
 	 * A dummy parser that returns a single parser notice for test purposes.
 	 */
-	private static class TestParser extends AbstractParser {
+	private static final class TestParser extends AbstractParser {
 
 		@Override
 		public ParseResult parse(RSyntaxDocument doc, String style) {

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/ParserManagerTest.java

@@ -219,7 +219,7 @@ public ParseResult parse(RSyntaxDocument doc, String style) {
 		RSyntaxTextArea textArea = createTextArea();
 		textArea.addNotify();
 		textArea.setAntiAliasingEnabled(false); // Needed to initialize font metrics cache
-		RTextScrollPane sp = new RTextScrollPane(textArea); // text area needs a parent
+		new RTextScrollPane(textArea); // text area needs a parent
 		ParserManager manager = new ParserManager(textArea);
 		manager.addParser(parser);
 
@@ -235,7 +235,7 @@ public ParseResult parse(RSyntaxDocument doc, String style) {
 	void testInsertUpdate() {
 
 		RSyntaxTextArea textArea = createTextArea();
-		ParserManager manager = new ParserManager(textArea);
+		new ParserManager(textArea);
 
 		textArea.insert("inserted text", 5);
 	}
@@ -245,7 +245,7 @@ void testInsertUpdate() {
 	void testPropertyChange_document() {
 
 		RSyntaxTextArea textArea = createTextArea();
-		ParserManager manager = new ParserManager(textArea);
+		new ParserManager(textArea);
 		RSyntaxDocument origDocument = (RSyntaxDocument)textArea.getDocument();
 
 		RSyntaxDocument newDocument = new RSyntaxDocument(SyntaxConstants.SYNTAX_STYLE_C);
@@ -261,7 +261,7 @@ void testPropertyChange_document() {
 	void testRemoveUpdate() {
 
 		RSyntaxTextArea textArea = createTextArea();
-		ParserManager manager = new ParserManager(textArea);
+		new ParserManager(textArea);
 
 		textArea.replaceRange("", 5, 9);
 	}

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxDocumentTest.java

@@ -38,14 +38,14 @@ class RSyntaxDocumentTest {
 	 */
 	private static void insertHelloWorldC(RSyntaxDocument doc)
 			throws Exception {
-		String str = "#include <stdio.h>\n"
-				+ "/*\n"
-				+ " * Multi-line comment */\n"
-				+ "int main(int argc, char **argv)\n"
-				+ "{\n"
-				+ "    printf(\"Hello world!\n\");\n"
-				+ "\n"
-				+ "}\n";
+		String str = "#include <stdio.h>\n" +
+				"/*\n" +
+				" * Multi-line comment */\n" +
+				"int main(int argc, char **argv)\n" +
+				"{\n" +
+				"    printf(\"Hello world!\n\");\n" +
+				"\n" +
+				"}\n";
 		doc.insertString(0, str, null);
 	}
 
@@ -515,7 +515,7 @@ private static void assertDocumentEvent(DocumentEvent e,
 	/**
 	 * A token maker factory with no mappings to languages.
 	 */
-	private static class EmptyTokenMakerFactory
+	private static final class EmptyTokenMakerFactory
 			extends AbstractTokenMakerFactory {
 
 		@Override

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitCollapseAllCommentFoldsActionTest.java

@@ -53,7 +53,8 @@ void testActionPerformedImpl_collapseAllCommentFolds() {
 
 		textArea.setCaretPosition(textArea.getDocument().getLength());
 
-		RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction a = new RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction();
+		RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction a = new RSyntaxTextAreaEditorKit.
+			CollapseAllCommentFoldsAction();
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCollapseAllCommentFoldsAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -79,7 +80,8 @@ void testActionPerformedImpl_codeFoldingDisabled() {
 		textArea.setCodeFoldingEnabled(false);
 		textArea.setCaretPosition(textArea.getDocument().getLength());
 
-		RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction a = new RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction();
+		RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction a = new RSyntaxTextAreaEditorKit.
+			CollapseAllCommentFoldsAction();
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCollapseAllCommentFoldsAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -89,7 +91,8 @@ void testActionPerformedImpl_codeFoldingDisabled() {
 
 	@Test
 	void testGetMacroId() {
-		RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction a = new RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction();
+		RSyntaxTextAreaEditorKit.CollapseAllCommentFoldsAction a = new RSyntaxTextAreaEditorKit.
+			CollapseAllCommentFoldsAction();
 		Assertions.assertEquals(RSyntaxTextAreaEditorKit.rstaCollapseAllCommentFoldsAction, a.getMacroID());
 	}
 }

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitCopyCutAsStyledTextActionTest.java

@@ -74,7 +74,8 @@ void testActionPerformedImpl_copyAsStyledText() throws Exception {
 		textArea.setCaretPosition(5);
 		textArea.moveCaretPosition(8);
 
-		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(false);
+		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.
+			CopyCutAsStyledTextAction(false);
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCopyAsStyledTextAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -100,7 +101,8 @@ void testActionPerformedImpl_copyAsStyledText_rTextArea() throws Exception {
 		textArea.setCaretPosition(5);
 		textArea.moveCaretPosition(8);
 
-		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(false);
+		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.
+			CopyCutAsStyledTextAction(false);
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCopyAsStyledTextAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -126,7 +128,8 @@ void testActionPerformedImpl_cutAsStyledText() throws Exception {
 		textArea.setCaretPosition(5);
 		textArea.moveCaretPosition(8);
 
-		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(true);
+		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.
+			CopyCutAsStyledTextAction(true);
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCutAsStyledTextAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -163,7 +166,8 @@ void testActionPerformedImpl_cutAsStyledText_rTextArea() throws Exception {
 		textArea.setCaretPosition(5);
 		textArea.moveCaretPosition(8);
 
-		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(true);
+		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.
+			CopyCutAsStyledTextAction(true);
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCutAsStyledTextAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -201,7 +205,8 @@ void testActionPerformedImpl_notEditable() throws Exception {
 		textArea.setCaretPosition(5);
 		textArea.moveCaretPosition(8);
 
-		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(false);
+		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.
+			CopyCutAsStyledTextAction(false);
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCopyAsStyledTextAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -240,7 +245,8 @@ void testActionPerformedImpl_notEnabled() throws Exception {
 		textArea.setCaretPosition(5);
 		textArea.moveCaretPosition(8);
 
-		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(false);
+		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.
+			CopyCutAsStyledTextAction(false);
 		ActionEvent e = createActionEvent(textArea, RSyntaxTextAreaEditorKit.rstaCopyAsStyledTextAction);
 		a.actionPerformedImpl(e, textArea);
 
@@ -263,7 +269,8 @@ void testActionPerformedImpl_notEnabled() throws Exception {
 
 	@Test
 	void testGetMacroId() {
-		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(false);
+		RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction a = new RSyntaxTextAreaEditorKit.
+			CopyCutAsStyledTextAction(false);
 		Assertions.assertEquals(RSyntaxTextAreaEditorKit.rstaCopyAsStyledTextAction, a.getMacroID());
 
 		a = new RSyntaxTextAreaEditorKit.CopyCutAsStyledTextAction(true);

RSyntaxTextArea/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitDumbCompleteWordActionTest.java

@@ -84,7 +84,8 @@ void testActionPerformed_manyLinesInBetween() {
 		action.actionPerformed(createActionEvent(textArea));
 		Assertions.assertEquals("aaron arthur aardvark\nfoo bar\n// bad code\namazing\n   amazing", textArea.getText());
 		action.actionPerformed(createActionEvent(textArea));
-		Assertions.assertEquals("aaron arthur aardvark\nfoo bar\n// bad code\namazing\n   aardvark", textArea.getText());
+		Assertions.assertEquals("aaron arthur aardvark\nfoo bar\n// bad code\namazing\n   aardvark",
+			textArea.getText());
 		action.actionPerformed(createActionEvent(textArea));
 		Assertions.assertEquals("aaron arthur aardvark\nfoo bar\n// bad code\namazing\n   arthur", textArea.getText());
 		action.actionPerformed(createActionEvent(textArea));
@@ -270,8 +271,10 @@ void testGetPreviousWord_manyLinesInBetween() throws Exception {
 		RSyntaxTextArea textArea = new RSyntaxTextArea(doc);
 
 		textArea.setText("aaron arthur aardvark\nfoo bar\n// bad code\namazing\n   a");
-		Assertions.assertEquals(textArea.getDocument().getLength()-1, action.getPreviousWord(textArea, textArea.getDocument().getLength()));
-		Assertions.assertEquals("aaron arthur aardvark\nfoo bar\n// bad code\n".length(), action.getPreviousWord(textArea, textArea.getDocument().getLength()-2));
+		Assertions.assertEquals(textArea.getDocument().getLength()-1,
+			action.getPreviousWord(textArea, textArea.getDocument().getLength()));
+		Assertions.assertEquals("aaron arthur aardvark\nfoo bar\n// bad code\n".length(),
+			action.getPreviousWord(textArea, textArea.getDocument().getLength()-2));
 		Assertions.assertEquals("aaron arthur ".length(), action.getPreviousWord(textArea, 22));
 		Assertions.assertEquals("aaron ".length(), action.getPreviousWord(textArea, 8));