Removing unused throws clauses and adding unit tests

Author: bobbylight

build.gradle

@@ -2,6 +2,15 @@
 // Jacoco and a coveralls upload plugin needed for publishing coverage results
 ['jacoco', 'com.github.kt3k.coveralls'].each { apply plugin: it }
 
+// We require building with JDK 8 or later.  We turn off doclint since our
+// generated *TokenMakers have horrible documentation (see https://github.com/jflex-de/jflex/issues/182)
+assert org.gradle.api.JavaVersion.current().isJava8Compatible()
+allprojects {
+	tasks.withType(Javadoc) {
+		options.addStringOption('Xdoclint:none', '-quiet')
+	}
+}
+
 group = 'com.fifesoft'
 archivesBaseName = 'rsyntaxtextarea'
 
@@ -20,7 +29,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1'
+		classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
 	}
 }
 
@@ -36,15 +45,6 @@ checkstyle {
 	configFile = 'config/checkstyle/checkstyle.xml' as File
 }
 
-// We require building with JDK 8 or later.  We turn off doclint since our
-// generated *TokenMakers have horrible documentation (see https://github.com/jflex-de/jflex/issues/182)
-assert org.gradle.api.JavaVersion.current().isJava8Compatible()
-allprojects {
-	tasks.withType(Javadoc) {
-		options.addStringOption('Xdoclint:none', '-quiet')
-	}
-}
-
 compileJava {
 	sourceCompatibility javaVersion
 	targetCompatibility javaVersion
@@ -201,37 +201,16 @@ uploadArchives {
 						}
 					}
 
-					// Says to enforce 1.5 compatibility when building
-					// Doesn't work as of Gradle 2.0 due to a Groovy bug; see
-					// http://jira.codehaus.org/browse/GROOVY-7023
-					// For now, append it via XML directly
-					/*
-					build {
-						plugins {
-							plugin {
-								artifactId 'maven-compiler-plugin'
-								version '2.3.2'
-								executions {
-									execution {
-										id 'default-compile'
-										configuration {
-											source '1.5'
-											target '1.5'
-										}
-									}
-								}
-							}
-						}
-					}
-					*/
+					// Ugh, have to do this for the "build" section
+					// http://stackoverflow.com/questions/27975786/trouble-injecting-the-build-block-while-exporting-a-maven-pom-xml-file-from-grad
 					withXml {
 						def pluginNode = asNode().appendNode('build').appendNode('plugins').appendNode('plugin')
 						pluginNode.appendNode('artifactId', 'maven-compiler-plugin')
-						pluginNode.appendNode('version', '2.3.2')
+						pluginNode.appendNode('version', '3.5.1')
 						def executionNode = pluginNode.appendNode('executions').appendNode('execution')
 						executionNode.appendNode('id', 'default-compile')
-						executionNode.appendNode('configuration').appendNode('source', '1.5').
-						      parent().appendNode('target', '1.5')
+						executionNode.appendNode('configuration').appendNode('source', javaVersion).
+						      parent().appendNode('target', javaVersion)
 					}
 				}
 			}

src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex

@@ -360,7 +360,7 @@ URL						= (((https?|f(tp|ile))"://"|"www.")({URLCharacters}{URLEndCharacter})?)
 "*current-namespace*" |
 "*in*" |
 "*out*" |
-"*print-meta*"
+"*print-meta*" |
 "->" |
 ".." |
 "agent" |

src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenMaker.java

@@ -171,6 +171,7 @@ import org.fife.ui.rsyntaxtextarea.*;
 	 * @return Whether tokens of this type should have "mark occurrences"
 	 *         enabled.
 	 */
+	@Override
 	public boolean getMarkOccurrencesOfTokenType(int type) {
 		return false;
 	}
@@ -311,12 +312,12 @@ URL						= (((https?|f(tp|ile))"://"|"www.")({URLCharacters}{URLEndCharacter})?)
 
 <COMMENT> {
 	[^hwf\n\-]+					{}
-	{URL}						{ int temp=zzStartRead; addToken(start,zzStartRead-1, Token.COMMENT_MULTILINE); addHyperlinkToken(temp,zzMarkedPos-1, Token.COMMENT_MULTILINE); start = zzMarkedPos; }
+	{URL}						{ int temp=zzStartRead; addToken(start,zzStartRead-1, Token.MARKUP_COMMENT); addHyperlinkToken(temp,zzMarkedPos-1, Token.MARKUP_COMMENT); start = zzMarkedPos; }
 	[hwf]						{}
-	"-->"						{ int temp = zzMarkedPos; addToken(start,zzStartRead+2, Token.COMMENT_MULTILINE); start = temp; yybegin(prevState); }
+	"-->"						{ int temp = zzMarkedPos; addToken(start,zzStartRead+2, Token.MARKUP_COMMENT); start = temp; yybegin(prevState); }
 	"-"							{}
 	{LineTerminator} |
-	<<EOF>>						{ addToken(start,zzStartRead-1, Token.COMMENT_MULTILINE); addEndToken(INTERNAL_IN_COMMENT - prevState); return firstToken; }
+	<<EOF>>						{ addToken(start,zzStartRead-1, Token.MARKUP_COMMENT); addEndToken(INTERNAL_IN_COMMENT - prevState); return firstToken; }
 }
 
 <INTAG_START> {

src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex

@@ -199,7 +199,7 @@ import org.fife.ui.rsyntaxtextarea.*;
 	 *
 	 * @param reader   the new input stream 
 	 */
-	public final void yyreset(java.io.Reader reader) throws IOException {
+	public final void yyreset(java.io.Reader reader) {
 		// 's' has been updated.
 		zzBuffer = s.array;
 		/*

src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenMaker.java

@@ -106,7 +106,7 @@ else if (stringFlavor != null) {
 	 * Import the given stream data into the text component.
 	 */
 	protected void handleReaderImport(Reader in, JTextComponent c)
-							throws BadLocationException, IOException {
+							throws IOException {
 
 		char[] buff = new char[1024];
 		int nch;
@@ -299,8 +299,6 @@ public boolean importData(JComponent comp, Transferable t) {
 				imported = true;
 			} catch (UnsupportedFlavorException ufe) {
 				ufe.printStackTrace();
-			} catch (BadLocationException ble) {
-				ble.printStackTrace();
 			} catch (IOException ioe) {
 				ioe.printStackTrace();
 			}

src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex

@@ -45,7 +45,8 @@ protected void assertAllTokensOfType(String[] tokens, int expectedType) {
 			Segment segment = createSegment(token);
 			TokenMaker tm = createTokenMaker();
 			Token t = tm.getTokenList(segment, TokenTypes.NULL, 0);
-			Assert.assertEquals("Token has unexpected type: " + token, expectedType, t.getType());
+			Assert.assertEquals("Token has unexpected type: orig=" + token +
+					", actual=" + t, expectedType, t.getType());
 		}
 
 	}