From 1806362e487937556e030390717249dde16985a6 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Mon, 20 Apr 2015 15:55:38 +0200
Subject: [PATCH] renamed connectStages to connectPorts
---
.settings/edu.umd.cs.findbugs.core.prefs | 2 +-
.../teetime/framework/AbstractCompositeStage.java | 2 +-
src/main/java/teetime/framework/Analysis.java | 2 +-
src/main/java/teetime/framework/test/StageTester.java | 11 ++++++++++-
src/main/java/teetime/stage/io/EveryXthPrinter.java | 4 ++--
src/main/java/teetime/stage/string/WordCounter.java | 4 ++--
src/site/markdown/wiki | 2 +-
7 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index cb17c2ed..ad916254 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
#FindBugs User Preferences
-#Mon Apr 20 12:42:35 CEST 2015
+#Mon Apr 20 15:07:50 CEST 2015
detector_threshold=3
effort=max
excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/framework/AbstractCompositeStage.java b/src/main/java/teetime/framework/AbstractCompositeStage.java
index 44b10e65..c156a7c4 100644
--- a/src/main/java/teetime/framework/AbstractCompositeStage.java
+++ b/src/main/java/teetime/framework/AbstractCompositeStage.java
@@ -107,7 +107,7 @@ public abstract class AbstractCompositeStage extends Stage {
super.setOwningThread(owningThread);
}
- protected <T> void connectStages(final OutputPort<? extends T> out, final InputPort<T> in) {
+ protected <T> void connectPorts(final OutputPort<? extends T> out, final InputPort<T> in) {
INTRA_PIPE_FACTORY.create(out, in);
containingStages.add(out.getOwningStage());
containingStages.add(in.getOwningStage());
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index 7ae760cb..fb0837cd 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -267,7 +267,7 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
* This method will start the Analysis and block until it is finished.
*
* @throws AnalysisException
- * if at least one exception in one thread has occurred within the analysis. The exception contains the pairs of thread and throwable
+ * if at least one exception in one thread has occurred within the analysis. The exception contains the pairs of thread and throwable.
*
* @since 1.1
*/
diff --git a/src/main/java/teetime/framework/test/StageTester.java b/src/main/java/teetime/framework/test/StageTester.java
index 29b64eeb..d9f97853 100644
--- a/src/main/java/teetime/framework/test/StageTester.java
+++ b/src/main/java/teetime/framework/test/StageTester.java
@@ -21,6 +21,7 @@ import java.util.List;
import teetime.framework.Analysis;
import teetime.framework.AnalysisConfiguration;
+import teetime.framework.AnalysisException;
import teetime.framework.Stage;
import teetime.framework.StageState;
import teetime.stage.CollectorSink;
@@ -68,9 +69,17 @@ public final class StageTester {
return this;
}
+ /**
+ * This method will start the test and block until it is finished.
+ *
+ * @throws AnalysisException
+ * if at least one exception in one thread has occurred within the analysis.
+ * The exception contains the pairs of thread and throwable.
+ *
+ */
public void start() {
final AnalysisConfiguration configuration = new Configuration(inputHolders, stage, outputHolders);
- final Analysis analysis = new Analysis(configuration);
+ final Analysis<AnalysisConfiguration> analysis = new Analysis<AnalysisConfiguration>(configuration);
analysis.executeBlocking();
}
diff --git a/src/main/java/teetime/stage/io/EveryXthPrinter.java b/src/main/java/teetime/stage/io/EveryXthPrinter.java
index bc218cf3..1ca83ce5 100644
--- a/src/main/java/teetime/stage/io/EveryXthPrinter.java
+++ b/src/main/java/teetime/stage/io/EveryXthPrinter.java
@@ -36,8 +36,8 @@ public final class EveryXthPrinter<T> extends AbstractCompositeStage {
EveryXthStage<T> everyXthStage = new EveryXthStage<T>(threshold);
Printer<Integer> printer = new Printer<Integer>();
- connectStages(distributor.getNewOutputPort(), everyXthStage.getInputPort());
- connectStages(everyXthStage.getOutputPort(), printer.getInputPort());
+ connectPorts(distributor.getNewOutputPort(), everyXthStage.getInputPort());
+ connectPorts(everyXthStage.getOutputPort(), printer.getInputPort());
lastStages.add(printer);
distributor.setStrategy(new CopyByReferenceStrategy());
diff --git a/src/main/java/teetime/stage/string/WordCounter.java b/src/main/java/teetime/stage/string/WordCounter.java
index c2a8a409..9c632b22 100644
--- a/src/main/java/teetime/stage/string/WordCounter.java
+++ b/src/main/java/teetime/stage/string/WordCounter.java
@@ -45,8 +45,8 @@ public final class WordCounter extends AbstractCompositeStage {
this.lastStages.add(this.mapCounter);
final ToLowerCase toLowerCase = new ToLowerCase();
- connectStages(this.tokenizer.getOutputPort(), toLowerCase.getInputPort());
- connectStages(toLowerCase.getOutputPort(), this.mapCounter.getInputPort());
+ connectPorts(this.tokenizer.getOutputPort(), toLowerCase.getInputPort());
+ connectPorts(toLowerCase.getOutputPort(), this.mapCounter.getInputPort());
// connectStages(wordcharacterFilter.getOutputPort(), this.mapCounter.getInputPort());
}
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 162510ff..0e447457 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 162510ff4d2f04011498ba6920aae0c78347c6c8
+Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8
--
GitLab