Apply pull request suggestions.

src/main/java/org/junit/contrib/java/lang/system/LogMode.java

@@ -18,5 +18,5 @@ public enum LogMode {
 	/**
 	 * Capture the writes to the stream.  On test failure write to the original stream.
 	 */
-	LOG_ONLY_ON_FAILURE
+	LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY
 }

src/main/java/org/junit/contrib/java/lang/system/internal/PrintStreamLog.java

@@ -31,24 +31,15 @@ protected void starting(Description description) {
 					NO_AUTO_FLUSH, ENCODING);
 			setStream(wrappedStream);
 		} catch (UnsupportedEncodingException e) {
-			throw new Error(e); // JRE missing UTF-8
+			throw new RuntimeException(e); // JRE missing UTF-8
 		}
 	}
 
 	@Override
 	protected void failed(Throwable e, Description description) {
 		// Only log-on-failure mode needs to print; the others already handle this
-		switch (mode) {
-			case LOG_AND_WRITE_TO_STREAM:
-			case LOG_ONLY:
-				break;
-			case LOG_ONLY_ON_FAILURE:
-				originalStream.print(getLog());
-				break;
-			default:
-				throw new IllegalArgumentException("The LogMode " + mode
-						+ " is not supported");
-		}
+		if (mode == LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY)
+			originalStream.print(getLog());
 	}
 
 	@Override
@@ -61,7 +52,7 @@ private OutputStream getNewStream() {
 			case LOG_AND_WRITE_TO_STREAM:
 				return new TeeOutputStream(originalStream, log);
 			case LOG_ONLY:
-			case LOG_ONLY_ON_FAILURE:
+			case LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY:
 				return log;
 			default:
 				throw new IllegalArgumentException("The LogMode " + mode

src/test/java/org/junit/contrib/java/lang/system/PrintStreamLogOnFailureTest.java

@@ -54,7 +54,7 @@ public class PrintStreamLogOnFailureTest {
 
 	@Test
 	public void doesNotWriteToSystemOutputStreamForLogOnFailureModeWithoutFailure() throws Throwable {
-		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = out;
 		try {
 			ByteArrayOutputStream captureOutputStream = new ByteArrayOutputStream();
@@ -68,7 +68,7 @@ public void doesNotWriteToSystemOutputStreamForLogOnFailureModeWithoutFailure()
 
 	@Test
 	public void doesWriteToOutputLogForLogOnFailureModeWithoutFailure() throws Throwable {
-		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = out;
 		try {
 			ByteArrayOutputStream captureOutputStream = new ByteArrayOutputStream();
@@ -82,7 +82,7 @@ public void doesWriteToOutputLogForLogOnFailureModeWithoutFailure() throws Throw
 
 	@Test
 	public void doesWriteToSystemOutputStreamForLogOnFailureModeWithFailure() throws Throwable {
-		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = out;
 		ByteArrayOutputStream captureOutputStream = new ByteArrayOutputStream();
 		try {
@@ -97,7 +97,7 @@ public void doesWriteToSystemOutputStreamForLogOnFailureModeWithFailure() throws
 
 	@Test
 	public void doesWriteToOutputLogForLogOnFailureModeWithFailure() throws Throwable {
-		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = out;
 		try {
 			ByteArrayOutputStream captureOutputStream = new ByteArrayOutputStream();
@@ -112,7 +112,7 @@ public void doesWriteToOutputLogForLogOnFailureModeWithFailure() throws Throwabl
 
 	@Test
 	public void doesNotWriteToSystemErrorStreamForLogOnFailureModeWithoutFailure() throws Throwable {
-		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = err;
 		try {
 			ByteArrayOutputStream captureErrorStream = new ByteArrayOutputStream();
@@ -126,7 +126,7 @@ public void doesNotWriteToSystemErrorStreamForLogOnFailureModeWithoutFailure() t
 
 	@Test
 	public void doesWriteToErrorLogForLogOnFailureModeWithoutFailure() throws Throwable {
-		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = err;
 		try {
 			ByteArrayOutputStream captureErrorStream = new ByteArrayOutputStream();
@@ -140,7 +140,7 @@ public void doesWriteToErrorLogForLogOnFailureModeWithoutFailure() throws Throwa
 
 	@Test
 	public void doesWriteToSystemErrorStreamForLogOnFailureModeWithFailure() throws Throwable {
-		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = err;
 		ByteArrayOutputStream captureErrorStream = new ByteArrayOutputStream();
 		try {
@@ -155,7 +155,7 @@ public void doesWriteToSystemErrorStreamForLogOnFailureModeWithFailure() throws
 
 	@Test
 	public void doesWriteToErrorLogForLogOnFailureModeWithFailure() throws Throwable {
-		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_ONLY_ON_FAILURE);
+		StandardErrorStreamLog log = new StandardErrorStreamLog(LogMode.LOG_AND_WRITE_TO_STREAM_ON_FAILURE_ONLY);
 		PrintStream originalStream = err;
 		try {
 			ByteArrayOutputStream captureErrorStream = new ByteArrayOutputStream();