From 75dfccf098810545afe4fbd760c1b94ae1f25b76 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 6 Apr 2012 23:29:48 -0400
Subject: [PATCH] move ForkMain.Tags out to top-level ForkTags to make sxr
 happy

---
 main/actions/ForkTests.scala                  |  2 +-
 testing/agent/src/main/java/sbt/ForkMain.java | 18 +++++++-----------
 testing/agent/src/main/java/sbt/ForkTags.java |  9 +++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 testing/agent/src/main/java/sbt/ForkTags.java

diff --git a/main/actions/ForkTests.scala b/main/actions/ForkTests.scala
index cf29f4e34..56a16959b 100755
--- a/main/actions/ForkTests.scala
+++ b/main/actions/ForkTests.scala
@@ -42,7 +42,7 @@ private[sbt] object ForkTests {
 						val os = new ObjectOutputStream(socket.getOutputStream)
 						val is = new ObjectInputStream(socket.getInputStream)
 
-						import Tags._
+						import ForkTags._
 						@annotation.tailrec def react: Unit = is.readObject match {
 							case `Done` => os.writeObject(Done);
 							case Array(`Error`, s: String) => log.error(s); react
diff --git a/testing/agent/src/main/java/sbt/ForkMain.java b/testing/agent/src/main/java/sbt/ForkMain.java
index 416592b46..52f790029 100755
--- a/testing/agent/src/main/java/sbt/ForkMain.java
+++ b/testing/agent/src/main/java/sbt/ForkMain.java
@@ -15,10 +15,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ForkMain {
-	public static enum Tags {
-		Error, Warn, Info, Debug, Done;
-	}
-
 	static class SubclassFingerscan implements TestFingerprint, Serializable {
 		private boolean isModule;
 		private String superClassName;
@@ -102,10 +98,10 @@ public class ForkMain {
 			Logger[] loggers = {
 				new Logger() {
 					public boolean ansiCodesSupported() { return ansiCodesSupported; }
-					public void error(String s) { write(os, new Object[]{Tags.Error, s});  }
-					public void warn(String s) { write(os, new Object[]{Tags.Warn, s}); }
-					public void info(String s) { write(os, new Object[]{Tags.Info, s}); }
-					public void debug(String s) { write(os, new Object[]{Tags.Debug, s}); }
+					public void error(String s) { write(os, new Object[]{ForkTags.Error, s});  }
+					public void warn(String s) { write(os, new Object[]{ForkTags.Warn, s}); }
+					public void info(String s) { write(os, new Object[]{ForkTags.Info, s}); }
+					public void debug(String s) { write(os, new Object[]{ForkTags.Debug, s}); }
 					public void trace(Throwable t) { write(os, t); }
 				}
 			};
@@ -118,7 +114,7 @@ public class ForkMain {
 				try {
 					framework = (Framework) Class.forName(implClassName).newInstance();
 				} catch (ClassNotFoundException e) {
-					write(os, new Object[]{Tags.Error, "Framework implementation '" + implClassName + "' not present."});
+					write(os, new Object[]{ForkTags.Error, "Framework implementation '" + implClassName + "' not present."});
 					continue;
 				}
 
@@ -139,12 +135,12 @@ public class ForkMain {
 					} else if (test.fingerprint instanceof TestFingerprint) {
 						runner.run(test.name, (TestFingerprint) test.fingerprint, handler, frameworkArgs);
 					} else {
-						write(os, new Object[]{Tags.Error, "Framework '" + framework + "' does not support test '" + test.name + "'"});
+						write(os, new Object[]{ForkTags.Error, "Framework '" + framework + "' does not support test '" + test.name + "'"});
 					}
 					write(os, events.toArray(new ForkEvent[events.size()]));
 				}
 			}
-			write(os, Tags.Done);
+			write(os, ForkTags.Done);
 			is.readObject();
 		}
 	}
diff --git a/testing/agent/src/main/java/sbt/ForkTags.java b/testing/agent/src/main/java/sbt/ForkTags.java
new file mode 100644
index 000000000..31ee70223
--- /dev/null
+++ b/testing/agent/src/main/java/sbt/ForkTags.java
@@ -0,0 +1,9 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2012 Eugene Vigdorchik
+ */
+package sbt;
+
+public enum ForkTags {
+	Error, Warn, Info, Debug, Done;
+}
+