From 0bbeca5aceea60eac64543ad2bbeb2bab4d6d4c6 Mon Sep 17 00:00:00 2001 From: Christian Wulf <chw@informatik.uni-kiel.de> Date: Sun, 2 Aug 2015 11:27:21 +0200 Subject: [PATCH] made executeStage final --- src/main/java/teetime/framework/Stage.java | 2 +- src/main/java/teetime/stage/basic/AbstractTrigger.java | 4 ++-- src/main/java/teetime/stage/basic/Delay.java | 10 +--------- src/main/java/teetime/stage/basic/merger/Merger.java | 8 +------- .../stage/basic/merger/dynamic/DynamicMerger.java | 4 ++-- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/java/teetime/framework/Stage.java b/src/main/java/teetime/framework/Stage.java index 7af474dd..582f7b3f 100644 --- a/src/main/java/teetime/framework/Stage.java +++ b/src/main/java/teetime/framework/Stage.java @@ -111,7 +111,7 @@ public abstract class Stage { */ public abstract void validateOutputPorts(List<InvalidPortConnection> invalidPortConnections); - protected void executeStage() { + protected final void executeStage() { try { this.execute(); } catch (NotEnoughInputException e) { diff --git a/src/main/java/teetime/stage/basic/AbstractTrigger.java b/src/main/java/teetime/stage/basic/AbstractTrigger.java index 0296ebb6..03f3bddc 100644 --- a/src/main/java/teetime/stage/basic/AbstractTrigger.java +++ b/src/main/java/teetime/stage/basic/AbstractTrigger.java @@ -32,8 +32,8 @@ abstract class AbstractTrigger<I, T, O> extends AbstractStage { @SuppressWarnings("PMD.EmptyMethodInAbstractClassShouldBeAbstract") // disabled while in development @Override - protected void executeStage() { - + protected void execute() { + // TODO implement } } diff --git a/src/main/java/teetime/stage/basic/Delay.java b/src/main/java/teetime/stage/basic/Delay.java index 6cf85e0d..bd99f464 100644 --- a/src/main/java/teetime/stage/basic/Delay.java +++ b/src/main/java/teetime/stage/basic/Delay.java @@ -31,7 +31,7 @@ public final class Delay<T> extends AbstractStage { private final List<T> bufferedElements = new LinkedList<T>(); @Override - public void executeStage() { + protected void execute() { T element = inputPort.receive(); if (null != element) { bufferedElements.add(element); @@ -49,7 +49,6 @@ public final class Delay<T> extends AbstractStage { while (!bufferedElements.isEmpty()) { T element = bufferedElements.remove(0); outputPort.send(element); - logger.trace("Sent buffered element: " + element); } } @@ -64,7 +63,6 @@ public final class Delay<T> extends AbstractStage { T element; while (null != (element = inputPort.receive())) { outputPort.send(element); - logger.trace("Sent element: " + element); } super.onTerminating(); @@ -82,10 +80,4 @@ public final class Delay<T> extends AbstractStage { return this.outputPort; } - @Override - protected void execute() { - // TODO Auto-generated method stub - - } - } diff --git a/src/main/java/teetime/stage/basic/merger/Merger.java b/src/main/java/teetime/stage/basic/merger/Merger.java index a1c427e1..89bc7622 100644 --- a/src/main/java/teetime/stage/basic/merger/Merger.java +++ b/src/main/java/teetime/stage/basic/merger/Merger.java @@ -58,7 +58,7 @@ public class Merger<T> extends AbstractStage { } @Override - public void executeStage() { + protected void execute() { final T token = this.strategy.getNextInput(this); if (token == null) { returnNoElement(); @@ -119,10 +119,4 @@ public class Merger<T> extends AbstractStage { return this.outputPort; } - @Override - protected void execute() { - // TODO Auto-generated method stub - - } - } diff --git a/src/main/java/teetime/stage/basic/merger/dynamic/DynamicMerger.java b/src/main/java/teetime/stage/basic/merger/dynamic/DynamicMerger.java index 5559c105..20b51253 100644 --- a/src/main/java/teetime/stage/basic/merger/dynamic/DynamicMerger.java +++ b/src/main/java/teetime/stage/basic/merger/dynamic/DynamicMerger.java @@ -33,8 +33,8 @@ public class DynamicMerger<T> extends Merger<T> { } @Override - public void executeStage() { - super.executeStage(); // must be first, to throw NotEnoughInputException before checking + protected void execute() { + super.execute(); // must be first, to throw NotEnoughInputException before checking checkForPendingPortActionRequest(); } -- GitLab