Author: jkaputin
Date: Tue Nov 1 02:44:08 2005
New Revision: 330022
URL: http://svn.apache.org/viewcvs?rev=330022&view=rev
Log:
Refactored support for documentation, properties and
features into the new DocumentableImpl and
ConfigurableImpl abstract classes. Each class now extends
one of these two abstract classes and the
related variables and methods have been removed.
This was done to eliminate the copying and pasting of
common code across the implementation.
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceOperationImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
Tue Nov 1 02:44:08 2005
@@ -52,7 +52,9 @@
*
* @author [EMAIL PROTECTED]
*/
-public class DescriptionElementImpl implements DescriptionElement {
+public class DescriptionElementImpl extends DocumentableImpl
+ implements DescriptionElement
+{
private URI fDocumentBaseURI = null;
@@ -61,7 +63,6 @@
private Map fNamespaces = new HashMap();
//elements
- private List fDocumentationElements = new Vector();
private List fImportElements = new Vector();
private List fIncludeElements = new Vector();
private TypesElement fTypesElement = null;
@@ -201,24 +202,6 @@
return array;
}
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl)
- {
- fDocumentationElements.add(docEl);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- DocumentationElement[] array = new
DocumentationElement[fDocumentationElements.size()];
- fDocumentationElements.toArray(array);
- return array;
- }
-
/* ************************************
* Element creator methods.
* ************************************/
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/FeatureImpl.java
Tue Nov 1 02:44:08 2005
@@ -16,12 +16,9 @@
package org.apache.woden.internal.wsdl20;
import java.net.URI;
-import java.util.List;
-import java.util.Vector;
import org.apache.woden.wsdl20.Component;
import org.apache.woden.wsdl20.Feature;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.FeatureElement;
/**
@@ -30,11 +27,11 @@
*
* @author [EMAIL PROTECTED]
*/
-public class FeatureImpl implements Feature, FeatureElement {
-
+public class FeatureImpl extends DocumentableImpl
+ implements Feature, FeatureElement
+{
private URI fRef = null;
private boolean fRequired = false;
- private List fDocumentationElements = new Vector();
/*
* @see org.apache.woden.wsdl20.xml.FeatureElement#setRef(URI)
@@ -76,22 +73,6 @@
public Component getParent()
{
return null;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl)
- {
- fDocumentationElements.add(docEl);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- return (DocumentationElement[])fDocumentationElements.toArray();
}
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultImpl.java
Tue Nov 1 02:44:08 2005
@@ -15,20 +15,12 @@
*/
package org.apache.woden.internal.wsdl20;
-import java.util.List;
-import java.util.Vector;
-
import javax.xml.namespace.QName;
import org.apache.woden.wsdl20.Component;
import org.apache.woden.wsdl20.ElementDeclaration;
-import org.apache.woden.wsdl20.Feature;
import org.apache.woden.wsdl20.InterfaceFault;
-import org.apache.woden.wsdl20.Property;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
-import org.apache.woden.wsdl20.xml.FeatureElement;
import org.apache.woden.wsdl20.xml.InterfaceFaultElement;
-import org.apache.woden.wsdl20.xml.PropertyElement;
/**
* This class represents the InterfaceFault component from the WSDL 2.0
Component
@@ -36,21 +28,17 @@
*
* @author [EMAIL PROTECTED]
*/
-public class InterfaceFaultImpl implements InterfaceFault,
+public class InterfaceFaultImpl extends ConfigurableImpl
+ implements InterfaceFault,
InterfaceFaultElement
{
//WSDL Component model data
private QName fName = null;
private ElementDeclaration fElementDeclaration = null;
- private List fFeatures = new Vector();
- private List fProperties = new Vector();
private Component fParent = null;
//XML Element model data
private QName fElement = null;
- private List fDocumentationElements = new Vector();
- private List fFeatureElements = new Vector();
- private List fPropertyElements = new Vector();
/* ************************************************************
* InterfaceMessageReference methods (i.e. WSDL Component model)
@@ -74,26 +62,6 @@
}
/*
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getFeatures()
- */
- public Feature[] getFeatures()
- {
- Feature[] array = new Feature[fFeatures.size()];
- fFeatures.toArray(array);
- return array;
- }
-
- /*
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getProperties()
- */
- public Property[] getProperties()
- {
- Property[] array = new Property[fProperties.size()];
- fProperties.toArray(array);
- return array;
- }
-
- /*
* @see org.apache.woden.wsdl20.NestedComponent#getParent()
*/
public Component getParent()
@@ -136,60 +104,6 @@
public QName getElement()
{
return fElement;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl)
- {
- fDocumentationElements.add(docEl);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- DocumentationElement[] array = new
DocumentationElement[fDocumentationElements.size()];
- fDocumentationElements.toArray(array);
- return array;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addFeatureElement(org.apache.woden.wsdl20.xml.FeatureElement)
- */
- public void addFeatureElement(FeatureElement feature)
- {
- fFeatureElements.add(feature);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getFeatureElements()
- */
- public FeatureElement[] getFeatureElements()
- {
- FeatureElement[] array = new FeatureElement[fFeatureElements.size()];
- fFeatureElements.toArray(array);
- return array;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addPropertyElement(org.apache.woden.wsdl20.xml.PropertyElement)
- */
- public void addPropertyElement(PropertyElement property)
- {
- fPropertyElements.add(property);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getPropertyElements()
- */
- public PropertyElement[] getPropertyElements()
- {
- PropertyElement[] array = new
PropertyElement[fPropertyElements.size()];
- fPropertyElements.toArray(array);
- return array;
}
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
Tue Nov 1 02:44:08 2005
@@ -18,14 +18,9 @@
import javax.xml.namespace.QName;
import org.apache.woden.wsdl20.Component;
-import org.apache.woden.wsdl20.Feature;
import org.apache.woden.wsdl20.InterfaceFault;
import org.apache.woden.wsdl20.InterfaceFaultReference;
-import org.apache.woden.wsdl20.Property;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.FaultReferenceElement;
-import org.apache.woden.wsdl20.xml.FeatureElement;
-import org.apache.woden.wsdl20.xml.PropertyElement;
/**
* This class represents the <infault> and <outfault>
@@ -33,7 +28,8 @@
*
* @author [EMAIL PROTECTED]
*/
-public class InterfaceFaultReferenceImpl implements InterfaceFaultReference,
+public class InterfaceFaultReferenceImpl extends ConfigurableImpl
+ implements InterfaceFaultReference,
FaultReferenceElement
{
@@ -90,70 +86,6 @@
* @see org.apache.woden.wsdl20.NestedComponent#getParent()
*/
public Component getParent() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getFeatures()
- */
- public Feature[] getFeatures() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getProperties()
- */
- public Property[] getProperties() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(org.apache.woden.wsdl20.xml.DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addFeatureElement(org.apache.woden.wsdl20.xml.FeatureElement)
- */
- public void addFeatureElement(FeatureElement feature) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getFeatureElements()
- */
- public FeatureElement[] getFeatureElements() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addPropertyElement(org.apache.woden.wsdl20.xml.PropertyElement)
- */
- public void addPropertyElement(PropertyElement property) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getPropertyElements()
- */
- public PropertyElement[] getPropertyElements() {
// TODO Auto-generated method stub
return null;
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
Tue Nov 1 02:44:08 2005
@@ -21,17 +21,12 @@
import javax.xml.namespace.QName;
-import org.apache.woden.wsdl20.Feature;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.InterfaceFault;
import org.apache.woden.wsdl20.InterfaceOperation;
-import org.apache.woden.wsdl20.Property;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
-import org.apache.woden.wsdl20.xml.FeatureElement;
import org.apache.woden.wsdl20.xml.InterfaceElement;
import org.apache.woden.wsdl20.xml.InterfaceFaultElement;
import org.apache.woden.wsdl20.xml.InterfaceOperationElement;
-import org.apache.woden.wsdl20.xml.PropertyElement;
/**
* This class represents the Interface component from the
@@ -39,36 +34,20 @@
*
* @author [EMAIL PROTECTED]
*/
-public class InterfaceImpl implements Interface, InterfaceElement
+public class InterfaceImpl extends ConfigurableImpl
+ implements Interface, InterfaceElement
{
- /*
- * Interface Element data.
- */
+ //WSDL Component model data
+ private List fExtendedInterfaces = new Vector();
+ private List fInterfaceFaults = new Vector();
+ private List fInterfaceOperations = new Vector();
+
+ //XML Element model data
private QName fName = null;
private List fExtendsQNames = new Vector();
private List fStyleDefault = new Vector();
-
- private List fDocumentationElements = new Vector();
private List fInterfaceFaultElements = new Vector();
private List fInterfaceOperationElements = new Vector();
- private List fFeatureElements = new Vector();
- private List fPropertyElements = new Vector();
-
- /*
- * Interface Component data.
- *
- * These lists represent the properties of the Interface Component,
- * cached here to make the 'Interface' methods efficient.
- * These properties are exposed on the API as typed arrays,
- * but are implemented as Lists for convenience.
- *
- * TODO clear cached component data if xml model is modified
- */
- private List fExtendedInterfaces = new Vector();
- private List fInterfaceFaults = new Vector();
- private List fInterfaceOperations = new Vector();
- private List fFeatures = new Vector();
- private List fProperties = new Vector();
/*
* @see org.apache.woden.wsdl20.xml.InterfaceElement#setName(QName)
@@ -173,70 +152,6 @@
public InterfaceOperation[] getInterfaceOperations()
{
return (InterfaceOperation[])fInterfaceOperations.toArray();
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl)
- {
- fDocumentationElements.add(docEl);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- return (DocumentationElement[])fDocumentationElements.toArray();
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addFeatureElement(FeatureElement)
- */
- public void addFeatureElement(FeatureElement feature)
- {
- fFeatureElements.add(feature);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getFeatureElements()
- */
- public FeatureElement[] getFeatureElements()
- {
- return (FeatureElement[])fFeatureElements.toArray();
- }
-
- /*
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getFeatures()
- */
- public Feature[] getFeatures()
- {
- return (Feature[])fFeatures.toArray();
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addPropertyElement(PropertyElement)
- */
- public void addPropertyElement(PropertyElement property)
- {
- fPropertyElements.add(property);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getPropertyElements()
- */
- public PropertyElement[] getPropertyElements()
- {
- return (PropertyElement[])fPropertyElements.toArray();
- }
-
- /*
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getProperties()
- */
- public Property[] getProperties()
- {
- return (Property[])fProperties.toArray();
}
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
---
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
(original)
+++
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceMessageReferenceImpl.java
Tue Nov 1 02:44:08 2005
@@ -15,21 +15,13 @@
*/
package org.apache.woden.internal.wsdl20;
-import java.util.List;
-import java.util.Vector;
-
import javax.xml.namespace.QName;
import org.apache.woden.wsdl20.Component;
import org.apache.woden.wsdl20.ElementDeclaration;
-import org.apache.woden.wsdl20.Feature;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.InterfaceMessageReference;
-import org.apache.woden.wsdl20.Property;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
-import org.apache.woden.wsdl20.xml.FeatureElement;
import org.apache.woden.wsdl20.xml.InterfaceMessageReferenceElement;
-import org.apache.woden.wsdl20.xml.PropertyElement;
/**
* This class represents the <input> and <output>
@@ -37,24 +29,19 @@
*
* @author [EMAIL PROTECTED]
*/
-public class InterfaceMessageReferenceImpl implements
- InterfaceMessageReference,
- InterfaceMessageReferenceElement
+public class InterfaceMessageReferenceImpl extends ConfigurableImpl
+ implements InterfaceMessageReference,
+ InterfaceMessageReferenceElement
{
//WSDL Component model data
private String fMessageLabel = null; //TODO check String correct, not URI
private String fDirection = null;
private String fMessageContentModel = null;
private ElementDeclaration fElementDeclaration = null;
- private List fFeatures = new Vector();
- private List fProperties = new Vector();
private Interface fParent = null;
//XML Element model data
private QName fElement = null;
- private List fFeatureElements = new Vector();
- private List fPropertyElements = new Vector();
- private List fDocumentationElements = new Vector();
/* ************************************************************
* InterfaceMessageReference methods (the WSDL Component model)
@@ -90,26 +77,6 @@
}
/* (non-Javadoc)
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getFeatures()
- */
- public Feature[] getFeatures()
- {
- Feature[] array = new Feature[fFeatures.size()];
- fFeatures.toArray(array);
- return array;
- }
-
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getProperties()
- */
- public Property[] getProperties()
- {
- Property[] array = new Property[fProperties.size()];
- fProperties.toArray(array);
- return array;
- }
-
- /* (non-Javadoc)
* @see org.apache.woden.wsdl20.NestedComponent#getParent()
*/
public Component getParent()
@@ -140,57 +107,6 @@
*/
public QName getElement() {
return fElement;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(org.apache.woden.wsdl20.xml.DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl) {
- fDocumentationElements.add(docEl);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- DocumentationElement[] array = new
DocumentationElement[fDocumentationElements.size()];
- fDocumentationElements.toArray(array);
- return array;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addFeatureElement(org.apache.woden.wsdl20.xml.FeatureElement)
- */
- public void addFeatureElement(FeatureElement feature) {
- fFeatureElements.add(feature);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getFeatureElements()
- */
- public FeatureElement[] getFeatureElements()
- {
- FeatureElement[] array = new FeatureElement[fFeatureElements.size()];
- fFeatureElements.toArray(array);
- return array;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addPropertyElement(org.apache.woden.wsdl20.xml.PropertyElement)
- */
- public void addPropertyElement(PropertyElement property) {
- fPropertyElements.add(property);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getPropertyElements()
- */
- public PropertyElement[] getPropertyElements()
- {
- PropertyElement[] array = new
PropertyElement[fPropertyElements.size()];
- fPropertyElements.toArray(array);
- return array;
}
}
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=330022&r1=330021&r2=330022&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
Tue Nov 1 02:44:08 2005
@@ -22,18 +22,13 @@
import javax.xml.namespace.QName;
import org.apache.woden.wsdl20.Component;
-import org.apache.woden.wsdl20.Feature;
import org.apache.woden.wsdl20.Interface;
import org.apache.woden.wsdl20.InterfaceFaultReference;
import org.apache.woden.wsdl20.InterfaceMessageReference;
import org.apache.woden.wsdl20.InterfaceOperation;
-import org.apache.woden.wsdl20.Property;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.FaultReferenceElement;
-import org.apache.woden.wsdl20.xml.FeatureElement;
import org.apache.woden.wsdl20.xml.InterfaceMessageReferenceElement;
import org.apache.woden.wsdl20.xml.InterfaceOperationElement;
-import org.apache.woden.wsdl20.xml.PropertyElement;
/**
* This class represents the InterfaceOperation component from the WSDL 2.0
Component
@@ -41,7 +36,8 @@
*
* @author [EMAIL PROTECTED]
*/
-public class InterfaceOperationImpl implements InterfaceOperation,
+public class InterfaceOperationImpl extends ConfigurableImpl
+ implements InterfaceOperation,
InterfaceOperationElement
{
//Component data
@@ -50,8 +46,6 @@
private List fInterfaceMessageRefs = new Vector();
private List fInterfaceFaultRefs = new Vector();
private List fStyle = new Vector();
- private List fFeatures = new Vector();
- private List fProperties = new Vector();
private Interface fParent = null;
//XML data
@@ -59,9 +53,6 @@
private List fOutputs = new Vector();
private List fInfaults = new Vector();
private List fOutfaults = new Vector();
- private List fFeatureElements = new Vector();
- private List fPropertyElements = new Vector();
- private List fDocumentationElements = new Vector();
/* ************************************************************
@@ -124,26 +115,6 @@
return fParent;
}
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getFeatures()
- */
- public Feature[] getFeatures()
- {
- Feature[] array = new Feature[fFeatures.size()];
- fFeatures.toArray(array);
- return array;
- }
-
- /* (non-Javadoc)
- * @see org.apache.woden.wsdl20.ConfigurableComponent#getProperties()
- */
- public Property[] getProperties()
- {
- Property[] array = new Property[fProperties.size()];
- fProperties.toArray(array);
- return array;
- }
-
/* ************************************************************
* InterfaceOperationElement methods (the XML model)
* ************************************************************/
@@ -292,60 +263,4 @@
return array;
}
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addFeatureElement(org.apache.woden.wsdl20.xml.FeatureElement)
- */
- public void addFeatureElement(FeatureElement feature)
- {
- fFeatureElements.add(feature);
-
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getFeatureElements()
- */
- public FeatureElement[] getFeatureElements()
- {
- FeatureElement[] array = new FeatureElement[fFeatureElements.size()];
- fFeatureElements.toArray(array);
- return array;
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#addPropertyElement(org.apache.woden.wsdl20.xml.PropertyElement)
- */
- public void addPropertyElement(PropertyElement property)
- {
- fPropertyElements.add(property);
-
- }
-
- /* (non-Javadoc)
- * @see
org.apache.woden.wsdl20.xml.ConfigurableElement#getPropertyElements()
- */
- public PropertyElement[] getPropertyElements()
- {
- PropertyElement[] array = new
PropertyElement[fPropertyElements.size()];
- fPropertyElements.toArray(array);
- return array;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl)
- {
- fDocumentationElements.add(docEl);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- DocumentationElement[] array = new
DocumentationElement[fDocumentationElements.size()];
- fDocumentationElements.toArray(array);
- return array;
- }
-
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/PropertyImpl.java
Tue Nov 1 02:44:08 2005
@@ -16,15 +16,12 @@
package org.apache.woden.internal.wsdl20;
import java.net.URI;
-import java.util.List;
-import java.util.Vector;
import javax.xml.namespace.QName;
import org.apache.woden.wsdl20.Component;
import org.apache.woden.wsdl20.Property;
import org.apache.woden.wsdl20.TypeDefinition;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.PropertyElement;
/**
@@ -33,10 +30,10 @@
*
* @author [EMAIL PROTECTED]
*/
-public class PropertyImpl implements Property, PropertyElement {
-
+public class PropertyImpl extends DocumentableImpl
+ implements Property, PropertyElement
+{
private URI fRef = null;
- private List fDocumentationElements = new Vector();
private Object fValue = null; //TODO decide how to handle value contents
private QName fConstraint = null;
@@ -130,22 +127,6 @@
public Component getParent() {
// TODO Auto-generated method stub
return null;
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl)
- {
- fDocumentationElements.add(docEl);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- return (DocumentationElement[])fDocumentationElements.toArray();
}
}
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java?rev=330022&r1=330021&r2=330022&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
(original)
+++ incubator/woden/java/src/org/apache/woden/internal/wsdl20/TypesImpl.java
Tue Nov 1 02:44:08 2005
@@ -23,7 +23,6 @@
import org.apache.woden.schema.Schema;
import org.apache.woden.schema.SchemaImport;
-import org.apache.woden.wsdl20.xml.DocumentationElement;
import org.apache.woden.wsdl20.xml.TypesElement;
/**
@@ -40,9 +39,9 @@
*
* @author [EMAIL PROTECTED]
*/
-public class TypesImpl implements TypesElement {
-
- private List fDocumentationElements = new Vector();
+public class TypesImpl extends DocumentableImpl
+ implements TypesElement
+{
private String fTypeSystem;
private Map fSchemaImports = new HashMap();
private Map fSchemas = new HashMap();
@@ -187,20 +186,4 @@
fSchemas = schemas;
}
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#addDocumentationElement(DocumentationElement)
- */
- public void addDocumentationElement(DocumentationElement docEl)
- {
- fDocumentationElements.add(docEl);
- }
-
- /*
- * @see
org.apache.woden.wsdl20.xml.DocumentableElement#getDocumentationElements()
- */
- public DocumentationElement[] getDocumentationElements()
- {
- return (DocumentationElement[])fDocumentationElements.toArray();
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
