Author: jkaputin
Date: Wed Nov 9 07:02:52 2005
New Revision: 332059
URL: http://svn.apache.org/viewcvs?rev=332059&view=rev
Log:
Consolidated input and output collections into a single
collection of MessageRefElements (with the direction
property indicating input or output).
Consolidated infault and outfault collections into a
single collection of FaultRefElements (ditto for the
use of direction property).
Removed the fInterfaceMessageReferences collection
because we can use fMessageRefElements with casting instead.
Removed the fInterfaceFaultReferences collection
because we can use fFaultRefElements with casting instead.
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java?rev=332059&r1=332058&r2=332059&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
Wed Nov 9 07:02:52 2005
@@ -41,16 +41,11 @@
//Component data
private QName fName = null;
private URI fMessageExchangePattern = null;
- private List fInterfaceMessageRefs = new Vector();
- private List fInterfaceFaultRefs = new Vector();
private List fStyle = new Vector();
//XML data
- private List fInputs = new Vector();
- private List fOutputs = new Vector();
- private List fInfaults = new Vector();
- private List fOutfaults = new Vector();
-
+ private List fMessageRefElements = new Vector();
+ private List fFaultRefElements = new Vector();
/* ************************************************************
* InterfaceOperation methods (the WSDL Component model)
@@ -78,8 +73,8 @@
*/
public InterfaceMessageReference[] getInterfaceMessageReferences()
{
- InterfaceMessageReference[] array = new
InterfaceMessageReference[fInterfaceMessageRefs.size()];
- fInterfaceMessageRefs.toArray(array);
+ InterfaceMessageReference[] array = new
InterfaceMessageReference[fMessageRefElements.size()];
+ fMessageRefElements.toArray(array);
return array;
}
@@ -88,8 +83,8 @@
*/
public InterfaceFaultReference[] getInterfaceFaultReferences()
{
- InterfaceFaultReference[] array = new
InterfaceFaultReference[fInterfaceFaultRefs.size()];
- fInterfaceFaultRefs.toArray(array);
+ InterfaceFaultReference[] array = new
InterfaceFaultReference[fFaultRefElements.size()];
+ fFaultRefElements.toArray(array);
return array;
}
@@ -149,106 +144,54 @@
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addInputElement(InterfaceOperationMessageElement)
- */
- public void addInputElement(InterfaceMessageReferenceElement input)
- {
- fInputs.add(input);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeInputElement(InterfaceOperationMessageElement)
- */
- public void removeInputElement(InterfaceMessageReferenceElement input)
- {
- fInputs.remove(input);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#getInputElements()
- */
- public InterfaceMessageReferenceElement[] getInputElements()
- {
- InterfaceMessageReferenceElement[] array = new
InterfaceMessageReferenceElement[fInputs.size()];
- fInputs.toArray(array);
- return array;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addOutputElement(InterfaceOperationMessageElement)
- */
- public void addOutputElement(InterfaceMessageReferenceElement output)
- {
- fOutputs.add(output);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeOutputElement(InterfaceOperationMessageElement)
- */
- public void removeOutputElement(InterfaceMessageReferenceElement output)
- {
- fOutputs.remove(output);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#getOutputElements()
- */
- public InterfaceMessageReferenceElement[] getOutputElements()
- {
- InterfaceMessageReferenceElement[] array = new
InterfaceMessageReferenceElement[fOutputs.size()];
- fOutputs.toArray(array);
- return array;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addInfaultElement(OperationFaultElement)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addMessageReferenceElement(InterfaceMessageReferenceElement)
*/
- public void addInfaultElement(FaultReferenceElement infault)
+ public void addMessageReferenceElement(InterfaceMessageReferenceElement
message)
{
- fInfaults.add(infault);
+ fMessageRefElements.add(message);
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeInfaultElement(OperationFaultElement)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeMessageReferenceElement(InterfaceMessageReferenceElement)
*/
- public void removeInfaultElement(FaultReferenceElement infault)
+ public void removeMessageReferenceElement(InterfaceMessageReferenceElement
message)
{
- fInfaults.remove(infault);
+ fMessageRefElements.remove(message);
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#getInfaultElements()
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#getMessageReferenceElements()
*/
- public FaultReferenceElement[] getInfaultElements()
+ public InterfaceMessageReferenceElement[] getMessageReferenceElements()
{
- FaultReferenceElement[] array = new
FaultReferenceElement[fInfaults.size()];
- fInfaults.toArray(array);
+ InterfaceMessageReferenceElement[] array = new
InterfaceMessageReferenceElement[fMessageRefElements.size()];
+ fMessageRefElements.toArray(array);
return array;
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addOutfaultElement(OperationFaultElement)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#addFaultReferenceElement(FaultReferenceElement)
*/
- public void addOutfaultElement(FaultReferenceElement outfault)
+ public void addFaultReferenceElement(FaultReferenceElement faultRef)
{
- fOutfaults.add(outfault);
+ fFaultRefElements.add(faultRef);
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeOutfaultElement(OperationFaultElement)
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#removeFaultReferenceElement(FaultReferenceElement)
*/
- public void removeOutfaultElement(FaultReferenceElement outfault)
+ public void removeFaultReferenceElement(FaultReferenceElement faultRef)
{
- fOutfaults.remove(outfault);
+ fFaultRefElements.remove(faultRef);
}
/*
- * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#getOutfaultElements()
+ * @see
org.apache.woden.wsdl20.xml.InterfaceOperationElement#getFaultReferenceElements()
*/
- public FaultReferenceElement[] getOutfaultElements()
+ public FaultReferenceElement[] getFaultReferenceElements()
{
- FaultReferenceElement[] array = new
FaultReferenceElement[fOutfaults.size()];
- fOutfaults.toArray(array);
+ FaultReferenceElement[] array = new
FaultReferenceElement[fFaultRefElements.size()];
+ fFaultRefElements.toArray(array);
return array;
}
Modified:
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java?rev=332059&r1=332058&r2=332059&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
(original)
+++
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceOperationElement.java
Wed Nov 9 07:02:52 2005
@@ -49,20 +49,12 @@
* Elements
*/
- public void addInputElement(InterfaceMessageReferenceElement input);
- public void removeInputElement(InterfaceMessageReferenceElement input);
- public InterfaceMessageReferenceElement[] getInputElements();
+ public void addMessageReferenceElement(InterfaceMessageReferenceElement
input);
+ public void removeMessageReferenceElement(InterfaceMessageReferenceElement
input);
+ public InterfaceMessageReferenceElement[] getMessageReferenceElements();
- public void addOutputElement(InterfaceMessageReferenceElement output);
- public void removeOutputElement(InterfaceMessageReferenceElement output);
- public InterfaceMessageReferenceElement[] getOutputElements();
+ public void addFaultReferenceElement(FaultReferenceElement infault);
+ public void removeFaultReferenceElement(FaultReferenceElement infault);
+ public FaultReferenceElement[] getFaultReferenceElements();
- public void addInfaultElement(FaultReferenceElement infault);
- public void removeInfaultElement(FaultReferenceElement infault);
- public FaultReferenceElement[] getInfaultElements();
-
- public void addOutfaultElement(FaultReferenceElement outfault);
- public void removeOutfaultElement(FaultReferenceElement outfault);
- public FaultReferenceElement[] getOutfaultElements();
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
