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 2007/08/13 15:41:27 UTC
svn commit: r565350 - in /incubator/woden/trunk/java:
src/org/apache/woden/internal/ src/org/apache/woden/internal/wsdl20/
src/org/apache/woden/wsdl20/xml/ test/org/apache/woden/wsdl20/
test/org/apache/woden/wsdl20/xml/
Author: jkaputin
Date: Mon Aug 13 06:41:25 2007
New Revision: 565350
URL: http://svn.apache.org/viewvc?view=rev&rev=565350
Log:
Removed the setParentElement method from the
Woden API because the addXXXX API methods will
initialize the parent reference when they create
and add the XXXX object. This fix includes making
the setParentElement method impl package private
to the WSDL impl classes and removing redundant
calls to this method.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingOperationImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentationImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/NestedImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ServiceImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLReferenceImpl.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/NestedElement.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultReferenceTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingMessageReferenceTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/EndpointTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/InterfaceTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/ServiceTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultElementTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultReferenceElementTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/DocumentationElementTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/InterfaceElementTest.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=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/BaseWSDLReader.java Mon Aug 13 06:41:25 2007
@@ -690,7 +690,6 @@
throws WSDLException {
InterfaceFaultElement fault = parent.addInterfaceFaultElement();
- fault.setParentElement(parent);
String name = faultEl.getAttributeValue(Constants.ATTR_NAME);
if(name != null)
@@ -745,7 +744,6 @@
throws WSDLException {
InterfaceOperationElement oper = parent.addInterfaceOperationElement();
- oper.setParentElement(parent);
String name = operEl.getAttributeValue(Constants.ATTR_NAME);
if(name != null)
@@ -827,7 +825,6 @@
throws WSDLException {
InterfaceFaultReferenceElement faultRef = parent.addInterfaceFaultReferenceElement();
- faultRef.setParentElement(parent);
if(Constants.ELEM_INFAULT.equals(faultRefEl.getLocalName())) {
faultRef.setDirection(Direction.IN);
@@ -932,7 +929,6 @@
throws WSDLException {
InterfaceMessageReferenceElement message = parent.addInterfaceMessageReferenceElement();
- message.setParentElement(parent);
if(Constants.ELEM_INPUT.equals(msgRefEl.getLocalName())) {
message.setDirection(Direction.IN);
@@ -1097,7 +1093,6 @@
throws WSDLException {
BindingFaultElement fault = parent.addBindingFaultElement();
- fault.setParentElement(parent);
QName intFltQN = null;
String ref = bindFaultEl.getAttributeValue(Constants.ATTR_REF);
@@ -1154,7 +1149,6 @@
throws WSDLException {
BindingOperationElement oper = parent.addBindingOperationElement();
- oper.setParentElement(parent);
QName refQN = null;
String ref = bindOpEl.getAttributeValue(Constants.ATTR_REF);
@@ -1227,7 +1221,6 @@
throws WSDLException {
BindingFaultReferenceElement faultRef = parent.addBindingFaultReferenceElement();
- faultRef.setParentElement(parent);
QName refQN = null;
String ref = faultRefEl.getAttributeValue(Constants.ATTR_REF);
@@ -1334,7 +1327,6 @@
throws WSDLException {
BindingMessageReferenceElement message = parent.addBindingMessageReferenceElement();
- message.setParentElement(parent);
if(Constants.ELEM_INPUT.equals(msgRefEl.getLocalName())) {
message.setDirection(Direction.IN);
@@ -1467,7 +1459,6 @@
throws WSDLException {
EndpointElement endpoint = parent.addEndpointElement();
- endpoint.setParentElement(parent);
String name = endpointEl.getAttributeValue(Constants.ATTR_NAME);
if(name != null)
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingImpl.java Mon Aug 13 06:41:25 2007
@@ -177,7 +177,7 @@
*/
public BindingFaultElement addBindingFaultElement()
{
- BindingFaultElement fault = new BindingFaultImpl();
+ BindingFaultImpl fault = new BindingFaultImpl();
fFaults.add(fault);
fault.setParentElement(this);
return fault;
@@ -198,7 +198,7 @@
*/
public BindingOperationElement addBindingOperationElement()
{
- BindingOperationElement operation = new BindingOperationImpl();
+ BindingOperationImpl operation = new BindingOperationImpl();
fOperations.add(operation);
operation.setParentElement(this);
return operation;
@@ -214,10 +214,10 @@
return array;
}
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.xml.NestedElement#setParentElement(org.apache.woden.wsdl20.xml.WSDL20Element)
+ /*
+ * package private, used only by factory methods in this package
*/
- public void setParentElement(WSDLElement parent) {
+ void setParentElement(WSDLElement parent) {
fParentElem = parent;
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingOperationImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingOperationImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingOperationImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingOperationImpl.java Mon Aug 13 06:41:25 2007
@@ -136,7 +136,7 @@
*/
public BindingMessageReferenceElement addBindingMessageReferenceElement()
{
- BindingMessageReferenceElement msgRef = new BindingMessageReferenceImpl();
+ BindingMessageReferenceImpl msgRef = new BindingMessageReferenceImpl();
fMessageRefs.add(msgRef);
msgRef.setParentElement(this);
return msgRef;
@@ -163,7 +163,7 @@
*/
public BindingFaultReferenceElement addBindingFaultReferenceElement()
{
- BindingFaultReferenceElement faultRef = new BindingFaultReferenceImpl();
+ BindingFaultReferenceImpl faultRef = new BindingFaultReferenceImpl();
fFaultRefs.add(faultRef);
faultRef.setParentElement(this);
return faultRef;
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DescriptionImpl.java Mon Aug 13 06:41:25 2007
@@ -90,7 +90,7 @@
//<description> child elements
private List fImportElements = new Vector();
private List fIncludeElements = new Vector();
- private TypesElement fTypesElement = null;
+ private TypesImpl fTypesElement = null;
private List fInterfaceElements = new Vector();
private List fBindingElements = new Vector();
private List fServiceElements = new Vector();
@@ -485,35 +485,35 @@
//creator methods
public ImportElement addImportElement() {
- ImportElement importEl = new ImportImpl();
+ ImportImpl importEl = new ImportImpl();
fImportElements.add(importEl);
importEl.setParentElement(this);
return importEl;
}
public IncludeElement addIncludeElement() {
- IncludeElement include = new IncludeImpl();
+ IncludeImpl include = new IncludeImpl();
fIncludeElements.add(include);
include.setParentElement(this);
return include;
}
public InterfaceElement addInterfaceElement() {
- InterfaceElement intface = new InterfaceImpl();
+ InterfaceImpl intface = new InterfaceImpl();
fInterfaceElements.add(intface);
intface.setParentElement(this);
return intface;
}
public BindingElement addBindingElement() {
- BindingElement binding = new BindingImpl();
+ BindingImpl binding = new BindingImpl();
fBindingElements.add(binding);
binding.setParentElement(this);
return binding;
}
public ServiceElement addServiceElement() {
- ServiceElement service = new ServiceImpl();
+ ServiceImpl service = new ServiceImpl();
fServiceElements.add(service);
service.setParentElement(this);
return service;
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/DocumentableImpl.java Mon Aug 13 06:41:25 2007
@@ -39,7 +39,7 @@
*/
public DocumentationElement addDocumentationElement()
{
- DocumentationElement docEl = new DocumentationImpl();
+ DocumentationImpl docEl = new DocumentationImpl();
fDocumentationElements.add(docEl);
docEl.setParentElement(this);
return docEl;
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=565350&r1=565349&r2=565350
==============================================================================
--- 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 Mon Aug 13 06:41:25 2007
@@ -53,10 +53,10 @@
return fContent;
}
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.xml.NestedElement#setParentElement(org.apache.woden.wsdl20.xml.WSDL20Element)
+ /*
+ * package private, used only by factory methods in this package
*/
- public void setParentElement(WSDLElement parent) {
+ void setParentElement(WSDLElement parent) {
fParentElem = parent;
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java Mon Aug 13 06:41:25 2007
@@ -367,7 +367,7 @@
*/
public InterfaceFaultElement addInterfaceFaultElement()
{
- InterfaceFaultElement fault = new InterfaceFaultImpl();
+ InterfaceFaultImpl fault = new InterfaceFaultImpl();
fInterfaceFaultElements.add(fault);
fault.setParentElement(this);
return fault;
@@ -412,7 +412,7 @@
*/
public InterfaceOperationElement addInterfaceOperationElement()
{
- InterfaceOperationElement operation = new InterfaceOperationImpl();
+ InterfaceOperationImpl operation = new InterfaceOperationImpl();
fInterfaceOperationElements.add(operation);
operation.setParentElement(this);
return operation;
@@ -452,10 +452,10 @@
return array;
}
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.xml.NestedElement#setParentElement(org.apache.woden.wsdl20.xml.WSDL20Element)
+ /*
+ * package private, used only by factory methods in this package
*/
- public void setParentElement(WSDLElement parent) {
+ void setParentElement(WSDLElement parent) {
fParentElem = parent;
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java Mon Aug 13 06:41:25 2007
@@ -180,7 +180,7 @@
*/
public InterfaceMessageReferenceElement addInterfaceMessageReferenceElement()
{
- InterfaceMessageReferenceElement msgRef = new InterfaceMessageReferenceImpl();
+ InterfaceMessageReferenceImpl msgRef = new InterfaceMessageReferenceImpl();
fMessageRefs.add(msgRef);
msgRef.setParentElement(this);
return msgRef;
@@ -209,7 +209,7 @@
*/
public InterfaceFaultReferenceElement addInterfaceFaultReferenceElement()
{
- InterfaceFaultReferenceElement faultRef = new InterfaceFaultReferenceImpl();
+ InterfaceFaultReferenceImpl faultRef = new InterfaceFaultReferenceImpl();
fFaultRefs.add(faultRef);
faultRef.setParentElement(this);
return faultRef;
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/NestedImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/NestedImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/NestedImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/NestedImpl.java Mon Aug 13 06:41:25 2007
@@ -42,10 +42,10 @@
return (WSDLComponent)fParentElem;
}
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.xml.NestedElement#setParentElement(org.apache.woden.wsdl20.xml.WSDL20Element)
+ /*
+ * package private, used only by factory methods in this package
*/
- public void setParentElement(WSDLElement parent) {
+ void setParentElement(WSDLElement parent) {
fParentElem = parent;
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ServiceImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ServiceImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/ServiceImpl.java Mon Aug 13 06:41:25 2007
@@ -176,7 +176,7 @@
*/
public EndpointElement addEndpointElement()
{
- EndpointElement endpoint = new EndpointImpl();
+ EndpointImpl endpoint = new EndpointImpl();
fEndpoints.add(endpoint);
endpoint.setParentElement(this);
return endpoint;
@@ -191,10 +191,10 @@
return array;
}
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.xml.NestedElement#setParentElement(org.apache.woden.wsdl20.xml.WSDL20Element)
+ /*
+ * package private, used only by factory methods in this package
*/
- public void setParentElement(WSDLElement parent) {
+ void setParentElement(WSDLElement parent) {
fParentElem = parent;
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java Mon Aug 13 06:41:25 2007
@@ -164,10 +164,10 @@
return array;
}
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.xml.NestedElement#setParentElement(org.apache.woden.wsdl20.xml.WSDL20Element)
+ /*
+ * package private, used only by factory methods in this package
*/
- public void setParentElement(WSDLElement parent) {
+ void setParentElement(WSDLElement parent) {
fParentElem = parent;
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLReferenceImpl.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLReferenceImpl.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/WSDLReferenceImpl.java Mon Aug 13 06:41:25 2007
@@ -41,10 +41,10 @@
private DescriptionElement fDescriptionElement = null;
private WSDLElement fParentElem = null;
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.xml.NestedElement#setParentElement(org.apache.woden.wsdl20.xml.WSDL20Element)
+ /*
+ * package private, used only by factory methods in this package
*/
- public void setParentElement(WSDLElement parent) {
+ void setParentElement(WSDLElement parent) {
fParentElem = parent;
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/NestedElement.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/NestedElement.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/NestedElement.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/wsdl20/xml/NestedElement.java Mon Aug 13 06:41:25 2007
@@ -29,8 +29,6 @@
*/
public interface NestedElement extends WSDLElement {
- public void setParentElement(WSDLElement parent);
-
public WSDLElement getParentElement();
}
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultReferenceTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultReferenceTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultReferenceTest.java Mon Aug 13 06:41:25 2007
@@ -89,7 +89,6 @@
InterfaceElement interfaceElement = descriptionElement.addInterfaceElement();
interfaceElement.setName(new NCName("interface1"));
- interfaceElement.setParentElement(bindingElement);
InterfaceFaultElement ife = interfaceElement.addInterfaceFaultElement();
ife.setName(new NCName("Fault1Ref"));
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingFaultTest.java Mon Aug 13 06:41:25 2007
@@ -79,7 +79,6 @@
InterfaceElement interfaceElement = descriptionElement.addInterfaceElement();
interfaceElement.setName(new NCName("interface1"));
- interfaceElement.setParentElement(bindingElement);
InterfaceFaultElement iffElement = interfaceElement.addInterfaceFaultElement();
iffElement.setName(new NCName("fault1"));
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingMessageReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingMessageReferenceTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingMessageReferenceTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/BindingMessageReferenceTest.java Mon Aug 13 06:41:25 2007
@@ -89,7 +89,6 @@
InterfaceElement interfaceElement = descriptionElement.addInterfaceElement();
interfaceElement.setName(new NCName("interface1"));
- interfaceElement.setParentElement(bindingElement);
InterfaceOperationElement ifopElement = interfaceElement.addInterfaceOperationElement();
ifopElement.setName(new NCName("operation1"));
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/EndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/EndpointTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/EndpointTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/EndpointTest.java Mon Aug 13 06:41:25 2007
@@ -124,9 +124,7 @@
// Endpoint...
EndpointElement fEndpointElement = fServiceElement.addEndpointElement();
fEndpointElement.setName(fEndpointNCname);
- fEndpointElement.setParentElement(fServiceElement);
fEndpointElement.setBindingName(fBindingQName);
- fEndpointElement.setParentElement(fServiceElement);
// Component model creation
Description fDesc = fDescElement.toComponent();
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/InterfaceTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/InterfaceTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/InterfaceTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/InterfaceTest.java Mon Aug 13 06:41:25 2007
@@ -107,10 +107,6 @@
fInterfaceElement.addExtendedInterfaceName(new QName("extendedI1"));
fInterfaceElement.addExtendedInterfaceName(new QName("extendedI2"));
- fInterfaceElement.setParentElement(fDescriptionElement);
- xife1.setParentElement(fDescriptionElement);
- xife2.setParentElement(fDescriptionElement);
-
// getExtendedInterfaces()
fDescription = fDescriptionElement.toComponent();
fInterface = fDescription.getInterface(new QName(INTF_NAME));
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/ServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/ServiceTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/ServiceTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/ServiceTest.java Mon Aug 13 06:41:25 2007
@@ -115,7 +115,6 @@
ServiceElement fServiceElement = fDescElement.addServiceElement();
fServiceElement.setName(new NCName("service1"));
fServiceElement.setInterfaceName(new QName("interface1"));
- fServiceElement.setParentElement(fDescElement);
// "create" the component model to complete the woden object hierachy references
Description fDesc = fDescElement.toComponent();
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultElementTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultElementTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultElementTest.java Mon Aug 13 06:41:25 2007
@@ -81,7 +81,6 @@
InterfaceElement interfaceElement = descriptionElement.addInterfaceElement();
interfaceElement.setName(new NCName("interface1"));
- interfaceElement.setParentElement(bindingElement);
InterfaceFaultElement iffElement = interfaceElement.addInterfaceFaultElement();
iffElement.setName(new NCName("fault1"));
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultReferenceElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultReferenceElementTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultReferenceElementTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/BindingFaultReferenceElementTest.java Mon Aug 13 06:41:25 2007
@@ -101,7 +101,6 @@
InterfaceElement interfaceElement = descriptionElement.addInterfaceElement();
interfaceElement.setName(new NCName("interface1"));
- interfaceElement.setParentElement(bindingElement);
InterfaceOperationElement ifopElement = interfaceElement.addInterfaceOperationElement();
ifopElement.setName(new NCName("operation1"));
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=565350&r1=565349&r2=565350
==============================================================================
--- 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 Mon Aug 13 06:41:25 2007
@@ -103,21 +103,14 @@
}
/**
- * Test method for {@link org.apache.woden.internal.wsdl20.DocumentationImpl#setParentElement(org.apache.woden.wsdl20.xml.WSDLElement)}.
* Test method for {@link org.apache.woden.internal.wsdl20.DocumentationImpl#getParentElement()}.
*/
- public void testSetGetParentElement() {
+ public void testGetParentElement() {
DescriptionElement descElem1 = new DescriptionImpl();
DocumentationElement docElem = descElem1.addDocumentationElement();
- //check the initial parent
+ //check the parent
assertEquals(descElem1, docElem.getParentElement());
-
- DescriptionElement descElem2 = new DescriptionImpl();
- docElem.setParentElement(descElem2);
-
- //test that the parent has been changed by the set method
- assertEquals(descElem2, docElem.getParentElement());
}
}
Modified: incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/InterfaceElementTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/InterfaceElementTest.java?view=diff&rev=565350&r1=565349&r2=565350
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/InterfaceElementTest.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/InterfaceElementTest.java Mon Aug 13 06:41:25 2007
@@ -103,10 +103,6 @@
fInterfaceElement.addExtendedInterfaceName(new QName("extendedIE1"));
fInterfaceElement.addExtendedInterfaceName(new QName("extendedIE2"));
- fInterfaceElement.setParentElement(fDescriptionElement);
- xife1.setParentElement(fDescriptionElement);
- xife2.setParentElement(fDescriptionElement);
-
// getExtendedInterfaceElements()
ifeArray = fInterfaceElement.getExtendedInterfaceElements();
assertEquals("Incorrect number of retrieved Extended InterfaceElements -", 2, ifeArray.length);
@@ -139,11 +135,6 @@
InterfaceElement xife2 = fDescriptionElement.addInterfaceElement();
xife1.setName(new NCName("extendedIE1"));
xife2.setName(new NCName("extendedIE2"));
-
- // associate them all with the parent Description
- fInterfaceElement.setParentElement(fDescriptionElement);
- xife1.setParentElement(fDescriptionElement);
- xife2.setParentElement(fDescriptionElement);
// addExtendedInterfaceName()
QName xifeQname1 = new QName("extendedIE1");
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org