ODE-987. Cleanup api. Remove redundant object() methods.
git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@1436733 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ode/jacob/JacobObject.java b/src/main/java/org/apache/ode/jacob/JacobObject.java
index e1ede29..062c750 100644
--- a/src/main/java/org/apache/ode/jacob/JacobObject.java
+++ b/src/main/java/org/apache/ode/jacob/JacobObject.java
@@ -90,19 +90,6 @@
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.
*
diff --git a/src/main/java/org/apache/ode/jacob/JacobThread.java b/src/main/java/org/apache/ode/jacob/JacobThread.java
index 85e1054..802539f 100644
--- a/src/main/java/org/apache/ode/jacob/JacobThread.java
+++ b/src/main/java/org/apache/ode/jacob/JacobThread.java
@@ -84,9 +84,5 @@
* @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;
}
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 0a04dca..68cc9d2 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
@@ -325,19 +325,16 @@
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 @@
_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()) {
