You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2005/12/06 20:17:35 UTC
svn commit: r354504 - in /incubator/woden/java/src/org/apache/woden:
internal/wsdl20/extensions/soap/ wsdl20/extensions/ wsdl20/extensions/soap/
Author: jkaputin
Date: Tue Dec 6 11:17:19 2005
New Revision: 354504
URL: http://svn.apache.org/viewcvs?rev=354504&view=rev
Log:
Improved some method and argument names for clarity.
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModule.java
incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModuleElement.java
Modified: incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java Tue Dec 6 11:17:19 2005
@@ -58,8 +58,8 @@
SOAPModuleElement soapMod =
(SOAPModuleElement) extReg.createExtElement(parentType, elementType);
- soapMod.setElementQName(elementType);
- soapMod.setParent((WSDLElement)parent);
+ soapMod.setExtensionType(elementType);
+ soapMod.setParentElement((WSDLElement)parent);
String ref = DOMUtils.getAttribute(el, Constants.ATTR_REF);
if(ref != null)
Modified: incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleImpl.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleImpl.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleImpl.java (original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleImpl.java Tue Dec 6 11:17:19 2005
@@ -24,6 +24,7 @@
import javax.xml.namespace.QName;
+import org.apache.woden.wsdl20.WSDLComponent;
import org.apache.woden.wsdl20.extensions.ExtensionElement;
import org.apache.woden.wsdl20.extensions.soap.SOAPModule;
import org.apache.woden.wsdl20.extensions.soap.SOAPModuleElement;
@@ -40,13 +41,13 @@
*/
public class SOAPModuleImpl implements SOAPModule, SOAPModuleElement
{
- QName fElementQN = null;
- URI fRef = null;
- Boolean fRequired = null;
- Map fExtAttributes = new HashMap();
- List fExtElements = new Vector();
- WSDLElement fParent = null;
- List fDocumentationElements = new Vector();
+ private QName fExtElementType = null;
+ private URI fRef = null;
+ private Boolean fRequired = null;
+ private Map fExtAttributes = new HashMap();
+ private List fExtElements = new Vector();
+ private WSDLElement fParent = null;
+ private List fDocumentationElements = new Vector();
/* ***********************************************************************
* Component model methods (SOAPModule interface), shared with Element model
@@ -61,19 +62,18 @@
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.extensions.soap.SOAPModule#getRequired()
- * @see org.apache.woden.wsdl20.extensions.ExtensionElement#getRequired()
+ * @see org.apache.woden.wsdl20.extensions.soap.SOAPModule#isRequired()
+ * @see org.apache.woden.wsdl20.extensions.ExtensionElement#isRequired()
*/
- public Boolean getRequired() {
+ public Boolean isRequired() {
return fRequired;
}
/* (non-Javadoc)
* @see org.apache.woden.wsdl20.extensions.soap.SOAPModule#getParent()
- * @see org.apache.woden.wsdl20.extensions.soap.SOAPModuleElement#getParent()
*/
- public WSDLElement getParent() {
- return fParent;
+ public WSDLComponent getParent() {
+ return (WSDLComponent)fParent;
}
/*
@@ -96,13 +96,19 @@
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.extensions.soap.SOAPModuleElement#setParent(org.apache.woden.wsdl20.xml.WSDLElement)
+ * @see org.apache.woden.wsdl20.extensions.soap.SOAPModuleElement#setParentElement(org.apache.woden.wsdl20.xml.WSDLElement)
*/
- public void setParent(WSDLElement wsdlEl) {
+ public void setParentElement(WSDLElement wsdlEl) {
fParent = wsdlEl;
}
/* (non-Javadoc)
+ * @see org.apache.woden.wsdl20.extensions.soap.SOAPModuleElement#getParentElement()
+ */
+ public WSDLElement getParentElement() {
+ return fParent;
+ }
+ /* (non-Javadoc)
* @see org.apache.woden.wsdl20.extensions.soap.SOAPModuleElement#addDocumentationElement(org.apache.woden.wsdl20.xml.DocumentationElement)
*/
public void addDocumentationElement(DocumentationElement docEl) {
@@ -122,15 +128,15 @@
/* (non-Javadoc)
* @see org.apache.woden.wsdl20.extensions.ExtensionElement#setElementQName(javax.xml.namespace.QName)
*/
- public void setElementQName(QName qname) {
- fElementQN = qname;
+ public void setExtensionType(QName qname) {
+ fExtElementType = qname;
}
/* (non-Javadoc)
* @see org.apache.woden.wsdl20.extensions.ExtensionElement#getElementQName()
*/
- public QName getElementQName() {
- return fElementQN;
+ public QName getExtensionType() {
+ return fExtElementType;
}
/* (non-Javadoc)
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java Tue Dec 6 11:17:19 2005
@@ -44,15 +44,15 @@
* this element was encountered as an immediate child of
* a <wsdl:binding> element.
* @param elementQN the qname of the extensibility element
- * @param el the extensibility element to deserialize
+ * @param extEl the extensibility element to deserialize
* @param def the definition this extensibility element was
* encountered in
* @param extReg the ExtensionRegistry to use (if needed again)
*/
public ExtensionElement unmarshall(Class parentType,
Object parent,
- QName elementType,
- Element el,
+ QName extType,
+ Element extEl,
DescriptionElement desc,
ExtensionRegistry extReg)
throws WSDLException;
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java Tue Dec 6 11:17:19 2005
@@ -30,12 +30,12 @@
*/
public interface ExtensionElement
{
- public void setElementQName(QName qname);
+ public void setExtensionType(QName qname);
- public QName getElementQName();
+ public QName getExtensionType();
public void setRequired(Boolean required);
- public Boolean getRequired();
+ public Boolean isRequired();
}
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java Tue Dec 6 11:17:19 2005
@@ -39,8 +39,8 @@
{
public ExtensionElement unmarshall(Class parentType,
Object parent,
- QName elementQN,
- Element el,
+ QName extType,
+ Element extEl,
DescriptionElement desc,
ExtensionRegistry extReg)
throws WSDLException
@@ -50,18 +50,18 @@
//String requiredStr = DOMUtils.getAttributeNS(el,
// Constants.NS_URI_WSDL20,
// Constants.ATTR_REQUIRED);
- String requiredStr = getAttributeNS(el,
+ String requiredStr = getAttributeNS(extEl,
"http://www.w3.org/2005/08/wsdl",
"required");
- unknownExt.setElementQName(elementQN);
+ unknownExt.setExtensionType(extType);
if (requiredStr != null)
{
unknownExt.setRequired(new Boolean(requiredStr));
}
- unknownExt.setElement(el);
+ unknownExt.setElement(extEl);
return unknownExt;
}
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java Tue Dec 6 11:17:19 2005
@@ -41,7 +41,7 @@
*
* @param elementQN the type
*/
- public void setElementQName(QName elementQN)
+ public void setExtensionType(QName elementQN)
{
this.elementQN = elementQN;
}
@@ -51,7 +51,7 @@
*
* @return the extensibility element's type
*/
- public QName getElementQName()
+ public QName getExtensionType()
{
return elementQN;
}
@@ -69,7 +69,7 @@
* Get whether or not the semantics of this extension
* are required. Relates to the wsdl:required attribute.
*/
- public Boolean getRequired()
+ public Boolean isRequired()
{
return required;
}
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModule.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModule.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModule.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModule.java Tue Dec 6 11:17:19 2005
@@ -17,7 +17,7 @@
import java.net.URI;
-import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.wsdl20.WSDLComponent;
/**
* This interface represents the SOAPModule Component that can appear in the
@@ -30,9 +30,9 @@
{
public URI getRef();
- public Boolean getRequired();
+ public Boolean isRequired();
- public WSDLElement getParent();
+ public WSDLComponent getParent();
public SOAPModuleElement toElement();
}
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModuleElement.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModuleElement.java?rev=354504&r1=354503&r2=354504&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModuleElement.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/extensions/soap/SOAPModuleElement.java Tue Dec 6 11:17:19 2005
@@ -38,9 +38,9 @@
public URI getRef();
- public void setParent(WSDLElement wsdlEl);
+ public void setParentElement(WSDLElement wsdlEl);
- public WSDLElement getParent();
+ public WSDLElement getParentElement();
public void addDocumentationElement(DocumentationElement docEl);
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org