You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/05 08:06:29 UTC
svn commit: r525715 - in /incubator/tuscany/java/sca/modules:
idl-java/src/main/java/org/apache/tuscany/idl/java/impl/
idl/src/main/java/org/apache/tuscany/idl/
idl/src/main/java/org/apache/tuscany/idl/impl/
Author: rfeng
Date: Wed Apr 4 23:06:28 2007
New Revision: 525715
URL: http://svn.apache.org/viewvc?view=rev&rev=525715
Log:
Minor fixes for IDL
Modified:
incubator/tuscany/java/sca/modules/idl-java/src/main/java/org/apache/tuscany/idl/java/impl/JavaInterfaceImpl.java
incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Interface.java
incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Operation.java
incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/impl/OperationImpl.java
Modified: incubator/tuscany/java/sca/modules/idl-java/src/main/java/org/apache/tuscany/idl/java/impl/JavaInterfaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl-java/src/main/java/org/apache/tuscany/idl/java/impl/JavaInterfaceImpl.java?view=diff&rev=525715&r1=525714&r2=525715
==============================================================================
--- incubator/tuscany/java/sca/modules/idl-java/src/main/java/org/apache/tuscany/idl/java/impl/JavaInterfaceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/idl-java/src/main/java/org/apache/tuscany/idl/java/impl/JavaInterfaceImpl.java Wed Apr 4 23:06:28 2007
@@ -53,5 +53,9 @@
public void setJavaClass(Class<?> javaClass) {
this.javaClass = javaClass;
}
+
+ public String toString() {
+ return getName();
+ }
}
Modified: incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Interface.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Interface.java?view=diff&rev=525715&r1=525714&r2=525715
==============================================================================
--- incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Interface.java (original)
+++ incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Interface.java Wed Apr 4 23:06:28 2007
@@ -41,6 +41,8 @@
*/
void setRemotable(boolean remotable);
+
+ // FIXME: [rfeng] We need to re-consider the conversational as an intent
/**
* Test if the interface is conversational
* @return
Modified: incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Operation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Operation.java?view=diff&rev=525715&r1=525714&r2=525715
==============================================================================
--- incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Operation.java (original)
+++ incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/Operation.java Wed Apr 4 23:06:28 2007
@@ -63,6 +63,11 @@
* @return the inputType
*/
DataType<List<DataType>> getInputType();
+
+ /**
+ * @param inputType
+ */
+ void setInputType(DataType<List<DataType>> inputType);
/**
* Get the data type for the output
@@ -70,6 +75,11 @@
* @return the outputType
*/
DataType getOutputType();
+
+ /**
+ * @param outputType
+ */
+ void setOutputType(DataType outputType);
/**
* Get a list of data types to represent the faults/exceptions
@@ -78,9 +88,35 @@
*/
List<DataType> getFaultTypes();
+ /**
+ * @param faultTypes
+ */
+ void setFaultTypes(List<DataType> faultTypes);
+
Interface getInterface();
void setInterface(Interface interfaze);
+
+ /**
+ * Get the sequence of the conversation
+ * @return
+ */
ConversationSequence getConversationSequence();
+
+ /**
+ * Set the sequence of conversation for the operation
+ * @param sequence
+ */
void setConversationSequence(ConversationSequence sequence);
+
+ /**
+ * Indicate if the operation is non-blocking
+ * @return
+ */
+ boolean isNonBlocking();
+
+ /**
+ * Set the operation to be non-blocking
+ */
+ void setNonBlocking(boolean nonBlocking);
}
Modified: incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/impl/OperationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/impl/OperationImpl.java?view=diff&rev=525715&r1=525714&r2=525715
==============================================================================
--- incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/impl/OperationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/impl/OperationImpl.java Wed Apr 4 23:06:28 2007
@@ -35,9 +35,25 @@
private boolean unresolved;
private DataType outputType;
private DataType<List<DataType>> inputType;
- private List<DataType> faultTypes;
+ private List<DataType> faultTypes;
private Interface interfaze;
- private ConversationSequence conversationSequence;
+ private ConversationSequence conversationSequence = ConversationSequence.NO_CONVERSATION;
+ private boolean nonBlocking;
+
+ /**
+ * @param name
+ */
+ public OperationImpl() {
+ super();
+ }
+
+ /**
+ * @param name
+ */
+ public OperationImpl(String name) {
+ super();
+ this.name = name;
+ }
public String getName() {
return name;
@@ -123,6 +139,94 @@
*/
public void setConversationSequence(ConversationSequence conversationSequence) {
this.conversationSequence = conversationSequence;
+ }
+
+ /**
+ * @return the nonBlocking
+ */
+ public boolean isNonBlocking() {
+ return nonBlocking;
+ }
+
+ /**
+ * @param nonBlocking the nonBlocking to set
+ */
+ public void setNonBlocking(boolean nonBlocking) {
+ this.nonBlocking = nonBlocking;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int PRIME = 31;
+ int result = 1;
+ result = PRIME * result + ((conversationSequence == null) ? 0 : conversationSequence.hashCode());
+ // result = PRIME * result + ((faultTypes == null) ? 0 : faultTypes.hashCode());
+ result = PRIME * result + ((inputType == null) ? 0 : inputType.hashCode());
+ result = PRIME * result + ((name == null) ? 0 : name.hashCode());
+ result = PRIME * result + (nonBlocking ? 1231 : 1237);
+ result = PRIME * result + ((outputType == null) ? 0 : outputType.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final OperationImpl other = (OperationImpl)obj;
+ if (conversationSequence == null) {
+ if (other.conversationSequence != null) {
+ return false;
+ }
+ } else if (!conversationSequence.equals(other.conversationSequence)) {
+ return false;
+ }
+ /*
+ if (faultTypes == null) {
+ if (other.faultTypes != null) {
+ return false;
+ }
+ } else if (!faultTypes.equals(other.faultTypes)) {
+ return false;
+ }
+ */
+
+ if (inputType == null) {
+ if (other.inputType != null) {
+ return false;
+ }
+ } else if (!inputType.equals(other.inputType)) {
+ return false;
+ }
+ if (name == null) {
+ if (other.name != null) {
+ return false;
+ }
+ } else if (!name.equals(other.name)) {
+ return false;
+ }
+ if (nonBlocking != other.nonBlocking) {
+ return false;
+ }
+ if (outputType == null) {
+ if (other.outputType != null) {
+ return false;
+ }
+ } else if (!outputType.equals(other.outputType)) {
+ return false;
+ }
+ return true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org