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/22 04:00:49 UTC
svn commit: r1436733 - in
/ode/trunk/jacob/src/main/java/org/apache/ode/jacob: JacobObject.java
JacobThread.java vpu/JacobVPU.java
Author: hadrian
Date: Tue Jan 22 03:00:49 2013
New Revision: 1436733
URL: http://svn.apache.org/viewvc?rev=1436733&view=rev
Log:
ODE-987. Cleanup api. Remove redundant object() methods.
Modified:
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/vpu/JacobVPU.java
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=1436733&r1=1436732&r2=1436733&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 22 03:00:49 2013
@@ -90,19 +90,6 @@ public abstract class JacobObject implem
JacobVPU.activeJacobThread().object(replication, methodList);
}
- protected static void object(boolean replication, ChannelListener[] methodLists) {
- JacobVPU.activeJacobThread().object(replication, methodLists);
- }
-
- protected static void object(boolean replication, Set<ChannelListener> methodLists) {
- JacobVPU.activeJacobThread().object(replication,
- methodLists.toArray(new ChannelListener[methodLists.size()]));
- }
-
- protected static void replication(ChannelListener methodList) {
- JacobVPU.activeJacobThread().object(true, methodList);
- }
-
/**
* Obtain a replicated channel broadcaster.
*
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=1436733&r1=1436732&r2=1436733&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 22 03:00:49 2013
@@ -84,9 +84,5 @@ public interface JacobThread {
* @throws IllegalArgumentException
* if the method list does not match the channel kind
*/
- public void object(boolean replicate, ChannelListener methodList)
- throws IllegalArgumentException;
-
- public void object(boolean reaplicate, ChannelListener[] methodLists)
- throws IllegalArgumentException;
+ public void object(boolean replicate, ChannelListener methodList) throws IllegalArgumentException;
}
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=1436733&r1=1436732&r2=1436733&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 22 03:00:49 2013
@@ -325,19 +325,16 @@ 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);
msg.append(": ");
- for (int i = 0; i < ml.length; ++i) {
- if (ml[i] instanceof ReceiveProcess) {
- ReceiveProcess<?> rp = (ReceiveProcess<?>)ml[i];
- if (i != 0) msg.append(" + ");
- msg.append(rp.getChannel());
- msg.append(" ? ");
- msg.append(rp.toString());
- }
+ if (ml instanceof ReceiveProcess) {
+ ReceiveProcess<?> rp = (ReceiveProcess<?>)ml;
+ msg.append(rp.getChannel());
+ msg.append(" ? ");
+ msg.append(rp.toString());
}
LOG.trace(msg.toString());
}
@@ -345,16 +342,10 @@ public final class JacobVPU {
_statistics.numContinuations++;
CommGroup grp = new CommGroup(replicate);
- for (int i = 0; i < ml.length; ++i) {
- addCommChannel(grp, ml[i]);
- }
+ addCommChannel(grp, ml);
_executionQueue.add(grp);
}
- public void object(boolean replicate, ChannelListener methodList) throws IllegalArgumentException {
- object(replicate, new ChannelListener[] { methodList });
- }
-
private void addCommChannel(CommGroup group, ChannelListener receiver) {
if (receiver instanceof CompositeProcess) {
for (ChannelListener r : ((CompositeProcess)receiver).getProcesses()) {