Skip to content
Snippets Groups Projects
Commit f3ddd247 authored by Christian Wulf's avatar Christian Wulf
Browse files

renamed Signal to ISignal

parent 82d094de
No related branches found
No related tags found
No related merge requests found
Showing
with 27 additions and 27 deletions
......@@ -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;
......
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);
}
......
......@@ -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);
}
......
......@@ -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);
/**
*
......
......@@ -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) {}
......
......@@ -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);
......
......@@ -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();
}
......
......@@ -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());
}
......
......@@ -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);
}
......@@ -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) {
......
......@@ -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) {
......
......@@ -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>();
......
......@@ -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);
......
Subproject commit 88e1e25f9519b250258c7e5ada30935975ab2d10
Subproject commit 75998aa20b7ec897ec321c1f94192de888f2dc6e
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment