removed logging code

src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy.java

@@ -25,7 +25,7 @@ import teetime.framework.Stage;
  */
 public final class RoundRobinStrategy implements IDistributorStrategy {
 
-	private int index = 0;
+	private int index;
 
 	@Override
 	public <T> boolean distribute(final OutputPort<T>[] outputPorts, final T element) {

src/main/java/teetime/stage/basic/distributor/RoundRobinStrategy2.java

@@ -25,7 +25,7 @@ import teetime.framework.Stage;
  */
 public final class RoundRobinStrategy2 implements IDistributorStrategy {
 
-	private int index = 0;
+	private int index;
 	private int numWaits;
 
 	@Override
@@ -46,8 +46,6 @@ public final class RoundRobinStrategy2 implements IDistributorStrategy {
 			numLoops--;
 		} while (!success);
 
-		System.out.println("Sent " + element + " via " + outputPort);
-
 		return true;
 	}
 

src/main/java/teetime/stage/basic/distributor/dynamic/CreatePortAction.java

@@ -19,13 +19,8 @@ public class CreatePortAction<T> implements PortAction<T> {
 		this.inputPort = inputPort;
 	}
 
-	public InputPort<T> getInputPort() {
-		return inputPort;
-	}
-
 	@Override
 	public void execute(final DynamicDistributor<T> dynamicDistributor) {
-		System.out.println("Creating...");
 		OutputPort<? extends T> newOutputPort = dynamicDistributor.getNewOutputPort();
 
 		INTER_THREAD_PIPE_FACTORY.create(newOutputPort, inputPort);
@@ -38,6 +33,9 @@ public class CreatePortAction<T> implements PortAction<T> {
 		newOutputPort.sendSignal(new StartingSignal());
 
 		// FIXME pass the new thread to the analysis so that it can terminate the thread at the end
-		System.out.println("Created.");
+	}
+
+	InputPort<T> getInputPort() { // for testing purposes only
+		return inputPort;
 	}
 }

src/main/java/teetime/stage/basic/distributor/dynamic/RemovePortAction.java

@@ -13,22 +13,20 @@ public class RemovePortAction<T> implements PortAction<T> {
 		this.outputPort = outputPort;
 	}
 
-	// public DynamicOutputPort<T> getOutputPort() {
-	// return outputPort;
-	// }
-
 	@Override
 	public void execute(final DynamicDistributor<T> dynamicDistributor) {
-		System.out.println("Removing...");
+		OutputPort<?> outputPortToRemove;
+
 		if (dynamicDistributor instanceof ControlledDynamicDistributor) {
+			// for testing purposes only
 			OutputPort<?>[] outputPorts = ((ControlledDynamicDistributor<?>) dynamicDistributor).getOutputPorts();
-			OutputPort<?> outputPortToRemove = outputPorts[outputPorts.length - 1];
-			// outputPortToRemove = outputPort;
+			outputPortToRemove = outputPorts[outputPorts.length - 1];
+		} else {
+			outputPortToRemove = outputPort;
+		}
 
-			outputPortToRemove.sendSignal(new TerminatingSignal());
+		outputPortToRemove.sendSignal(new TerminatingSignal());
 
-			dynamicDistributor.removeDynamicPort((DynamicOutputPort<?>) outputPortToRemove);
-		}
-		System.out.println("Removed.");
+		dynamicDistributor.removeDynamicPort((DynamicOutputPort<?>) outputPortToRemove);
 	}
 }