From 392ce9c5c8bb61660e144088b5b6ec67a012de5f Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Mon, 20 Apr 2015 12:40:21 +0200
Subject: [PATCH] renamed IStageVisitor to IPipeVisitor; minor refactorings in
Traversor
---
.settings/edu.umd.cs.findbugs.core.prefs | 2 +-
src/main/java/teetime/framework/Analysis.java | 2 +-
.../{IStageVisitor.java => IPipeVisitor.java} | 4 ++--
...ntraStageVisitor.java => IntraStageCollector.java} | 8 ++++----
src/main/java/teetime/framework/Traversor.java | 11 +++++------
src/test/java/teetime/framework/TraversorTest.java | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
rename src/main/java/teetime/framework/{IStageVisitor.java => IPipeVisitor.java} (91%)
rename src/main/java/teetime/framework/{IntraStageVisitor.java => IntraStageCollector.java} (80%)
diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 540b21fa..60b03d3a 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
#FindBugs User Preferences
-#Thu Apr 16 10:58:21 CEST 2015
+#Mon Apr 20 12:33:48 CEST 2015
detector_threshold=3
effort=max
excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index dfbc4bbb..7ae760cb 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -320,7 +320,7 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
}
private Set<Stage> traverseIntraStages(final Stage stage) {
- final Traversor traversor = new Traversor(new IntraStageVisitor());
+ final Traversor traversor = new Traversor(new IntraStageCollector());
traversor.traverse(stage);
return traversor.getVisitedStage();
}
diff --git a/src/main/java/teetime/framework/IStageVisitor.java b/src/main/java/teetime/framework/IPipeVisitor.java
similarity index 91%
rename from src/main/java/teetime/framework/IStageVisitor.java
rename to src/main/java/teetime/framework/IPipeVisitor.java
index e6ff08c7..00daeaa1 100644
--- a/src/main/java/teetime/framework/IStageVisitor.java
+++ b/src/main/java/teetime/framework/IPipeVisitor.java
@@ -17,12 +17,12 @@ package teetime.framework;
import teetime.framework.pipe.IPipe;
-public interface IStageVisitor {
+public interface IPipeVisitor {
public enum VisitorBehavior {
CONTINUE, STOP
}
- VisitorBehavior visit(IPipe inputPipe);
+ VisitorBehavior visit(IPipe outputPipe);
}
diff --git a/src/main/java/teetime/framework/IntraStageVisitor.java b/src/main/java/teetime/framework/IntraStageCollector.java
similarity index 80%
rename from src/main/java/teetime/framework/IntraStageVisitor.java
rename to src/main/java/teetime/framework/IntraStageCollector.java
index b3dba395..fb889d74 100644
--- a/src/main/java/teetime/framework/IntraStageVisitor.java
+++ b/src/main/java/teetime/framework/IntraStageCollector.java
@@ -17,13 +17,13 @@ package teetime.framework;
import teetime.framework.pipe.IPipe;
-public class IntraStageVisitor implements IStageVisitor {
+public class IntraStageCollector implements IPipeVisitor {
- public IntraStageVisitor() {}
+ public IntraStageCollector() {}
@Override
- public VisitorBehavior visit(final IPipe inputPipe) {
- if (inputPipe instanceof AbstractIntraThreadPipe) {
+ public VisitorBehavior visit(final IPipe outputPipe) {
+ if (outputPipe instanceof AbstractIntraThreadPipe) {
return VisitorBehavior.CONTINUE;
}
return VisitorBehavior.STOP;
diff --git a/src/main/java/teetime/framework/Traversor.java b/src/main/java/teetime/framework/Traversor.java
index f81aaefd..82ac218e 100644
--- a/src/main/java/teetime/framework/Traversor.java
+++ b/src/main/java/teetime/framework/Traversor.java
@@ -18,20 +18,19 @@ package teetime.framework;
import java.util.HashSet;
import java.util.Set;
-import teetime.framework.IStageVisitor.VisitorBehavior;
+import teetime.framework.IPipeVisitor.VisitorBehavior;
import teetime.framework.pipe.IPipe;
public class Traversor {
- private final IStageVisitor stageVisitor;
+ private final IPipeVisitor pipeVisitor;
private final Set<Stage> visitedStage = new HashSet<Stage>();
- public Traversor(final IStageVisitor stageVisitor) {
- this.stageVisitor = stageVisitor;
+ public Traversor(final IPipeVisitor pipeVisitor) {
+ this.pipeVisitor = pipeVisitor;
}
public void traverse(final Stage stage) {
-
if (!visitedStage.add(stage)) {
return;
}
@@ -39,7 +38,7 @@ public class Traversor {
OutputPort<?>[] outputPorts = stage.getOutputPorts();
for (OutputPort<?> outputPort : outputPorts) {
IPipe pipe = outputPort.getPipe();
- if (null != pipe && stageVisitor.visit(pipe) == VisitorBehavior.CONTINUE) {
+ if (null != pipe && pipeVisitor.visit(pipe) == VisitorBehavior.CONTINUE) {
Stage owningStage = pipe.getTargetPort().getOwningStage();
traverse(owningStage); // recursive call
}
diff --git a/src/test/java/teetime/framework/TraversorTest.java b/src/test/java/teetime/framework/TraversorTest.java
index 8427febd..14d168e1 100644
--- a/src/test/java/teetime/framework/TraversorTest.java
+++ b/src/test/java/teetime/framework/TraversorTest.java
@@ -38,7 +38,7 @@ import teetime.stage.util.CountingMap;
public class TraversorTest {
- private final Traversor traversor = new Traversor(new IntraStageVisitor());
+ private final Traversor traversor = new Traversor(new IntraStageCollector());
@Test
public void traverse() {
--
GitLab