From 63aebedca3bad7f73def345b209dde7705bca344 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Tue, 5 May 2015 17:44:28 +0200
Subject: [PATCH] fixed some TODOs and FIXMEs
---
src/main/java/teetime/framework/Analysis.java | 2 --
.../teetime/framework/AnalysisConfiguration.java | 14 +++++++++-----
.../java/teetime/framework/pipe/DummyPipe.java | 4 ----
.../teetime/stage/basic/AbstractTrigger.java | 7 -------
src/site/markdown/wiki | 2 +-
.../stage/basic/merger/MergerTestingPipe.java | 16 ++--------------
6 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index 20b9a4fe..ab2a1d2c 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -70,8 +70,6 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
this(configuration, false, new IgnoringExceptionListenerFactory());
}
- @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
- // TODO remove @SuppressWarnings if init is no longer deprecated
public Analysis(final T configuration, final boolean validationEnabled) {
this(configuration, validationEnabled, new IgnoringExceptionListenerFactory());
}
diff --git a/src/main/java/teetime/framework/AnalysisConfiguration.java b/src/main/java/teetime/framework/AnalysisConfiguration.java
index b3e03a72..7ffc7235 100644
--- a/src/main/java/teetime/framework/AnalysisConfiguration.java
+++ b/src/main/java/teetime/framework/AnalysisConfiguration.java
@@ -32,15 +32,19 @@ public abstract class AnalysisConfiguration {
private final List<Stage> threadableStageJobs = new LinkedList<Stage>();
+ private static final PipeFactoryRegistry PIPE_FACTORY_REGISTRY = PipeFactoryRegistry.INSTANCE;
+
/**
- * Can be used by subclasses, to obtain pipe factories
+ * Can be used by subclasses, to connect stages
*/
- @Deprecated
- // TODO: set private
- protected static final PipeFactoryRegistry PIPE_FACTORY_REGISTRY = PipeFactoryRegistry.INSTANCE;
-
private final static IPipeFactory intraThreadFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false);
+ /**
+ * Can be used by subclasses, to connect stages
+ */
private final static IPipeFactory interBoundedThreadFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTER, PipeOrdering.QUEUE_BASED, false);
+ /**
+ * Can be used by subclasses, to connect stages
+ */
private final static IPipeFactory interUnboundedThreadFactory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTER, PipeOrdering.QUEUE_BASED, true);
List<Stage> getThreadableStageJobs() {
diff --git a/src/main/java/teetime/framework/pipe/DummyPipe.java b/src/main/java/teetime/framework/pipe/DummyPipe.java
index d02ab75b..23031fe4 100644
--- a/src/main/java/teetime/framework/pipe/DummyPipe.java
+++ b/src/main/java/teetime/framework/pipe/DummyPipe.java
@@ -73,25 +73,21 @@ public final class DummyPipe implements IPipe {
@Override
public boolean isClosed() {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean hasMore() {
- // TODO Auto-generated method stub
return false;
}
@Override
public void waitForStartSignal() throws InterruptedException {
- // TODO Auto-generated method stub
}
@Override
public void close() {
- // TODO Auto-generated method stub
}
diff --git a/src/main/java/teetime/stage/basic/AbstractTrigger.java b/src/main/java/teetime/stage/basic/AbstractTrigger.java
index af2bf378..1e25aa25 100644
--- a/src/main/java/teetime/stage/basic/AbstractTrigger.java
+++ b/src/main/java/teetime/stage/basic/AbstractTrigger.java
@@ -33,14 +33,7 @@ abstract class AbstractTrigger<I, T, O> extends AbstractStage {
// disabled while in development
@Override
protected void executeStage() {
- // TODO Auto-generated method stub
}
- @Override
- public void onTerminating() throws Exception {
- // TODO Auto-generated method stub
- super.onTerminating();
- }
-
}
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 0e447457..bb53dfd7 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8
+Subproject commit bb53dfd7de974a433a7b96b0b65f4aacb8da3df3
diff --git a/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java b/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java
index 1499b91c..afbc6561 100644
--- a/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java
+++ b/src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java
@@ -63,60 +63,48 @@ public class MergerTestingPipe implements IPipe {
@Override
public boolean isEmpty() {
- // TODO Auto-generated method stub
return false;
}
@Override
public int size() {
- // TODO Auto-generated method stub
return 0;
}
@Override
public Object removeLast() {
- // TODO Auto-generated method stub
return null;
}
@Override
public InputPort<?> getTargetPort() {
- // TODO Auto-generated method stub
return null;
}
@Override
public <T> void connectPorts(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort) {
- // TODO Auto-generated method stub
}
@Override
public void reportNewElement() {
- // TODO Auto-generated method stub
}
@Override
public boolean isClosed() {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean hasMore() {
- // TODO Auto-generated method stub
return false;
}
@Override
- public void waitForStartSignal() throws InterruptedException {
- // TODO Auto-generated method stub
- }
+ public void waitForStartSignal() throws InterruptedException {}
@Override
- public void close() {
- // TODO Auto-generated method stub
- }
+ public void close() {}
}
--
GitLab