From f3ddd2475cb6370daeb8f05a18d0c92b0c7e6e99 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Mon, 22 Sep 2014 11:11:58 +0200
Subject: [PATCH] renamed Signal to ISignal
---
.../methodcallWithPorts/framework/core/AbstractStage.java | 8 ++++----
.../methodcallWithPorts/framework/core/OutputPort.java | 4 ++--
.../methodcallWithPorts/framework/core/Pipeline.java | 4 ++--
.../methodcallWithPorts/framework/core/StageWithPort.java | 4 ++--
.../framework/core/pipe/DummyPipe.java | 4 ++--
.../methodcallWithPorts/framework/core/pipe/IPipe.java | 4 ++--
.../framework/core/pipe/InterThreadPipe.java | 8 ++++----
.../framework/core/pipe/IntraThreadPipe.java | 4 ++--
.../framework/core/signal/{Signal.java => ISignal.java} | 2 +-
.../framework/core/signal/StartingSignal.java | 2 +-
.../framework/core/signal/TerminatingSignal.java | 2 +-
.../framework/core/signal/ValidatingSignal.java | 2 +-
.../methodcallWithPorts/stage/basic/merger/Merger.java | 4 ++--
submodules/JCTools | 2 +-
14 files changed, 27 insertions(+), 27 deletions(-)
rename src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/{Signal.java => ISignal.java} (87%)
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/AbstractStage.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/AbstractStage.java
index 6dab49da..a2bd9887 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/AbstractStage.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/AbstractStage.java
@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
import teetime.variant.methodcallWithPorts.framework.core.pipe.DummyPipe;
import teetime.variant.methodcallWithPorts.framework.core.pipe.IPipe;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
import teetime.variant.methodcallWithPorts.framework.core.validation.InvalidPortConnection;
public abstract class AbstractStage implements StageWithPort {
@@ -32,7 +32,7 @@ public abstract class AbstractStage implements StageWithPort {
/** A cached instance of <code>outputPortList</code> to avoid creating an iterator each time iterating it */
protected OutputPort<?>[] cachedOutputPorts;
- private final Map<Signal, Void> visited = new HashMap<Signal, Void>();
+ private final Map<ISignal, Void> visited = new HashMap<ISignal, Void>();
public AbstractStage() {
this.id = UUID.randomUUID().toString(); // the id should only be represented by a UUID, not additionally by the class name
@@ -92,7 +92,7 @@ public abstract class AbstractStage implements StageWithPort {
* May not be invoked outside of IPipe implementations
*/
@Override
- public void onSignal(final Signal signal, final InputPort<?> inputPort) {
+ public void onSignal(final ISignal signal, final InputPort<?> inputPort) {
if (!this.alreadyVisited(signal, inputPort)) {
signal.trigger(this);
@@ -102,7 +102,7 @@ public abstract class AbstractStage implements StageWithPort {
}
}
- protected boolean alreadyVisited(final Signal signal, final InputPort<?> inputPort) {
+ protected boolean alreadyVisited(final ISignal signal, final InputPort<?> inputPort) {
if (this.visited.containsKey(signal)) {
this.logger.trace("Got signal: " + signal + " again from input port: " + inputPort);
return true;
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/OutputPort.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/OutputPort.java
index 5d06dd47..790aa531 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/OutputPort.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/OutputPort.java
@@ -1,6 +1,6 @@
package teetime.variant.methodcallWithPorts.framework.core;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
public final class OutputPort<T> extends AbstractPort<T> {
@@ -17,7 +17,7 @@ public final class OutputPort<T> extends AbstractPort<T> {
return this.pipe.add(element);
}
- public void sendSignal(final Signal signal) {
+ public void sendSignal(final ISignal signal) {
this.pipe.setSignal(signal);
}
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Pipeline.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Pipeline.java
index 6d063ea8..d44473d7 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Pipeline.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Pipeline.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core;
import java.util.List;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
import teetime.variant.methodcallWithPorts.framework.core.validation.InvalidPortConnection;
public class Pipeline<FirstStage extends StageWithPort, LastStage extends StageWithPort> implements StageWithPort {
@@ -52,7 +52,7 @@ public class Pipeline<FirstStage extends StageWithPort, LastStage extends StageW
}
@Override
- public void onSignal(final Signal signal, final InputPort<?> inputPort) {
+ public void onSignal(final ISignal signal, final InputPort<?> inputPort) {
this.firstStage.onSignal(signal, inputPort);
}
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/StageWithPort.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/StageWithPort.java
index ffd5d060..b315a000 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/StageWithPort.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/StageWithPort.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core;
import java.util.List;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
import teetime.variant.methodcallWithPorts.framework.core.validation.InvalidPortConnection;
public interface StageWithPort {
@@ -18,7 +18,7 @@ public interface StageWithPort {
// BETTER remove this method since it will be replaced by onTerminating()
void onIsPipelineHead();
- void onSignal(Signal signal, InputPort<?> inputPort);
+ void onSignal(ISignal signal, InputPort<?> inputPort);
/**
*
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/DummyPipe.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/DummyPipe.java
index 26888277..aa27ebbd 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/DummyPipe.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/DummyPipe.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core.pipe;
import teetime.variant.methodcallWithPorts.framework.core.InputPort;
import teetime.variant.methodcallWithPorts.framework.core.OutputPort;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
/**
* A pipe implementation used to connect unconnected output ports.
@@ -44,7 +44,7 @@ public final class DummyPipe implements IPipe {
}
@Override
- public void setSignal(final Signal signal) {}
+ public void setSignal(final ISignal signal) {}
@Override
public void connectPorts(final OutputPort sourcePort, final InputPort targetPort) {}
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IPipe.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IPipe.java
index a89a3c68..154ac923 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IPipe.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IPipe.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core.pipe;
import teetime.variant.methodcallWithPorts.framework.core.InputPort;
import teetime.variant.methodcallWithPorts.framework.core.OutputPort;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
public interface IPipe {
@@ -18,7 +18,7 @@ public interface IPipe {
InputPort<?> getTargetPort();
- void setSignal(Signal signal);
+ void setSignal(ISignal signal);
@Deprecated
<T> void connectPorts(OutputPort<? extends T> sourcePort, InputPort<T> targetPort);
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/InterThreadPipe.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/InterThreadPipe.java
index 37ad7022..7c2ede98 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/InterThreadPipe.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/InterThreadPipe.java
@@ -4,22 +4,22 @@ import java.util.concurrent.atomic.AtomicReference;
import teetime.variant.methodcallWithPorts.framework.core.InputPort;
import teetime.variant.methodcallWithPorts.framework.core.OutputPort;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
public abstract class InterThreadPipe extends AbstractPipe {
- private final AtomicReference<Signal> signal = new AtomicReference<Signal>();
+ private final AtomicReference<ISignal> signal = new AtomicReference<ISignal>();
<T> InterThreadPipe(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort) {
super(sourcePort, targetPort);
}
@Override
- public void setSignal(final Signal signal) {
+ public void setSignal(final ISignal signal) {
this.signal.lazySet(signal); // lazySet is legal due to our single-writer requirement
}
- public Signal getSignal() {
+ public ISignal getSignal() {
return this.signal.get();
}
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IntraThreadPipe.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IntraThreadPipe.java
index 04857a9e..e34547b0 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IntraThreadPipe.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/pipe/IntraThreadPipe.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core.pipe;
import teetime.variant.methodcallWithPorts.framework.core.InputPort;
import teetime.variant.methodcallWithPorts.framework.core.OutputPort;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
public abstract class IntraThreadPipe extends AbstractPipe {
@@ -11,7 +11,7 @@ public abstract class IntraThreadPipe extends AbstractPipe {
}
@Override
- public void setSignal(final Signal signal) {
+ public void setSignal(final ISignal signal) {
if (this.getTargetPort() != null) { // BETTER remove this check since there are DummyPorts
this.cachedTargetStage.onSignal(signal, this.getTargetPort());
}
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/Signal.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/ISignal.java
similarity index 87%
rename from src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/Signal.java
rename to src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/ISignal.java
index 93a47871..13e15dbf 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/Signal.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/ISignal.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core.signal;
import teetime.variant.methodcallWithPorts.framework.core.AbstractStage;
-public interface Signal {
+public interface ISignal {
void trigger(AbstractStage stage);
}
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/StartingSignal.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/StartingSignal.java
index 9e82408c..11dc8c72 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/StartingSignal.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/StartingSignal.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core.signal;
import teetime.variant.methodcallWithPorts.framework.core.AbstractStage;
-public class StartingSignal implements Signal {
+public class StartingSignal implements ISignal {
@Override
public void trigger(final AbstractStage stage) {
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/TerminatingSignal.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/TerminatingSignal.java
index b0ea58c0..1c523522 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/TerminatingSignal.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/TerminatingSignal.java
@@ -2,7 +2,7 @@ package teetime.variant.methodcallWithPorts.framework.core.signal;
import teetime.variant.methodcallWithPorts.framework.core.AbstractStage;
-public class TerminatingSignal implements Signal {
+public class TerminatingSignal implements ISignal {
@Override
public void trigger(final AbstractStage stage) {
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/ValidatingSignal.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/ValidatingSignal.java
index fad95a43..3b9cd684 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/ValidatingSignal.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/signal/ValidatingSignal.java
@@ -6,7 +6,7 @@ import java.util.List;
import teetime.variant.methodcallWithPorts.framework.core.AbstractStage;
import teetime.variant.methodcallWithPorts.framework.core.validation.InvalidPortConnection;
-public class ValidatingSignal implements Signal {
+public class ValidatingSignal implements ISignal {
private final List<InvalidPortConnection> invalidPortConnections = new LinkedList<InvalidPortConnection>();
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/stage/basic/merger/Merger.java b/src/main/java/teetime/variant/methodcallWithPorts/stage/basic/merger/Merger.java
index bf90f0a5..d46369c9 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/stage/basic/merger/Merger.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/stage/basic/merger/Merger.java
@@ -19,7 +19,7 @@ package teetime.variant.methodcallWithPorts.stage.basic.merger;
import teetime.variant.methodcallWithPorts.framework.core.AbstractStage;
import teetime.variant.methodcallWithPorts.framework.core.InputPort;
import teetime.variant.methodcallWithPorts.framework.core.OutputPort;
-import teetime.variant.methodcallWithPorts.framework.core.signal.Signal;
+import teetime.variant.methodcallWithPorts.framework.core.signal.ISignal;
/**
*
@@ -51,7 +51,7 @@ public class Merger<T> extends AbstractStage {
}
@Override
- public void onSignal(final Signal signal, final InputPort<?> inputPort) {
+ public void onSignal(final ISignal signal, final InputPort<?> inputPort) {
this.logger.trace("Got signal: " + signal + " from input port: " + inputPort);
signal.trigger(this);
diff --git a/submodules/JCTools b/submodules/JCTools
index 88e1e25f..75998aa2 160000
--- a/submodules/JCTools
+++ b/submodules/JCTools
@@ -1 +1 @@
-Subproject commit 88e1e25f9519b250258c7e5ada30935975ab2d10
+Subproject commit 75998aa20b7ec897ec321c1f94192de888f2dc6e
--
GitLab