Author: jkaputin
Date: Tue Oct 3 05:57:36 2006
New Revision: 452472
URL: http://svn.apache.org/viewvc?view=rev&rev=452472
Log:
Made the method reader.createElementSource(Object) a protected
implementation method instead of a public API method as
so far it is only used internally - i.e. no need for it on the
API yet.
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java?view=diff&rev=452472&r1=452471&r2=452472
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
(original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java Tue
Oct 3 05:57:36 2006
@@ -176,6 +176,8 @@
//TODO - a readWSDL method that returns a Description (eg a component)
+ //TODO - decide if an API method createElementSource() is needed.
+
/**
* Returns a concrete implementation of WSDLSource that is compatible with
* the WSDLReader implementation. That is, it will accept objects
representing
@@ -266,12 +268,4 @@
*/
public Object getProperty(String name);
- /**
- * For a particular XML element in the WSDL, the reader has the freedom to
- * set the ElementSource via this method in the respective implementation.
- * @param elem Element that requires wrapping
- * @return ElementSource after wrapping
- */
- public ElementSource createElementSource(Object elem);
-
}
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java?view=diff&rev=452472&r1=452471&r2=452472
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
Tue Oct 3 05:57:36 2006
@@ -15,6 +15,7 @@
*/
package org.apache.woden.internal;
+import org.apache.woden.ElementSource;
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
import org.apache.woden.WSDLFactory;
@@ -47,6 +48,18 @@
fErrorReporter= new ErrorReporterImpl();
features = new ReaderFeatures();
}
+
+ /**
+ * Returns an ElementSource object representing the specified element
+ * object. The element object argument must be compatible with the
+ * concrete reader implementation. If so, this method returns an
ElementSource
+ * object that is type-compatible with the reader implementatation (e.g. a
+ * DOMElementSource for DOMWSDLReader).
+ *
+ * @throws IllegalArgumentException if elem is not a type recognized by
the
+ * WSDLReader implementation.
+ */
+ abstract protected ElementSource createElementSource(Object elem) throws
IllegalArgumentException;
/**
* @return Returns the fErrorReporter.
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java?view=diff&rev=452472&r1=452471&r2=452472
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
Tue Oct 3 05:57:36 2006
@@ -119,15 +119,6 @@
* ************************************************************/
/* (non-Javadoc)
- * @see org.apache.woden.WSDLReader#createElementSource(java.lang.Object)
- */
- public ElementSource createElementSource(Object elem) {
- DOMElementSource domElementSource = new
DOMElementSource(getErrorReporter());
- domElementSource.setSource(elem);
- return domElementSource;
- }
-
- /* (non-Javadoc)
* @see org.apache.woden.WSDLReader#createWSDLSource()
*/
public WSDLSource createWSDLSource() {
@@ -1931,6 +1922,17 @@
/* ************************************************************
* Utility/helper methods
* ************************************************************/
+
+ /* (non-Javadoc)
+ * @see
org.apache.woden.internal.BaseWSDLReader#createElementSource(java.lang.Object)
+ */
+ protected ElementSource createElementSource(Object elem) {
+ DOMElementSource domElementSource = new
DOMElementSource(getErrorReporter());
+ domElementSource.setSource(elem);
+ return domElementSource;
+ }
+
+
/**
* Check the actual element encountered against the expected qname
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=452472&r1=452471&r2=452472
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Tue Oct 3 05:57:36 2006
@@ -1489,7 +1489,7 @@
return null;
}
- public ElementSource createElementSource(Object elem) {
+ protected ElementSource createElementSource(Object elem) {
OMElementSource omElementSource = new
OMElementSource(getErrorReporter());
omElementSource.setSource(elem);
return omElementSource;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]