changed visibilities

src/main/java/teetime/framework/AbstractStage.java

@@ -14,7 +14,7 @@ import teetime.framework.pipe.IPipe;
 import teetime.framework.signal.ISignal;
 import teetime.framework.validation.InvalidPortConnection;
 
-public abstract class AbstractStage extends AbstractBasicStage {
+public abstract class AbstractStage extends Stage {
 
 	private final String id;
 	/**
@@ -22,7 +22,7 @@ public abstract class AbstractStage extends AbstractBasicStage {
 	 */
 	protected final Logger logger; // NOPMD
 
-	private IStage parentStage;
+	private Stage parentStage;
 
 	private final List<InputPort<?>> inputPortList = new ArrayList<InputPort<?>>();
 	private final List<OutputPort<?>> outputPortList = new ArrayList<OutputPort<?>>();
@@ -75,12 +75,12 @@ public abstract class AbstractStage extends AbstractBasicStage {
 	}
 
 	@Override
-	public IStage getParentStage() {
+	public Stage getParentStage() {
 		return this.parentStage;
 	}
 
 	@Override
-	public void setParentStage(final IStage parentStage, final int index) {
+	public void setParentStage(final Stage parentStage, final int index) {
 		this.parentStage = parentStage;
 	}
 

src/main/java/teetime/framework/Analysis.java

@@ -28,8 +28,8 @@ public class Analysis implements UncaughtExceptionHandler {
 	}
 
 	public void init() {
-		final List<AbstractBasicStage> threadableStageJobs = this.configuration.getThreadableStageJobs();
-		for (AbstractBasicStage stage : threadableStageJobs) {
+		final List<Stage> threadableStageJobs = this.configuration.getThreadableStageJobs();
+		for (Stage stage : threadableStageJobs) {
 			final Thread thread = new Thread(new RunnableStage(stage));
 			switch (stage.getTerminationStrategy()) {
 			case BY_SIGNAL:

src/main/java/teetime/framework/AnalysisConfiguration.java

@@ -8,15 +8,15 @@ import teetime.framework.pipe.PipeFactoryRegistry;
 public class AnalysisConfiguration {
 
 	protected static final PipeFactoryRegistry PIPE_FACTORY_REGISTRY = PipeFactoryRegistry.INSTANCE;
-	private final List<AbstractBasicStage> threadableStageJobs = new LinkedList<AbstractBasicStage>();
+	private final List<Stage> threadableStageJobs = new LinkedList<Stage>();
 
 	public AnalysisConfiguration() {}
 
-	List<AbstractBasicStage> getThreadableStageJobs() {
+	List<Stage> getThreadableStageJobs() {
 		return this.threadableStageJobs;
 	}
 
-	public void addThreadableStage(final AbstractBasicStage stage) {
+	public void addThreadableStage(final Stage stage) {
 		this.threadableStageJobs.add(stage);
 	}
 

src/main/java/teetime/framework/IStage.java

-package teetime.framework;
-
-import java.util.List;
-
-import teetime.framework.validation.InvalidPortConnection;
-
-@Deprecated
-public interface IStage {
-
-	public String getId();
-
-	public IStage getParentStage();
-
-	public void setParentStage(IStage parentStage, int index);
-
-	/**
-	 *
-	 * @param invalidPortConnections
-	 *            <i>(Passed as parameter for performance reasons)</i>
-	 */
-	public void validateOutputPorts(List<InvalidPortConnection> invalidPortConnections);
-}

src/main/java/teetime/framework/InputPort.java

@@ -4,9 +4,9 @@ import teetime.framework.pipe.IPipe;
 
 public class InputPort<T> extends AbstractPort<T> {
 
-	private final AbstractBasicStage owningStage;
+	private final Stage owningStage;
 
-	InputPort(final AbstractBasicStage owningStage) {
+	InputPort(final Stage owningStage) {
 		super();
 		this.owningStage = owningStage;
 	}
@@ -33,7 +33,7 @@ public class InputPort<T> extends AbstractPort<T> {
 		this.pipe = pipe;
 	}
 
-	public AbstractBasicStage getOwningStage() {
+	public Stage getOwningStage() {
 		return this.owningStage;
 	}
 

src/main/java/teetime/framework/RunnableStage.java

@@ -10,11 +10,11 @@ import teetime.framework.validation.AnalysisNotValidException;
 
 public class RunnableStage implements Runnable {
 
-	private final AbstractBasicStage stage;
+	private final Stage stage;
 	private final Logger logger; // NOPMD
 	private boolean validationEnabled;
 
-	public RunnableStage(final AbstractBasicStage stage) {
+	public RunnableStage(final Stage stage) {
 		this.stage = stage;
 		this.logger = LoggerFactory.getLogger(stage.getClass());
 	}

src/main/java/teetime/framework/AbstractBasicStage.java → src/main/java/teetime/framework/Stage.java

 package teetime.framework;
 
+import java.util.List;
+
 import teetime.framework.signal.ISignal;
+import teetime.framework.validation.InvalidPortConnection;
+
+public abstract class Stage {
+
+	public abstract String getId();
+
+	public abstract Stage getParentStage();
+
+	public abstract void setParentStage(Stage parentStage, int index);
 
-public abstract class AbstractBasicStage implements IStage {
+	/**
+	 *
+	 * @param invalidPortConnections
+	 *            <i>(Passed as parameter for performance reasons)</i>
+	 */
+	public abstract void validateOutputPorts(List<InvalidPortConnection> invalidPortConnections);
 
 	protected abstract void executeWithPorts();
 

src/main/java/teetime/framework/pipe/AbstractPipe.java

 package teetime.framework.pipe;
 
-import teetime.framework.AbstractBasicStage;
+import teetime.framework.Stage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 
@@ -13,7 +13,7 @@ public abstract class AbstractPipe implements IPipe {
 	 * this.getPipe().getTargetPort().getOwningStage()
 	 * </pre>
 	 */
-	protected AbstractBasicStage cachedTargetStage;
+	protected Stage cachedTargetStage;
 
 	private InputPort<?> targetPort;
 

src/performancetest/java/teetime/examples/experiment09/MethodCallThroughputAnalysis9.java

@@ -17,7 +17,7 @@ package teetime.examples.experiment09;
 
 import java.util.List;
 
-import teetime.framework.AbstractBasicStage;
+import teetime.framework.Stage;
 import teetime.framework.OldHeadPipeline;
 import teetime.framework.RunnableStage;
 import teetime.framework.pipe.CommittablePipe;
@@ -43,7 +43,7 @@ public class MethodCallThroughputAnalysis9 {
 	private Runnable runnable;
 
 	public void init() {
-		AbstractBasicStage pipeline = this.buildPipeline();
+		Stage pipeline = this.buildPipeline();
 		this.runnable = new RunnableStage(pipeline);
 	}
 

src/performancetest/java/teetime/examples/experiment11/MethodCallThroughputAnalysis11.java

@@ -17,7 +17,7 @@ package teetime.examples.experiment11;
 
 import java.util.List;
 
-import teetime.framework.AbstractBasicStage;
+import teetime.framework.Stage;
 import teetime.framework.OldHeadPipeline;
 import teetime.framework.RunnableStage;
 import teetime.framework.pipe.UnorderedGrowablePipe;
@@ -43,7 +43,7 @@ public class MethodCallThroughputAnalysis11 {
 	private Runnable runnable;
 
 	public void init() {
-		AbstractBasicStage pipeline = this.buildPipeline(this.numInputObjects, this.inputObjectCreator);
+		Stage pipeline = this.buildPipeline(this.numInputObjects, this.inputObjectCreator);
 		this.runnable = new RunnableStage(pipeline);
 	}
 

src/performancetest/java/teetime/examples/experiment14/MethodCallThroughputAnalysis14.java

@@ -17,7 +17,7 @@ package teetime.examples.experiment14;
 
 import java.util.List;
 
-import teetime.framework.AbstractBasicStage;
+import teetime.framework.Stage;
 import teetime.framework.OldHeadPipeline;
 import teetime.framework.RunnableStage;
 import teetime.framework.pipe.IPipeFactory;
@@ -47,7 +47,7 @@ public class MethodCallThroughputAnalysis14 {
 	private final PipeFactoryRegistry pipeFactory = PipeFactoryRegistry.INSTANCE;
 
 	public void init() {
-		AbstractBasicStage pipeline = this.buildPipeline();
+		Stage pipeline = this.buildPipeline();
 		this.runnable = new RunnableStage(pipeline);
 	}
 

src/performancetest/java/teetime/examples/experiment15/MethodCallThroughputAnalysis15.java

@@ -17,7 +17,7 @@ package teetime.examples.experiment15;
 
 import java.util.List;
 
-import teetime.framework.AbstractBasicStage;
+import teetime.framework.Stage;
 import teetime.framework.OldHeadPipeline;
 import teetime.framework.RunnableStage;
 import teetime.framework.pipe.OrderedGrowableArrayPipe;
@@ -58,7 +58,7 @@ public class MethodCallThroughputAnalysis15 {
 		OldHeadPipeline<Clock, Sink<Long>> clockPipeline = this.buildClockPipeline();
 		this.clockRunnable = new RunnableStage(clockPipeline);
 
-		AbstractBasicStage pipeline = this.buildPipeline(this.clock);
+		Stage pipeline = this.buildPipeline(this.clock);
 		this.runnable = new RunnableStage(pipeline);
 	}
 

src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java

@@ -19,9 +19,9 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+import teetime.framework.Stage;
 import teetime.framework.OldHeadPipeline;
 import teetime.framework.RunnableStage;
-import teetime.framework.IStage;
 import teetime.framework.pipe.DummyPipe;
 import teetime.framework.pipe.IPipe;
 import teetime.framework.pipe.PipeFactoryRegistry;
@@ -34,7 +34,6 @@ import teetime.stage.ObjectProducer;
 import teetime.stage.Relay;
 import teetime.stage.StartTimestampFilter;
 import teetime.stage.StopTimestampFilter;
-import teetime.stage.basic.Sink;
 import teetime.stage.basic.distributor.Distributor;
 import teetime.util.ConstructorClosure;
 import teetime.util.TimestampObject;
@@ -133,7 +132,7 @@ public class MethodCallThroughputAnalysis17 {
 	 * @param numNoopFilters
 	 * @since 1.10
 	 */
-	private OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final IStage previousStage,
+	private OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final Stage previousStage,
 			final List<TimestampObject> timestampObjects) {
 		// create stages
 		Relay<TimestampObject> relay = new Relay<TimestampObject>();

src/performancetest/java/teetime/framework/OldHeadPipeline.java

 package teetime.framework;
 
 @Deprecated
-public class OldHeadPipeline<FirstStage extends AbstractBasicStage, LastStage extends IStage> extends OldPipeline<FirstStage, LastStage> implements IStage {
+public class OldHeadPipeline<FirstStage extends Stage, LastStage extends Stage> extends OldPipeline<FirstStage, LastStage> {
 
 	public OldHeadPipeline() {}
 

src/performancetest/java/teetime/framework/OldPipeline.java

@@ -6,7 +6,7 @@ import teetime.framework.signal.ISignal;
 import teetime.framework.validation.InvalidPortConnection;
 
 @Deprecated
-public class OldPipeline<FirstStage extends AbstractBasicStage, LastStage extends IStage> extends AbstractBasicStage {
+public class OldPipeline<FirstStage extends Stage, LastStage extends Stage> extends Stage {
 
 	protected FirstStage firstStage;
 	protected LastStage lastStage;
@@ -38,12 +38,12 @@ public class OldPipeline<FirstStage extends AbstractBasicStage, LastStage extend
 	}
 
 	@Override
-	public IStage getParentStage() {
+	public Stage getParentStage() {
 		return this.firstStage.getParentStage();
 	}
 
 	@Override
-	public void setParentStage(final IStage parentStage, final int index) {
+	public void setParentStage(final Stage parentStage, final int index) {
 		this.firstStage.setParentStage(parentStage, index);
 	}