ODE-987. Rename marker interface to Channel for a cleaner api
git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@1434033 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ode/jacob/ChannelType.java b/src/main/java/org/apache/ode/jacob/Channel.java
similarity index 94%
rename from src/main/java/org/apache/ode/jacob/ChannelType.java
rename to src/main/java/org/apache/ode/jacob/Channel.java
index 5279d08..5b9211c 100644
--- a/src/main/java/org/apache/ode/jacob/ChannelType.java
+++ b/src/main/java/org/apache/ode/jacob/Channel.java
@@ -24,5 +24,5 @@
* Marker interface extended by channel interfaces.
* TODO: evaluate if an annotation, although slower, would offer a more elegant approach
*/
-public interface ChannelType extends Serializable {
+public interface Channel extends Serializable {
}
diff --git a/src/main/java/org/apache/ode/jacob/ProcessUtil.java b/src/main/java/org/apache/ode/jacob/ProcessUtil.java
index 053af4c..4703221 100644
--- a/src/main/java/org/apache/ode/jacob/ProcessUtil.java
+++ b/src/main/java/org/apache/ode/jacob/ProcessUtil.java
@@ -24,7 +24,7 @@
// Utility class
}
- public static String exportChannel(ChannelType channel) {
+ public static String exportChannel(Channel channel) {
if (channel != null && channel instanceof ExportableChannel) {
return ((ExportableChannel)channel).export();
}
diff --git a/src/main/java/org/apache/ode/jacob/Synch.java b/src/main/java/org/apache/ode/jacob/Synch.java
index dbe6507..c6a9f1d 100644
--- a/src/main/java/org/apache/ode/jacob/Synch.java
+++ b/src/main/java/org/apache/ode/jacob/Synch.java
@@ -27,7 +27,7 @@
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
-public interface Synch extends ChannelType {
+public interface Synch extends Channel {
public void ret();
diff --git a/src/main/java/org/apache/ode/jacob/Val.java b/src/main/java/org/apache/ode/jacob/Val.java
index 2db6f7e..8d93d28 100644
--- a/src/main/java/org/apache/ode/jacob/Val.java
+++ b/src/main/java/org/apache/ode/jacob/Val.java
@@ -22,7 +22,7 @@
/**
* Generic return-value channel type.
*/
-public interface Val extends ChannelType {
+public interface Val extends Channel {
public void val(Object retVal);
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 0058b39..71568ae 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
@@ -19,13 +19,13 @@
package org.apache.ode.jacob.examples.cell;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.Val;
/**
* Channel type for a cell. The channel allows reading of and setting the values of a cell.
*/
-public interface Cell extends ChannelType {
+public interface Cell extends Channel {
/**
* Read the value of the cell.
diff --git a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
index 8b911ed..ce8d627 100644
--- a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
+++ b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
@@ -19,7 +19,7 @@
package org.apache.ode.jacob.examples.eratosthenes;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.SynchChannel;
/**
@@ -29,7 +29,7 @@
* @jacob.kind
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
-public interface NaturalNumberStream extends ChannelType {
+public interface NaturalNumberStream extends Channel {
public void val(int n, SynchChannel ret);
diff --git a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
index a4b6cfe..2a0169a 100644
--- a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
+++ b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
@@ -18,7 +18,7 @@
*/
package org.apache.ode.jacob.examples.synch;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.SynchChannel;
/**
@@ -27,7 +27,7 @@
*
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
-public interface SynchPrint extends ChannelType {
+public interface SynchPrint extends Channel {
public SynchChannel print(String msg);
diff --git a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
index f738e67..bbe8491 100644
--- a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
+++ b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
@@ -23,7 +23,7 @@
import java.lang.reflect.Proxy;
import org.apache.ode.jacob.ExportableChannel;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.ProcessUtil;
import junit.framework.TestCase;
@@ -106,7 +106,7 @@
});
}
- public interface Greeter extends ChannelType {
+ public interface Greeter extends Channel {
String hello(String name);
}
