Author: jkaputin
Date: Fri Sep 8 08:30:05 2006
New Revision: 441536
URL: http://svn.apache.org/viewvc?view=rev&rev=441536
Log:
Change behaviour of ElementSource.setSource implementations
to throw an IllegalArgumentException instead of a
WSDLException if the method argument is not a recognized
type. Also, re-instated the explicit import statements in
DOMWSDLReader.
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java?view=diff&rev=441536&r1=441535&r2=441536
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
Fri Sep 8 08:30:05 2006
@@ -35,7 +35,10 @@
super(errorReporter);
}
- public void setSource(Object elementSource) throws WSDLException {
+ /*
+ * @see org.apache.woden.ElementSource#setSource(java.lang.Object)
+ */
+ public void setSource(Object elementSource) {
if(elementSource instanceof Element) {
fSource = elementSource;
@@ -47,8 +50,7 @@
String elemSourceClass = this.getClass().getName();
String msg = fErrorReporter.getFormattedMessage(
"WSDL019", new Object[] {sourceClass, elemSourceClass});
- //TODO throw IllegalArgumentException instead of WSDLException
- throw new WSDLException(WSDLException.PARSER_ERROR, msg);
+ throw new IllegalArgumentException(msg);
}
}
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=441536&r1=441535&r2=441536
==============================================================================
---
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
Fri Sep 8 08:30:05 2006
@@ -29,13 +29,18 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.woden.*;
+import org.apache.woden.ElementSource;
+import org.apache.woden.ErrorHandler;
+import org.apache.woden.ErrorReporter;
+import org.apache.woden.WSDLException;
+import org.apache.woden.WSDLReader;
+import org.apache.woden.WSDLSource;
import org.apache.woden.internal.schema.ImportedSchemaImpl;
import org.apache.woden.internal.schema.InlinedSchemaImpl;
import org.apache.woden.internal.schema.SchemaConstants;
import org.apache.woden.internal.util.StringUtils;
-import org.apache.woden.internal.util.dom.DOMUtils;
import org.apache.woden.internal.util.dom.DOMQNameUtils;
+import org.apache.woden.internal.util.dom.DOMUtils;
import org.apache.woden.internal.util.dom.XPathUtils;
import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.internal.wsdl20.validation.WSDLComponentValidator;
@@ -114,6 +119,15 @@
* ************************************************************/
/* (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() {
@@ -269,17 +283,6 @@
}
}
- public ElementSource createElementSource(Object elem) {
- DOMElementSource domElementSource = new
DOMElementSource(getErrorReporter());
- try {
- domElementSource.setSource(elem);
- } catch (WSDLException e) {
- e.printStackTrace();
- }
- return domElementSource;
- }
-
-
/* ************************************************************
* Parsing methods - e.g. parseXXXX()
* ************************************************************/
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java?view=diff&rev=441536&r1=441535&r2=441536
==============================================================================
---
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
(original)
+++
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
Fri Sep 8 08:30:05 2006
@@ -32,16 +32,22 @@
super(errorReporter);
}
- public void setSource(Object elementSource) throws WSDLException {
+ /*
+ * @see org.apache.woden.ElementSource#setSource(java.lang.Object)
+ */
+ public void setSource(Object elementSource) {
if(elementSource instanceof OMElement) {
fSource = elementSource;
}
else {
- String sourceClass = elementSource.getClass().getName();
+ String sourceClass = (elementSource != null
+ ? elementSource.getClass().getName()
+ : null);
+ String elemSourceClass = this.getClass().getName();
String msg = fErrorReporter.getFormattedMessage(
- "WSDL018", new Object[] {sourceClass});
- throw new WSDLException(WSDLException.PARSER_ERROR, msg);
+ "WSDL019", new Object[] {sourceClass, elemSourceClass});
+ throw new IllegalArgumentException(msg);
}
}
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=441536&r1=441535&r2=441536
==============================================================================
---
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
Fri Sep 8 08:30:05 2006
@@ -1491,11 +1491,7 @@
public ElementSource createElementSource(Object elem) {
OMElementSource omElementSource = new
OMElementSource(getErrorReporter());
- try {
- omElementSource.setSource(elem);
- } catch (WSDLException e) {
- e.printStackTrace();
- }
+ omElementSource.setSource(elem);
return omElementSource;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
