From 554111847fe755afa4dada3f294ac16e4108f709 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Tue, 14 Oct 2014 14:44:53 +0200
Subject: [PATCH] #46 renamed StageWithPorts to Stage and updated references
---
.settings/org.eclipse.core.resources.prefs | 1 -
src/main/java/teetime/framework/AbstractStage.java | 8 ++++----
src/main/java/teetime/framework/HeadPipeline.java | 2 +-
src/main/java/teetime/framework/HeadStage.java | 2 +-
src/main/java/teetime/framework/InputPort.java | 6 +++---
src/main/java/teetime/framework/Pipeline.java | 6 +++---
.../teetime/framework/{StageWithPort.java => Stage.java} | 6 +++---
src/main/java/teetime/framework/pipe/AbstractPipe.java | 4 ++--
.../experiment17/MethodCallThroughputAnalysis17.java | 4 ++--
...aceReconstructionAnalysisWithThreadsConfiguration.java | 4 ++--
.../TcpTraceReductionAnalysisWithThreads.java | 4 ++--
11 files changed, 23 insertions(+), 24 deletions(-)
rename src/main/java/teetime/framework/{StageWithPort.java => Stage.java} (81%)
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 29abf999..98960902 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
diff --git a/src/main/java/teetime/framework/AbstractStage.java b/src/main/java/teetime/framework/AbstractStage.java
index 53ed24f0..dc9d3871 100644
--- a/src/main/java/teetime/framework/AbstractStage.java
+++ b/src/main/java/teetime/framework/AbstractStage.java
@@ -14,7 +14,7 @@ import teetime.framework.pipe.IPipe;
import teetime.framework.signal.ISignal;
import teetime.framework.validation.InvalidPortConnection;
-public abstract class AbstractStage implements StageWithPort {
+public abstract class AbstractStage implements Stage {
private final String id;
/**
@@ -22,7 +22,7 @@ public abstract class AbstractStage implements StageWithPort {
*/
protected final Logger logger;
- private StageWithPort parentStage;
+ private Stage parentStage;
private final List<InputPort<?>> inputPortList = new ArrayList<InputPort<?>>();
private final List<OutputPort<?>> outputPortList = new ArrayList<OutputPort<?>>();
@@ -74,12 +74,12 @@ public abstract class AbstractStage implements StageWithPort {
}
@Override
- public StageWithPort getParentStage() {
+ public Stage getParentStage() {
return this.parentStage;
}
@Override
- public void setParentStage(final StageWithPort parentStage, final int index) {
+ public void setParentStage(final Stage parentStage, final int index) {
this.parentStage = parentStage;
}
diff --git a/src/main/java/teetime/framework/HeadPipeline.java b/src/main/java/teetime/framework/HeadPipeline.java
index 3c9dd139..e2ec170b 100644
--- a/src/main/java/teetime/framework/HeadPipeline.java
+++ b/src/main/java/teetime/framework/HeadPipeline.java
@@ -1,6 +1,6 @@
package teetime.framework;
-public class HeadPipeline<FirstStage extends HeadStage, LastStage extends StageWithPort> extends Pipeline<FirstStage, LastStage> implements HeadStage {
+public class HeadPipeline<FirstStage extends HeadStage, LastStage extends Stage> extends Pipeline<FirstStage, LastStage> implements HeadStage {
public HeadPipeline() {}
diff --git a/src/main/java/teetime/framework/HeadStage.java b/src/main/java/teetime/framework/HeadStage.java
index 373b150d..5e8de765 100644
--- a/src/main/java/teetime/framework/HeadStage.java
+++ b/src/main/java/teetime/framework/HeadStage.java
@@ -1,6 +1,6 @@
package teetime.framework;
-public interface HeadStage extends StageWithPort {
+public interface HeadStage extends Stage {
boolean shouldBeTerminated();
diff --git a/src/main/java/teetime/framework/InputPort.java b/src/main/java/teetime/framework/InputPort.java
index f221f511..7f8050c2 100644
--- a/src/main/java/teetime/framework/InputPort.java
+++ b/src/main/java/teetime/framework/InputPort.java
@@ -4,9 +4,9 @@ import teetime.framework.pipe.IPipe;
public class InputPort<T> extends AbstractPort<T> {
- private final StageWithPort owningStage;
+ private final Stage owningStage;
- InputPort(final StageWithPort owningStage) {
+ InputPort(final Stage owningStage) {
super();
this.owningStage = owningStage;
}
@@ -33,7 +33,7 @@ public class InputPort<T> extends AbstractPort<T> {
this.pipe = pipe;
}
- public StageWithPort getOwningStage() {
+ public Stage getOwningStage() {
return this.owningStage;
}
diff --git a/src/main/java/teetime/framework/Pipeline.java b/src/main/java/teetime/framework/Pipeline.java
index 91b0ae86..4900bf65 100644
--- a/src/main/java/teetime/framework/Pipeline.java
+++ b/src/main/java/teetime/framework/Pipeline.java
@@ -5,7 +5,7 @@ import java.util.List;
import teetime.framework.signal.ISignal;
import teetime.framework.validation.InvalidPortConnection;
-public class Pipeline<FirstStage extends StageWithPort, LastStage extends StageWithPort> implements StageWithPort {
+public class Pipeline<FirstStage extends Stage, LastStage extends Stage> implements Stage {
protected FirstStage firstStage;
protected LastStage lastStage;
@@ -37,12 +37,12 @@ public class Pipeline<FirstStage extends StageWithPort, LastStage extends StageW
}
@Override
- public StageWithPort getParentStage() {
+ public Stage getParentStage() {
return this.firstStage.getParentStage();
}
@Override
- public void setParentStage(final StageWithPort parentStage, final int index) {
+ public void setParentStage(final Stage parentStage, final int index) {
this.firstStage.setParentStage(parentStage, index);
}
diff --git a/src/main/java/teetime/framework/StageWithPort.java b/src/main/java/teetime/framework/Stage.java
similarity index 81%
rename from src/main/java/teetime/framework/StageWithPort.java
rename to src/main/java/teetime/framework/Stage.java
index 281b9485..b773f6b2 100644
--- a/src/main/java/teetime/framework/StageWithPort.java
+++ b/src/main/java/teetime/framework/Stage.java
@@ -5,15 +5,15 @@ import java.util.List;
import teetime.framework.signal.ISignal;
import teetime.framework.validation.InvalidPortConnection;
-public interface StageWithPort {
+public interface Stage {
String getId();
void executeWithPorts();
- StageWithPort getParentStage();
+ Stage getParentStage();
- void setParentStage(StageWithPort parentStage, int index);
+ void setParentStage(Stage parentStage, int index);
// BETTER remove this method since it will be replaced by onTerminating()
void onIsPipelineHead();
diff --git a/src/main/java/teetime/framework/pipe/AbstractPipe.java b/src/main/java/teetime/framework/pipe/AbstractPipe.java
index c89cd964..d59c660b 100644
--- a/src/main/java/teetime/framework/pipe/AbstractPipe.java
+++ b/src/main/java/teetime/framework/pipe/AbstractPipe.java
@@ -2,7 +2,7 @@ package teetime.framework.pipe;
import teetime.framework.InputPort;
import teetime.framework.OutputPort;
-import teetime.framework.StageWithPort;
+import teetime.framework.Stage;
public abstract class AbstractPipe implements IPipe {
@@ -15,7 +15,7 @@ public abstract class AbstractPipe implements IPipe {
* this.getPipe().getTargetPort().getOwningStage()
* </pre>
*/
- protected StageWithPort cachedTargetStage;
+ protected Stage cachedTargetStage;
protected <T> AbstractPipe(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort) {
this.targetPort = targetPort;
diff --git a/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java b/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java
index c1954504..ccb6a703 100644
--- a/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java
+++ b/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java
@@ -22,7 +22,7 @@ import java.util.List;
import teetime.framework.HeadPipeline;
import teetime.framework.OldAnalysis;
import teetime.framework.RunnableStage;
-import teetime.framework.StageWithPort;
+import teetime.framework.Stage;
import teetime.framework.pipe.DummyPipe;
import teetime.framework.pipe.IPipe;
import teetime.framework.pipe.PipeFactory;
@@ -138,7 +138,7 @@ public class MethodCallThroughputAnalysis17 extends OldAnalysis {
* @param numNoopFilters
* @since 1.10
*/
- private HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final StageWithPort previousStage,
+ private HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final Stage previousStage,
final List<TimestampObject> timestampObjects) {
// create stages
Relay<TimestampObject> relay = new Relay<TimestampObject>();
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
index fff9e149..bddeaf9a 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
@@ -8,7 +8,7 @@ import java.util.List;
import teetime.framework.AnalysisConfiguration;
import teetime.framework.HeadPipeline;
-import teetime.framework.StageWithPort;
+import teetime.framework.Stage;
import teetime.framework.pipe.SingleElementPipe;
import teetime.framework.pipe.SpScPipe;
import teetime.stage.Clock;
@@ -117,7 +117,7 @@ public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends Anal
return pipeline;
}
- private static class StageFactory<T extends StageWithPort> {
+ private static class StageFactory<T extends Stage> {
private final Constructor<T> constructor;
private final List<T> stages = new ArrayList<T>();
diff --git a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreads.java b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreads.java
index 8879fc23..4def043b 100644
--- a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreads.java
+++ b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreads.java
@@ -11,7 +11,7 @@ import java.util.TreeMap;
import teetime.framework.HeadPipeline;
import teetime.framework.OldAnalysis;
import teetime.framework.RunnableStage;
-import teetime.framework.StageWithPort;
+import teetime.framework.Stage;
import teetime.framework.pipe.SingleElementPipe;
import teetime.framework.pipe.SpScPipe;
import teetime.stage.Clock;
@@ -101,7 +101,7 @@ public class TcpTraceReductionAnalysisWithThreads extends OldAnalysis {
return pipeline;
}
- private static class StageFactory<T extends StageWithPort> {
+ private static class StageFactory<T extends Stage> {
private final Constructor<T> constructor;
private final List<T> stages = new ArrayList<T>();
--
GitLab