You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ha...@apache.org on 2013/01/11 06:02:45 UTC
svn commit: r1431887 - in /ode/trunk/jacob/src:
main/java/org/apache/ode/jacob/ReceiveProcess.java
test/java/org/apache/ode/jacob/examples/cell/CELL_.java
test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
Author: hadrian
Date: Fri Jan 11 05:02:44 2013
New Revision: 1431887
URL: http://svn.apache.org/viewvc?rev=1431887&view=rev
Log:
ODE-979. Remove anonymous ChannelListener implementations in jacob
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java?rev=1431887&r1=1431886&r2=1431887&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java Fri Jan 11 05:02:44 2013
@@ -27,7 +27,7 @@ import java.util.Set;
@SuppressWarnings("serial")
public abstract class ReceiveProcess<C extends Channel, R> extends ChannelListener<C> {
private transient Set<Method> _implementedMethods;
- final R receiver;
+ private R receiver;
protected ReceiveProcess(C channel, R receiver) throws IllegalStateException {
super(channel);
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java?rev=1431887&r1=1431886&r2=1431887&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java Fri Jan 11 05:02:44 2013
@@ -19,6 +19,7 @@
package org.apache.ode.jacob.examples.cell;
import org.apache.ode.jacob.JacobRunnable;
+import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Val;
/**
@@ -43,9 +44,7 @@ public class CELL_<T> extends JacobRunna
public void run() {
// INSTANTIATION{Cell(run,val)}
// ==> run ? [ read(r)={...} & write(newVal)={...} ]
- object(new CellChannelListener(_self) {
- private static final long serialVersionUID = 8883128084307471572L;
-
+ object(new ReceiveProcess<CellChannel, Cell>(_self, new Cell() {
public void read(Val r) {
// COMMUNICATION{x & [read... & ... ] | x ! read} ==> Cell(run, val) ...
instance(new CELL_<T>(_self, _val));
@@ -61,6 +60,8 @@ public class CELL_<T> extends JacobRunna
// COMMUNICATION{x & [... & write...] ==> Cell(run, newVal)
instance(new CELL_(_self, newVal));
}
+ }) {
+ private static final long serialVersionUID = 8883128084307471572L;
});
}
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java?rev=1431887&r1=1431886&r2=1431887&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java Fri Jan 11 05:02:44 2013
@@ -103,9 +103,7 @@ public class Sieve extends JacobRunnable
}
public void run() {
- object(new NaturalNumberStreamChannelListener(_in) {
- private static final long serialVersionUID = -2145752474431263689L;
-
+ object(new ReceiveProcess<NaturalNumberStreamChannel, NaturalNumberStream>(_in, new NaturalNumberStream() {
public void val(final int n, final SynchChannel ret) {
_primes.val(n, object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
@@ -118,6 +116,8 @@ public class Sieve extends JacobRunnable
private static final long serialVersionUID = -3009595654233593893L;
}));
}
+ }) {
+ private static final long serialVersionUID = -2145752474431263689L;
});
}
}
@@ -130,15 +130,15 @@ public class Sieve extends JacobRunnable
_in = in;
}
public void run() {
- object(true, new NaturalNumberStreamChannelListener(_in){
- private static final long serialVersionUID = 7671019806323866866L;
-
+ object(true, new ReceiveProcess<NaturalNumberStreamChannel, NaturalNumberStream>(_in, new NaturalNumberStream(){
public void val(int n, SynchChannel ret) {
_cnt ++;
_last = n;
System.out.println("PRIME: " + n);
ret.ret();
}
+ }) {
+ private static final long serialVersionUID = 7671019806323866866L;
});
}
}
@@ -164,9 +164,7 @@ public class Sieve extends JacobRunnable
_out = out;
}
public void run() {
- object(true, new NaturalNumberStreamChannelListener(_in) {
- private static final long serialVersionUID = 6625386475773075604L;
-
+ object(true, new ReceiveProcess<NaturalNumberStreamChannel, NaturalNumberStream>(_in, new NaturalNumberStream() {
public void val(int n, final SynchChannel ret) {
if (n % _prime != 0) {
_out.val(n, object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
@@ -180,6 +178,8 @@ public class Sieve extends JacobRunnable
ret.ret();
}
}
+ }) {
+ private static final long serialVersionUID = 6625386475773075604L;
});
}
}
@@ -201,7 +201,5 @@ public class Sieve extends JacobRunnable
}
System.err.println("The " + _cnt + "th prime is " + _last);
}
-
-
}
}