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/15 22:07:31 UTC
svn commit: r1433649 - in /ode/trunk:
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/
jacob/src/main/java/org/apache/ode/jacob/
jacob/src/main/java/org/apache/ode/jacob/soup/ jaco...
Author: hadrian
Date: Tue Jan 15 21:07:31 2013
New Revision: 1433649
URL: http://svn.apache.org/viewvc?rev=1433649&view=rev
Log:
ODE-987. Simplify api by removing generics from ChannelListener
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java Tue Jan 15 21:07:31 2013
@@ -108,7 +108,7 @@ class ACTIVITYGUARD extends ACTIVITY {
dpe(_oactivity);
}
} else /* don't know all our links statuses */ {
- Set<ChannelListener<?>> mlset = new HashSet<ChannelListener<?>>();
+ Set<ChannelListener> mlset = new HashSet<ChannelListener>();
mlset.add(new ReceiveProcess<TerminationChannel, Termination>(_self.self, new Termination() {
public void terminate() {
// Complete immediately, without faulting or registering any comps.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java Tue Jan 15 21:07:31 2013
@@ -131,7 +131,7 @@ class EH_ALARM extends BpelJacobRunnable
public void run() {
Calendar now = Calendar.getInstance();
- Set<ChannelListener<?>> listeners = new ReceiveProcess<EventHandlerControlChannel, EventHandlerControl>(_cc, new EventHandlerControl() {
+ Set<ChannelListener> listeners = new ReceiveProcess<EventHandlerControlChannel, EventHandlerControl>(_cc, new EventHandlerControl() {
public void stop() {
_psc.completed(null, _comps);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java Tue Jan 15 21:07:31 2013
@@ -161,7 +161,7 @@ class EH_EVENT extends BpelJacobRunnable
public void run() {
if (!_active.isEmpty() || _pickResponseChannel != null) {
- HashSet<ChannelListener<?>> mlset = new HashSet<ChannelListener<?>>();
+ HashSet<ChannelListener> mlset = new HashSet<ChannelListener>();
if (!_terminated) {
mlset.add(new ReceiveProcess<TerminationChannel, Termination>(_tc, new Termination() {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java Tue Jan 15 21:07:31 2013
@@ -79,7 +79,7 @@ class FLOW extends ACTIVITY {
public void run() {
Iterator<ChildInfo> active = active();
if (active.hasNext()) {
- Set<ChannelListener<?>> mlSet = new HashSet<ChannelListener<?>>();
+ Set<ChannelListener> mlSet = new HashSet<ChannelListener>();
mlSet.add(new ReceiveProcess<TerminationChannel, Termination>(_self.self, new Termination() {
public void terminate() {
for (Iterator<ChildInfo> i = active(); i.hasNext(); )
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java Tue Jan 15 21:07:31 2013
@@ -113,7 +113,7 @@ public class FOREACH extends ACTIVITY {
// Continuing as long as a child is active
if (active().hasNext()) {
- Set<ChannelListener<?>> mlSet = new HashSet<ChannelListener<?>>();
+ Set<ChannelListener> mlSet = new HashSet<ChannelListener>();
mlSet.add(new ReceiveProcess<TerminationChannel, Termination>(_self.self, new Termination() {
public void terminate() {
// Terminating all children before sepuku
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java Tue Jan 15 21:07:31 2013
@@ -140,7 +140,7 @@ class SCOPE extends ACTIVITY {
public void run() {
if (_child != null || !_eventHandlers.isEmpty()) {
- HashSet<ChannelListener<?>> mlSet = new HashSet<ChannelListener<?>>();
+ HashSet<ChannelListener> mlSet = new HashSet<ChannelListener>();
// Listen to messages from our parent.
mlSet.add(new ReceiveProcess<TerminationChannel, Termination>(_self.self, new Termination() {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java Tue Jan 15 21:07:31 2013
@@ -153,7 +153,7 @@ public class SCOPEACT extends ACTIVITY {
__log.debug("LINKSTATUSINTERCEPTOR: running ");
- Set<ChannelListener<?>> mlset = new HashSet<ChannelListener<?>>();
+ Set<ChannelListener> mlset = new HashSet<ChannelListener>();
if (_status == null)
mlset.add(new ReceiveProcess<ValChannel, Val>(_self, new Val() {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannel
*/
public abstract class ActivityRecoveryChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.ActivityRecovery
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.CompensationChannel
*/
public abstract class CompensationChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.CompensationChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.Compensation
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.EventHandlerControlChannel
*/
public abstract class EventHandlerControlChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.EventHandlerControlChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.EventHandlerControl
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.InvokeResponseChannel
*/
public abstract class InvokeResponseChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.InvokeResponseChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.InvokeResponse
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.LinkStatusChannel
*/
public abstract class LinkStatusChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.LinkStatusChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.LinkStatus
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.ParentScopeChannel
*/
public abstract class ParentScopeChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.ParentScopeChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.ParentScope
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.PickResponseChannel
*/
public abstract class PickResponseChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.PickResponseChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.PickResponse
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.TerminationChannel
*/
public abstract class TerminationChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.TerminationChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.Termination
{
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannelListener.java Tue Jan 15 21:07:31 2013
@@ -19,7 +19,7 @@ import org.apache.commons.logging.Log;
* @see org.apache.ode.bpel.runtime.channels.TimerResponseChannel
*/
public abstract class TimerResponseChannelListener
- extends org.apache.ode.jacob.ChannelListener<org.apache.ode.bpel.runtime.channels.TimerResponseChannel>
+ extends org.apache.ode.jacob.ChannelListener
implements org.apache.ode.bpel.runtime.channels.TimerResponse
{
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java Tue Jan 15 21:07:31 2013
@@ -29,11 +29,11 @@ import java.util.Set;
* class <em>and</em> implement one <code>Channel</code> interface.
*/
@SuppressWarnings("serial")
-public abstract class ChannelListener<CT extends Channel> extends JacobObject {
+public abstract class ChannelListener extends JacobObject {
private transient Set<Method> _implementedMethods;
- private transient CT _channel;
+ private transient Channel _channel;
- protected ChannelListener(CT channel) throws IllegalStateException {
+ protected ChannelListener(Channel channel) throws IllegalStateException {
assert getClass().getSuperclass().getSuperclass() == ChannelListener.class :
"Inheritance in ChannelListener classes not allowed!";
if (channel == null) {
@@ -42,23 +42,23 @@ public abstract class ChannelListener<CT
_channel = channel;
}
- public CT getChannel() {
+ public Channel getChannel() {
return _channel;
}
- public void setChannel(CT channel) {
+ public void setChannel(Channel channel) {
_channel = channel;
}
- public Set<ChannelListener<?>> or(ChannelListener<?> other) {
- HashSet<ChannelListener<?>> retval = new HashSet<ChannelListener<?>>();
+ public Set<ChannelListener> or(ChannelListener other) {
+ HashSet<ChannelListener> retval = new HashSet<ChannelListener>();
retval.add(this);
retval.add(other);
return retval;
}
- public Set<ChannelListener<?>> or(Set<ChannelListener<?>> other) {
- HashSet<ChannelListener<?>> retval = new HashSet<ChannelListener<?>>(other);
+ public Set<ChannelListener> or(Set<ChannelListener> other) {
+ HashSet<ChannelListener> retval = new HashSet<ChannelListener>(other);
retval.add(this);
return retval;
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java Tue Jan 15 21:07:31 2013
@@ -82,25 +82,25 @@ public abstract class JacobObject implem
* @param methodList method list for the communication reduction
* @see JacobThread#object
*/
- protected static <T extends Channel> T object(ChannelListener<T> methodList) {
+ protected static Channel object(ChannelListener methodList) {
JacobVPU.activeJacobThread().object(false, methodList);
return methodList.getChannel();
}
- protected static void object(boolean replication, ChannelListener<?> methodList) {
+ protected static void object(boolean replication, ChannelListener methodList) {
JacobVPU.activeJacobThread().object(replication, methodList);
}
- protected static void object(boolean replication, ChannelListener<?>[] methodLists) {
+ protected static void object(boolean replication, ChannelListener[] methodLists) {
JacobVPU.activeJacobThread().object(replication, methodLists);
}
- protected static void object(boolean replication, Set<ChannelListener<?>> methodLists) {
+ protected static void object(boolean replication, Set<ChannelListener> methodLists) {
JacobVPU.activeJacobThread().object(replication,
methodLists.toArray(new ChannelListener[methodLists.size()]));
}
- protected static <T extends Channel> T replication(ChannelListener<T> methodList) {
+ protected static Channel replication(ChannelListener methodList) {
JacobVPU.activeJacobThread().object(true, methodList);
return methodList.getChannel();
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java Tue Jan 15 21:07:31 2013
@@ -84,9 +84,9 @@ public interface JacobThread {
* @throws IllegalArgumentException
* if the method list does not match the channel kind
*/
- public void object(boolean replicate, ChannelListener<?> methodList)
+ public void object(boolean replicate, ChannelListener methodList)
throws IllegalArgumentException;
- public void object(boolean reaplicate, ChannelListener<?>[] methodLists)
+ public void object(boolean reaplicate, ChannelListener[] methodLists)
throws IllegalArgumentException;
}
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=1433649&r1=1433648&r2=1433649&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 Tue Jan 15 21:07:31 2013
@@ -25,7 +25,7 @@ import java.util.Set;
@SuppressWarnings("serial")
-public abstract class ReceiveProcess<C extends Channel, R> extends ChannelListener<C> {
+public abstract class ReceiveProcess<C extends Channel, R> extends ChannelListener {
private transient Set<Method> _implementedMethods;
private R receiver;
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java Tue Jan 15 21:07:31 2013
@@ -29,12 +29,12 @@ import org.apache.ode.jacob.ChannelListe
* replicated variety.
*/
public class CommRecv extends Comm {
- private ChannelListener<?> _continuation;
+ private ChannelListener _continuation;
protected CommRecv() {
}
- public CommRecv(CommChannel chnl, ChannelListener<?> continuation) {
+ public CommRecv(CommChannel chnl, ChannelListener continuation) {
super(null, chnl);
_continuation = continuation;
}
@@ -48,7 +48,7 @@ public class CommRecv extends Comm {
*
* @return byte array representing the serialized form of the continuation
*/
- public ChannelListener<?> getContinuation() {
+ public ChannelListener getContinuation() {
return _continuation;
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java Tue Jan 15 21:07:31 2013
@@ -562,21 +562,21 @@ public class ExecutionQueueImpl implemen
private static class ObjectFrame extends CommFrame implements Externalizable {
private static final long serialVersionUID = -7212430608484116919L;
- ChannelListener<?> _continuation;
+ ChannelListener _continuation;
// Used for deserialization
@SuppressWarnings("unused")
public ObjectFrame() {
}
- public ObjectFrame(CommGroupFrame commGroupFrame, ChannelFrame channelFrame, ChannelListener<?> continuation) {
+ public ObjectFrame(CommGroupFrame commGroupFrame, ChannelFrame channelFrame, ChannelListener continuation) {
super(commGroupFrame, channelFrame);
this._continuation = continuation;
}
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
- _continuation = (ChannelListener<?>)in.readObject();
+ _continuation = (ChannelListener)in.readObject();
}
public void writeExternal(ObjectOutput out) throws IOException {
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java?rev=1433649&r1=1433648&r2=1433649&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java Tue Jan 15 21:07:31 2013
@@ -325,7 +325,7 @@ public final class JacobVPU {
return ChannelFactory.createChannel(cframe, channelType);
}
- public void object(boolean replicate, ChannelListener<?>[] ml) {
+ public void object(boolean replicate, ChannelListener[] ml) {
if (LOG.isTraceEnabled()) {
StringBuffer msg = new StringBuffer();
msg.append(_cycle);
@@ -354,8 +354,8 @@ public final class JacobVPU {
_executionQueue.add(grp);
}
- public void object(boolean replicate, ChannelListener<?> methodList) throws IllegalArgumentException {
- object(replicate, new ChannelListener<?>[] { methodList });
+ public void object(boolean replicate, ChannelListener methodList) throws IllegalArgumentException {
+ object(replicate, new ChannelListener[] { methodList });
}
/* UNUSED
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=1433649&r1=1433648&r2=1433649&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 Tue Jan 15 21:07:31 2013
@@ -71,7 +71,7 @@ public class Sieve extends JacobRunnable
}
public void run() {
- _out.val(_n, object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(_n, (SynchChannel)object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
instance(new Counter(_out, _n+1));
}
@@ -105,7 +105,7 @@ public class Sieve extends JacobRunnable
public void run() {
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() {
+ _primes.val(n, (SynchChannel)object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
NaturalNumberStreamChannel x = newChannel(NaturalNumberStreamChannel.class);
instance(new PrimeFilter(n, _in, x));
@@ -167,7 +167,7 @@ public class Sieve extends JacobRunnable
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() {
+ _out.val(n, (SynchChannel)object(new ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
ret.ret();
}