From e99f2c405379ba0a4aac655333632a4632955c43 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Thu, 26 Feb 2015 07:29:38 +0100
Subject: [PATCH] fixed EveryXthPrinter; declared all methods in CompositeStage
final
---
.../teetime/framework/CompositeStage.java | 16 ++++----
.../teetime/stage/io/EveryXthPrinter.java | 38 -------------------
2 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/src/main/java/teetime/framework/CompositeStage.java b/src/main/java/teetime/framework/CompositeStage.java
index f71034da..22ee496c 100644
--- a/src/main/java/teetime/framework/CompositeStage.java
+++ b/src/main/java/teetime/framework/CompositeStage.java
@@ -48,39 +48,39 @@ public abstract class CompositeStage extends Stage {
}
@Override
- protected void onSignal(final ISignal signal, final InputPort<?> inputPort) {
+ protected final void onSignal(final ISignal signal, final InputPort<?> inputPort) {
getFirstStage().onSignal(signal, inputPort);
}
@Override
- protected TerminationStrategy getTerminationStrategy() {
+ protected final TerminationStrategy getTerminationStrategy() {
return getFirstStage().getTerminationStrategy();
}
@Override
- protected void terminate() {
+ protected final void terminate() {
getFirstStage().terminate();
}
@Override
- protected boolean shouldBeTerminated() {
+ protected final boolean shouldBeTerminated() {
return getFirstStage().shouldBeTerminated();
}
@Override
- protected InputPort<?>[] getInputPorts() {
+ protected final InputPort<?>[] getInputPorts() {
return getFirstStage().getInputPorts();
}
@Override
- public void validateOutputPorts(final List<InvalidPortConnection> invalidPortConnections) {
+ public final void validateOutputPorts(final List<InvalidPortConnection> invalidPortConnections) {
for (final Stage s : getLastStages()) {
s.validateOutputPorts(invalidPortConnections);
}
}
@Override
- protected boolean isStarted() {
+ protected final boolean isStarted() {
boolean isStarted = true;
for (final Stage s : getLastStages()) {
isStarted = isStarted && s.isStarted();
@@ -89,7 +89,7 @@ public abstract class CompositeStage extends Stage {
}
@Override
- void setOwningThread(final Thread owningThread) {
+ final void setOwningThread(final Thread owningThread) {
getFirstStage().setOwningThread(owningThread);
super.setOwningThread(owningThread);
}
diff --git a/src/main/java/teetime/stage/io/EveryXthPrinter.java b/src/main/java/teetime/stage/io/EveryXthPrinter.java
index 4fd4b539..a06f38d8 100644
--- a/src/main/java/teetime/stage/io/EveryXthPrinter.java
+++ b/src/main/java/teetime/stage/io/EveryXthPrinter.java
@@ -23,9 +23,6 @@ import teetime.framework.CompositeStage;
import teetime.framework.InputPort;
import teetime.framework.OutputPort;
import teetime.framework.Stage;
-import teetime.framework.TerminationStrategy;
-import teetime.framework.signal.ISignal;
-import teetime.framework.validation.InvalidPortConnection;
import teetime.stage.EveryXthStage;
import teetime.stage.basic.distributor.CopyByReferenceStrategy;
import teetime.stage.basic.distributor.Distributor;
@@ -47,31 +44,6 @@ public final class EveryXthPrinter<T> extends CompositeStage {
distributor.setStrategy(new CopyByReferenceStrategy());
}
- @Override
- public void validateOutputPorts(final List<InvalidPortConnection> invalidPortConnections) {
- distributor.validateOutputPorts(invalidPortConnections);
- }
-
- @Override
- protected void onSignal(final ISignal signal, final InputPort<?> inputPort) {
- distributor.onSignal(signal, inputPort);
- }
-
- @Override
- protected TerminationStrategy getTerminationStrategy() {
- return distributor.getTerminationStrategy();
- }
-
- @Override
- protected void terminate() {
- distributor.terminate();
- }
-
- @Override
- protected boolean shouldBeTerminated() {
- return distributor.shouldBeTerminated();
- }
-
public InputPort<T> getInputPort() {
return distributor.getInputPort();
}
@@ -80,16 +52,6 @@ public final class EveryXthPrinter<T> extends CompositeStage {
return distributor.getNewOutputPort();
}
- @Override
- protected InputPort<?>[] getInputPorts() {
- return distributor.getInputPorts();
- }
-
- @Override
- protected boolean isStarted() {
- return distributor.isStarted();
- }
-
@Override
protected Stage getFirstStage() {
return distributor;
--
GitLab