Author: jkaputin
Date: Sun Aug 12 16:54:32 2007
New Revision: 565209
URL: http://svn.apache.org/viewvc?view=rev&rev=565209
Log:
WODEN-142
DocumentationElement represents wsdl:documentation
element as XMLElement instead of java.lang.Object.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/DocumentationElement.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/DocumentationElementTest.java
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java?view=diff&rev=565209&r1=565208&r2=565209
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java
Sun Aug 12 16:54:32 2007
@@ -461,7 +461,7 @@
DocumentationElement documentation = parent.addDocumentationElement();
//TODO store docEl as below, or just extract any text?
- documentation.setContent(docEl.getSource());
+ documentation.setContent(docEl);
//Now parse any extensibility attributes or elements
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java?view=diff&rev=565209&r1=565208&r2=565209
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java
Sun Aug 12 16:54:32 2007
@@ -18,6 +18,7 @@
import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.WSDLElement;
+import org.apache.woden.XMLElement;
/**
* This class implements support for parsing, creating and manipulating a
@@ -35,20 +36,20 @@
*/
public class DocumentationImpl extends WSDLElementImpl implements
DocumentationElement
{
- private Object fContent;
+ private XMLElement fContent;
private WSDLElement fParentElem = null;
/* (non-Javadoc)
* @see
org.apache.woden.wsdl20.xml.DocumentationElement#setContentModel(java.lang.Object)
*/
- public void setContent(Object docEl) {
+ public void setContent(XMLElement docEl) {
fContent = docEl;
}
/* (non-Javadoc)
* @see org.apache.woden.wsdl20.xml.DocumentationElement#getContentModel()
*/
- public Object getContent() {
+ public XMLElement getContent() {
return fContent;
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/DocumentationElement.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/DocumentationElement.java?view=diff&rev=565209&r1=565208&r2=565209
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/DocumentationElement.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/DocumentationElement.java
Sun Aug 12 16:54:32 2007
@@ -23,19 +23,25 @@
* interface does not define methods that interpret that content. Instead it
just wraps
* the <documentation> element as a java.lang.Object.
* <p>
- * TODO Should use XMLElement as the wrapper type, but also consider if/how to
represent mixed type.
*
* @author John Kaputin ([EMAIL PROTECTED])
*/
+
+import org.apache.woden.XMLElement;
+
public interface DocumentationElement extends NestedElement {
/**
- * @deprecated In M7, to be replaced in M8. See JIRA WODEN-142.
+ * Sets the documentationElement XMLElement for this DocumentationElement.
+ *
+ * @param documentationElement A XMLElement representing the
DocumentationElement xml element.
*/
- public void setContent(Object docEl);
+ public void setContent(XMLElement documentationElement);
/**
- * @deprecated In M7, to be replaced in M8. See JIRA WODEN-142.
+ * Returns a XMLElement representing the DocumentationElement xml element.
+ *
+ * @return XMLElement the xml representation of the DocumentationElement.
*/
- public Object getContent();
+ public XMLElement getContent();
}
Modified:
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/DocumentationElementTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/DocumentationElementTest.java?view=diff&rev=565209&r1=565208&r2=565209
==============================================================================
---
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/DocumentationElementTest.java
(original)
+++
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/DocumentationElementTest.java
Sun Aug 12 16:54:32 2007
@@ -16,11 +16,17 @@
*/
package org.apache.woden.wsdl20.xml;
+import java.net.URI;
+
+import javax.xml.namespace.QName;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.woden.internal.wsdl20.DescriptionImpl;
+import org.apache.woden.WSDLException;
+import org.apache.woden.XMLElement;
/**
* Unit tests for DocumentationImpl class.
@@ -34,7 +40,50 @@
{
return new TestSuite(DocumentationElementTest.class);
}
-
+
+ /**
+ * This is a Bare minimum test XMLElement to test the DocumentationElement.
+ */
+ private class TestXMLElement implements XMLElement {
+ public String getAttributeValue(String attrName) {
+ return null;
+ }
+
+ public XMLElement[] getChildElements() {
+ return null;
+ }
+
+ public XMLElement getFirstChildElement() {
+ return null;
+ }
+
+ public String getLocalName() {
+ return null;
+ }
+
+ public URI getNamespaceURI() throws WSDLException {
+ return null;
+ }
+
+ public XMLElement getNextSiblingElement() {
+ return null;
+ }
+
+ public QName getQName() {
+ return null;
+ }
+
+ public QName getQName(String prefixedValue) throws WSDLException {
+ return null;
+ }
+
+ public Object getSource() {
+ return null;
+ }
+
+ public void setSource(Object elem) {
+ }
+ }
/**
* Test method for [EMAIL PROTECTED]
org.apache.woden.internal.wsdl20.DocumentationImpl#setContent(java.lang.Object)}.
@@ -48,8 +97,9 @@
assertNull(docElem.getContent());
//test the setter and getter methods for doc elem content
- docElem.setContent("Doc content");
- assertEquals("Doc content", docElem.getContent());
+ XMLElement xmlel = new TestXMLElement();
+ docElem.setContent(xmlel);
+ assertEquals(xmlel, docElem.getContent());
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
