ODE-987. Simplify the ReceiveProcess api by removing one generic arg
git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@1433714 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ode/jacob/ReceiveProcess.java b/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
index 1fc874f..9b53b3e 100644
--- a/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
+++ b/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
@@ -25,11 +25,11 @@
@SuppressWarnings("serial")
-public abstract class ReceiveProcess<C extends Channel, R> extends ChannelListener {
+public abstract class ReceiveProcess<R> extends ChannelListener {
private transient Set<Method> _implementedMethods;
private R receiver;
- protected ReceiveProcess(C channel, R receiver) throws IllegalStateException {
+ protected ReceiveProcess(Channel channel, R receiver) throws IllegalStateException {
super(channel);
this.receiver = receiver;
}
diff --git a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
index 139b3d2..550fb9c 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
@@ -401,7 +401,7 @@
long ctime = System.currentTimeMillis();
try {
_method.invoke(_methodBody instanceof ReceiveProcess ?
- ((ReceiveProcess<?, ?>)_methodBody).receiver() : _methodBody, args);
+ ((ReceiveProcess<?>)_methodBody).receiver() : _methodBody, args);
if (synchChannel != null) {
synchChannel.ret();
}
diff --git a/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java b/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
index 3d9c89e..88d0e73 100644
--- a/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
+++ b/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
@@ -44,7 +44,7 @@
public void run() {
// INSTANTIATION{Cell(run,val)}
// ==> run ? [ read(r)={...} & write(newVal)={...} ]
- object(new ReceiveProcess<CellChannel, Cell>(_self, new Cell() {
+ object(new ReceiveProcess<Cell>(_self, new Cell() {
public void read(Val r) {
// COMMUNICATION{x & [read... & ... ] | x ! read} ==> Cell(run, val) ...
instance(new CELL_<T>(_self, _val));
diff --git a/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java b/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
index 5299eb4..9a3f952 100644
--- a/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
+++ b/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
@@ -65,7 +65,7 @@
ValChannel retChannel = newChannel(ValChannel.class, "val");
instance(new CELL_<String>(cellChannel, "foo"));
- object(new ReceiveProcess<ValChannel, Val>(retChannel, new Val() {
+ object(new ReceiveProcess<Val>(retChannel, new Val() {
public void val(Object retVal) {
_val = retVal;
}
diff --git a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
index a55e346..4a61b9e 100644
--- a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
+++ b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
@@ -71,7 +71,7 @@
}
public void run() {
- _out.val(_n, (SynchChannel)object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(_n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
instance(new Counter(_out, _n+1));
}
@@ -103,9 +103,9 @@
}
public void run() {
- object(new ReceiveProcess<NaturalNumberStreamChannel, NaturalNumberStream>(_in, new NaturalNumberStream() {
+ object(new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream() {
public void val(final int n, final SynchChannel ret) {
- _primes.val(n, (SynchChannel)object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
+ _primes.val(n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
NaturalNumberStreamChannel x = newChannel(NaturalNumberStreamChannel.class);
instance(new PrimeFilter(n, _in, x));
@@ -130,7 +130,7 @@
_in = in;
}
public void run() {
- object(true, new ReceiveProcess<NaturalNumberStreamChannel, NaturalNumberStream>(_in, new NaturalNumberStream(){
+ object(true, new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream(){
public void val(int n, SynchChannel ret) {
_cnt ++;
_last = n;
@@ -164,10 +164,10 @@
_out = out;
}
public void run() {
- object(true, new ReceiveProcess<NaturalNumberStreamChannel, NaturalNumberStream>(_in, new NaturalNumberStream() {
+ object(true, new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream() {
public void val(int n, final SynchChannel ret) {
if (n % _prime != 0) {
- _out.val(n, (SynchChannel)object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
ret.ret();
}
diff --git a/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java b/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
index 28561bf..44438a8 100644
--- a/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
+++ b/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
@@ -54,7 +54,7 @@
}
} else {
SynchChannel r = newChannel(SynchChannel.class);
- object(new ReceiveProcess<SynchChannel, Synch>(r, new Synch() {
+ object(new ReceiveProcess<Synch>(r, new Synch() {
public void ret() {
++_current;
instance(Sequence.this);
diff --git a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
index f26914d..49a6b75 100644
--- a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
+++ b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
@@ -42,7 +42,7 @@
}
public void run() {
- object(true, new ReceiveProcess<SynchPrintChannel, SynchPrint>(_self, new SynchPrint() {
+ object(true, new ReceiveProcess<SynchPrint>(_self, new SynchPrint() {
public SynchChannel print(String msg) {
System.out.println(msg);
return null; // SynchChannel automatically created by JacobVPU
@@ -60,11 +60,11 @@
public void run() {
final SynchPrintChannel p = newChannel(SynchPrintChannel.class);
instance(new SystemPrinter(p));
- object(new ReceiveProcess<SynchChannel, Synch>(p.print("1"), new Synch() {
+ object(new ReceiveProcess<Synch>(p.print("1"), new Synch() {
public void ret() {
- object(new ReceiveProcess<SynchChannel, Synch>(p.print("2"), new Synch() {
+ object(new ReceiveProcess<Synch>(p.print("2"), new Synch() {
public void ret() {
- object(new ReceiveProcess<SynchChannel, Synch>(p.print("3"), new Synch() {
+ object(new ReceiveProcess<Synch>(p.print("3"), new Synch() {
public void ret() {
}
}) {});
