Cleanup output classes.

7 files changed, 37 insertions, 37 deletions

diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
index 1d189e21..f52d4b23 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/Agent.java
@@ -21,11 +21,11 @@ import javax.management.ObjectName;
 import javax.management.StandardMBean;
 
 import org.jacoco.agent.rt.IAgent;
-import org.jacoco.agent.rt.internal.controller.IAgentController;
-import org.jacoco.agent.rt.internal.controller.LocalController;
-import org.jacoco.agent.rt.internal.controller.NoneController;
-import org.jacoco.agent.rt.internal.controller.TcpClientController;
-import org.jacoco.agent.rt.internal.controller.TcpServerController;
+import org.jacoco.agent.rt.internal.output.FileOutput;
+import org.jacoco.agent.rt.internal.output.IAgentOutput;
+import org.jacoco.agent.rt.internal.output.NoneOutput;
+import org.jacoco.agent.rt.internal.output.TcpClientOutput;
+import org.jacoco.agent.rt.internal.output.TcpServerOutput;
 import org.jacoco.core.JaCoCo;
 import org.jacoco.core.data.ExecutionDataWriter;
 import org.jacoco.core.runtime.AbstractRuntime;
@@ -84,7 +84,7 @@ public class Agent implements IAgent {
 
 	private final IExceptionLogger logger;
 
-	private IAgentController controller;
+	private IAgentOutput output;
 
 	private final RuntimeData data;
 
@@ -122,8 +122,8 @@ public class Agent implements IAgent {
 				sessionId = createSessionId();
 			}
 			data.setSessionId(sessionId);
-			controller = createAgentController();
-			controller.startup(options, data);
+			output = createAgentOutput();
+			output.startup(options, data);
 			if (options.getJmx()) {
 				ManagementFactory.getPlatformMBeanServer().registerMBean(
 						new StandardMBean(this, IAgent.class),
@@ -140,9 +140,9 @@ public class Agent implements IAgent {
 	public void shutdown() {
 		try {
 			if (options.getDumpOnExit()) {
-				controller.writeExecutionData(false);
+				output.writeExecutionData(false);
 			}
-			controller.shutdown();
+			output.shutdown();
 			if (options.getJmx()) {
 				ManagementFactory.getPlatformMBeanServer().unregisterMBean(
 						new ObjectName(JMX_NAME));
@@ -153,21 +153,21 @@ public class Agent implements IAgent {
 	}
 
 	/**
-	 * Create controller implementation as given by the agent options.
+	 * Create output implementation as given by the agent options.
 	 * 
 	 * @return configured controller implementation
 	 */
-	IAgentController createAgentController() {
+	IAgentOutput createAgentOutput() {
 		final OutputMode controllerType = options.getOutput();
 		switch (controllerType) {
 		case file:
-			return new LocalController();
+			return new FileOutput();
 		case tcpserver:
-			return new TcpServerController(logger);
+			return new TcpServerOutput(logger);
 		case tcpclient:
-			return new TcpClientController(logger);
+			return new TcpClientOutput(logger);
 		case none:
-			return new NoneController();
+			return new NoneOutput();
 		default:
 			throw new AssertionError(controllerType);
 		}
@@ -214,7 +214,7 @@ public class Agent implements IAgent {
 	}
 
 	public void dump(final boolean reset) throws IOException {
-		controller.writeExecutionData(reset);
+		output.writeExecutionData(reset);
 	}
 
 }
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/LocalController.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/FileOutput.java
index b16c8c4f..4c25c38a 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/LocalController.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/FileOutput.java
@@ -9,7 +9,7 @@
  *    Brock Janiczak - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -21,14 +21,14 @@ import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.RuntimeData;
 
 /**
- * Local only agent controller that will write coverage data to the filesystem.
- * This controller uses the following agent options:
+ * Local only agent output that will write coverage data to the filesystem. This
+ * controller uses the following agent options:
  * <ul>
  * <li>destfile</li>
  * <li>append</li>
  * </ul>
  */
-public class LocalController implements IAgentController {
+public class FileOutput implements IAgentOutput {
 
 	private RuntimeData data;
 
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/IAgentController.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/IAgentOutput.java
index cd2be817..341a73e8 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/IAgentController.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/IAgentOutput.java
@@ -9,7 +9,7 @@
  *    Brock Janiczak - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import java.io.IOException;
 
@@ -17,10 +17,10 @@ import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.RuntimeData;
 
 /**
- * Common interface for different implementations that control execution data
+ * Common interface for different implementations that outputs execution data
  * dumps.
  */
-public interface IAgentController {
+public interface IAgentOutput {
 
 	/**
 	 * Configure the agent controller with the supplied options and connect it
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/NoneController.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/NoneOutput.java
index db1ce665..52138be1 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/NoneController.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/NoneOutput.java
@@ -9,15 +9,15 @@
  *    Mandrikov Evgeny - initial API and implementation
  *
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.RuntimeData;
 
 /**
- * Controller that does nothing.
+ * Output that does nothing.
  */
-public class NoneController implements IAgentController {
+public class NoneOutput implements IAgentOutput {
 
 	public final void startup(final AgentOptions options, final RuntimeData data) {
 		// Nothing to do
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/TcpClientController.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/TcpClientOutput.java
index 72c0b8fc..234c7f54 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/TcpClientController.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/TcpClientOutput.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -19,14 +19,14 @@ import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.RuntimeData;
 
 /**
- * Controller that connects to a TCP port. This controller uses the following
+ * Output that connects to a TCP port. This controller uses the following
  * agent options:
  * <ul>
  * <li>address</li>
  * <li>port</li>
  * </ul>
  */
-public class TcpClientController implements IAgentController {
+public class TcpClientOutput implements IAgentOutput {
 
 	private final IExceptionLogger logger;
 
@@ -40,7 +40,7 @@ public class TcpClientController implements IAgentController {
 	 * @param logger
 	 *            logger to use in case of exceptions is spawned threads
 	 */
-	public TcpClientController(final IExceptionLogger logger) {
+	public TcpClientOutput(final IExceptionLogger logger) {
 		this.logger = logger;
 	}
 
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/TcpConnection.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/TcpConnection.java
index 5c29483e..29118c78 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/TcpConnection.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/TcpConnection.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import java.io.IOException;
 import java.net.Socket;
diff --git a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/TcpServerController.java b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/TcpServerOutput.java
index 8d24e58f..7f4af3b2 100644
--- a/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/controller/TcpServerController.java
+++ b/org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/output/TcpServerOutput.java
@@ -9,7 +9,7 @@
  *    Marc R. Hoffmann - initial API and implementation
  *    
  *******************************************************************************/
-package org.jacoco.agent.rt.internal.controller;
+package org.jacoco.agent.rt.internal.output;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -21,14 +21,14 @@ import org.jacoco.core.runtime.AgentOptions;
 import org.jacoco.core.runtime.RuntimeData;
 
 /**
- * Controller that opens TCP server socket. This controller uses the following
- * agent options:
+ * Output that opens TCP server socket. This controller uses the following agent
+ * options:
  * <ul>
  * <li>address</li>
  * <li>port</li>
  * </ul>
  */
-public class TcpServerController implements IAgentController {
+public class TcpServerOutput implements IAgentOutput {
 
 	private TcpConnection connection;
 
@@ -44,7 +44,7 @@ public class TcpServerController implements IAgentController {
 	 * @param logger
 	 *            logger to use in case of exceptions is spawned threads
 	 */
-	public TcpServerController(final IExceptionLogger logger) {
+	public TcpServerOutput(final IExceptionLogger logger) {
 		this.logger = logger;
 	}