Author: jkaputin
Date: Sun Oct 2 06:40:12 2005
New Revision: 293113
URL: http://svn.apache.org/viewcvs?rev=293113&view=rev
Log:
work in progress on Interface parsing.
Modified:
incubator/woden/java/src/org/apache/woden/internal/wsdl20/DescriptionElementImpl.java
incubator/woden/java/src/org/apache/woden/internal/wsdl20/InterfaceImpl.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/DescriptionElement.java
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.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=293113&r1=293112&r2=293113&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
Sun Oct 2 06:40:12 2005
@@ -15,6 +15,7 @@
*/
package org.apache.woden.internal.wsdl20;
+import java.util.List;
import java.util.Map;
import org.apache.woden.internal.util.ComponentModelBuilder;
@@ -22,11 +23,11 @@
import org.apache.woden.wsdl20.xml.BindingElement;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.apache.woden.wsdl20.xml.DocumentationElement;
-import org.apache.woden.wsdl20.xml.InterfaceFaultElement;
import org.apache.woden.wsdl20.xml.FeatureElement;
import org.apache.woden.wsdl20.xml.ImportElement;
import org.apache.woden.wsdl20.xml.IncludeElement;
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;
import org.apache.woden.wsdl20.xml.ServiceElement;
@@ -49,10 +50,14 @@
public class DescriptionElementImpl implements DescriptionElement {
private String fDocumentBaseURI;
- private DocumentationElement fDocumentationElement;
+
+
private String fTargetNamespace;
private Map fNamespaces;
+
+ private DocumentationElement fDocumentationElement;
private TypesElement fTypesElement;
+ private List fInterfaceElements;
/*
* Cache the WSDL component model here, but flush it if any
@@ -61,9 +66,9 @@
*/
private Description fDescriptionComponent;
- /*
+ /* *******************************************
* Attribute accessor and modifier methods
- */
+ * *******************************************/
public void setDocumentBaseURI(String documentBaseURI)
{
@@ -117,9 +122,9 @@
return fNamespaces;
}
- /*
+ /* ******************************************
* Element accessor and modifier methods.
- */
+ * ******************************************/
public void setDocumentationElement(DocumentationElement docEl)
{
@@ -142,7 +147,7 @@
return null;
}
- public void addIncludeElement(IncludeElement includeEl)
+ public void addIncludeElement(IncludeElement include)
{
//TODO
}
@@ -165,21 +170,15 @@
public void addInterfaceElement(InterfaceElement interfaceEl)
{
- //TODO
+ fInterfaceElements.add(interfaceEl);
}
public InterfaceElement[] getInterfaces()
{
- //TODO
- return null;
- }
-
- public void setInterfaces(InterfaceElement[] interfaces)
- {
- //TODO
+ return (InterfaceElement[])fInterfaceElements.toArray();
}
- public void addBindingElement(BindingElement bindingEl)
+ public void addBindingElement(BindingElement binding)
{
//TODO
}
@@ -190,7 +189,7 @@
return null;
}
- public void addServiceElement(ServiceElement serviceEl)
+ public void addServiceElement(ServiceElement service)
{
//TODO
}
@@ -201,9 +200,9 @@
return null;
}
- /*
+ /* ************************************
* Element creator methods.
- */
+ * ************************************/
public DocumentationElement createDocumentationElement()
{
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=293113&r1=293112&r2=293113&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
Sun Oct 2 06:40:12 2005
@@ -47,7 +47,7 @@
private List fExtendsQNames = new Vector();
private List fStyleDefaults = new Vector();
- private DocumentationElement fDocumentation = null;
+ private DocumentationElement fDocumentationElement = null;
private List fInterfaceFaultElements = new Vector();
private List fInterfaceOperationElements = new Vector();
private List fFeatureElements = new Vector();
@@ -75,7 +75,7 @@
*/
public void setDocumentationElement(DocumentationElement documentation)
{
- fDocumentation = documentation;
+ fDocumentationElement = documentation;
}
/*
@@ -83,7 +83,7 @@
*/
public DocumentationElement getDocumentationElement()
{
- return fDocumentation;
+ return fDocumentationElement;
}
/*
@@ -146,7 +146,7 @@
/*
* @see
org.apache.woden.wsdl20.xml.InterfaceElement#addFaultElement(FaultElement)
*/
- public void addFaultElement(InterfaceFaultElement fault)
+ public void addInterfaceFaultElement(InterfaceFaultElement fault)
{
fInterfaceFaultElements.add(fault);
}
@@ -154,7 +154,7 @@
/*
* @see org.apache.woden.wsdl20.xml.InterfaceElement#getFaultElements()
*/
- public InterfaceFaultElement[] getFaultElements()
+ public InterfaceFaultElement[] getInterfaceFaultElements()
{
return (InterfaceFaultElement[])fInterfaceFaultElements.toArray();
}
@@ -170,7 +170,7 @@
/*
* @see
org.apache.woden.wsdl20.xml.InterfaceElement#addOperationElement(OperationElement)
*/
- public void addOperationElement(InterfaceOperationElement operation)
+ public void addInterfaceOperationElement(InterfaceOperationElement
operation)
{
fInterfaceOperationElements.add(operation);
}
@@ -178,7 +178,7 @@
/*
* @see org.apache.woden.wsdl20.xml.InterfaceElement#getOperationElements()
*/
- public InterfaceOperationElement[] getOperationElements()
+ public InterfaceOperationElement[] getInterfaceOperationElements()
{
return
(InterfaceOperationElement[])fInterfaceOperationElements.toArray();
}
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=293113&r1=293112&r2=293113&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
Sun Oct 2 06:40:12 2005
@@ -46,14 +46,25 @@
public void addNamespace(String prefix, String namespace);
public void removeNamespace(String prefix);
public String getNamespace(String prefix);
- public Map getNamespaces();
+ public Map getNamespaces();//TODO return arrays instead of Map?
/*
* Element factory methods
*/
public DocumentationElement createDocumentationElement();
+
public TypesElement createTypesElement();
+
+ public InterfaceElement createInterfaceElement();
+
+ public InterfaceFaultElement createInterfaceFaultElement();
+
+ public InterfaceOperationElement createInterfaceOperationElement();
+
+ public FeatureElement createFeatureElement();
+
+ public PropertyElement createPropertyElement();
/*
Modified:
incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
URL:
http://svn.apache.org/viewcvs/incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java?rev=293113&r1=293112&r2=293113&view=diff
==============================================================================
--- incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
(original)
+++ incubator/woden/java/src/org/apache/woden/wsdl20/xml/InterfaceElement.java
Sun Oct 2 06:40:12 2005
@@ -44,11 +44,11 @@
* Elements
*/
- public void addFaultElement(InterfaceFaultElement fault);
- public InterfaceFaultElement[] getFaultElements();
+ public void addInterfaceFaultElement(InterfaceFaultElement fault);
+ public InterfaceFaultElement[] getInterfaceFaultElements();
- public void addOperationElement(InterfaceOperationElement operation);
- public InterfaceOperationElement[] getOperationElements();
+ public void addInterfaceOperationElement(InterfaceOperationElement
operation);
+ public InterfaceOperationElement[] getInterfaceOperationElements();
//TODO extension elements
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
