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/10/29 03:11:18 UTC
svn commit: r329338 - in /incubator/woden/java/src/org/apache/woden:
internal/wsdl20/DescriptionElementImpl.java
wsdl20/xml/DescriptionElement.java
Author: jkaputin
Date: Fri Oct 28 18:11:09 2005
New Revision: 329338
URL: http://svn.apache.org/viewcvs?rev=329338&view=rev
Log:
Renamed some methods to confirm to rest of Element
interfaces and provided remaining method implementations.
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.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=329338&r1=329337&r2=329338&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 Fri Oct 28 18:11:09 2005
@@ -56,12 +56,18 @@
private URI fDocumentBaseURI = null;
+ //attributes
private URI fTargetNamespace = null;
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;
private List fInterfaceElements = new Vector();
+ private List fBindingElements = new Vector();
+ private List fServiceElements = new Vector();
/*
* Cache the WSDL component model here, but flush it if any
@@ -96,31 +102,23 @@
public void addNamespace(String prefix, URI namespace)
{
- //ignores duplicate prefixes in the WSDL - earlier namespace gets overwritten.
-
String pfx = (prefix != null) ? prefix : "";
-
- if (namespace != null)
- {
+ if (namespace != null) {
fNamespaces.put(pfx,namespace);
- } else
- {
+ } else {
removeNamespace(pfx);
}
}
- //TODO - consider the convention where removeXXX returns the removed object
- public void removeNamespace(String prefix) {
-
+ public void removeNamespace(String prefix)
+ {
String pfx = (prefix != null) ? prefix : "";
-
fNamespaces.remove(pfx);
}
public URI getNamespace(String prefix)
{
String pfx = (prefix != null) ? prefix : "";
-
return (URI) fNamespaces.get(pfx);
}
@@ -135,24 +133,26 @@
public void addImportElement(ImportElement importEl)
{
- //TODO
+ fImportElements.add(importEl);
}
- public ImportElement[] getImports()
+ public ImportElement[] getImportElements()
{
- //TODO
- return null;
+ ImportElement[] array = new ImportElement[fImportElements.size()];
+ fImportElements.toArray(array);
+ return array;
}
public void addIncludeElement(IncludeElement include)
{
- //TODO
+ fIncludeElements.add(include);
}
- public IncludeElement[] getIncludes()
+ public IncludeElement[] getIncludeElements()
{
- //TODO
- return null;
+ IncludeElement[] array = new IncludeElement[fIncludeElements.size()];
+ fIncludeElements.toArray(array);
+ return array;
}
public void setTypesElement(TypesElement typesEl)
@@ -165,36 +165,40 @@
return fTypesElement;
}
- public void addInterfaceElement(InterfaceElement interfaceEl)
+ public void addInterfaceElement(InterfaceElement intface)
{
- fInterfaceElements.add(interfaceEl);
+ fInterfaceElements.add(intface);
}
- public InterfaceElement[] getInterfaces()
+ public InterfaceElement[] getInterfaceElements()
{
- return (InterfaceElement[])fInterfaceElements.toArray();
+ InterfaceElement[] array = new InterfaceElement[fInterfaceElements.size()];
+ fInterfaceElements.toArray(array);
+ return array;
}
public void addBindingElement(BindingElement binding)
{
- //TODO
+ fBindingElements.add(binding);
}
- public BindingElement[] getBindings()
+ public BindingElement[] getBindingElements()
{
- //TODO
- return null;
+ BindingElement[] array = new BindingElement[fBindingElements.size()];
+ fBindingElements.toArray(array);
+ return array;
}
public void addServiceElement(ServiceElement service)
{
- //TODO
+ fServiceElements.add(service);
}
- public ServiceElement[] getServices()
+ public ServiceElement[] getServiceElements()
{
- //TODO
- return null;
+ ServiceElement[] array = new ServiceElement[fServiceElements.size()];
+ fServiceElements.toArray(array);
+ return array;
}
/*
Modified: incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
URL: http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java?rev=329338&r1=329337&r2=329338&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java (original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java Fri Oct 28 18:11:09 2005
@@ -35,13 +35,12 @@
public interface DescriptionElement extends DocumentableElement
{
- /*
- * Attributes and namespaces
- */
-
public void setDocumentBaseURI(URI documentBaseURI);
public URI getDocumentBaseURI();
+ /*
+ * Attributes and namespaces
+ */
public void setTargetNamespace(URI namespaceURI);
public URI getTargetNamespace();
@@ -98,29 +97,29 @@
/*
- * Element accessor methods
+ * Element accessor and modifier methods
*
- * TODO removeXXX, getXXX methods for the elements with an addXXX method
+ * TODO removeXXX(obj), getXXX(key) methods
*
*/
public void addImportElement(ImportElement importEl);
- public ImportElement[] getImports();
+ public ImportElement[] getImportElements();
public void addIncludeElement(IncludeElement includeEl);
- public IncludeElement[] getIncludes();
+ public IncludeElement[] getIncludeElements();
public void setTypesElement(TypesElement typesEl);
public TypesElement getTypesElement();
public void addInterfaceElement(InterfaceElement interfaceEl);
- public InterfaceElement[] getInterfaces();
+ public InterfaceElement[] getInterfaceElements();
public void addBindingElement(BindingElement bindingEl);
- public BindingElement[] getBindings();
+ public BindingElement[] getBindingElements();
public void addServiceElement(ServiceElement serviceEl);
- public ServiceElement[] getServices();
+ public ServiceElement[] getServiceElements();
//TODO extension elements
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org