You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/22 04:38:43 UTC
svn commit: r358474 [1/3] - in
/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2: rpc/
rpc/client/ rpc/receivers/ schema/ schema/typemap/ schema/util/
schema/writer/ util/ wsdl/codegen/ wsdl/codegen/emitter/
wsdl/codegen/extension/ wsd...
Author: dims
Date: Wed Dec 21 19:38:20 2005
New Revision: 358474
URL: http://svn.apache.org/viewcvs?rev=358474&view=rev
Log:
reformat and optimize imports ONLY
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCInOutMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCMethod.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCParameter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCRequestElement.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCResponseElement.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCValues.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCStub.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/StubSupporter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompilationException.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/XSD2Java.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/TypeMap.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/util/SchemaPropertyLoader.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/BeanWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/FileWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/XSLTTemplateProcessor.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/util/XSLTUtils.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CommandLineOption.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/XSLTConstants.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CSharpEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/Emitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractCodeGenerationExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AbstractDBProcessingExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/AxisBindingBuilder.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/DefaultDatabindingExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/PackageFinder.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PrettyPrinter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMapper.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/csharp/package.html
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/package.html
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/ConfigPropertyFileLoader.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCInOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCInOutMessageReceiver.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCInOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCInOutMessageReceiver.java Wed Dec 21 19:38:20 2005
@@ -31,9 +31,9 @@
import javax.xml.namespace.QName;
import java.lang.reflect.Method;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
/**
*
@@ -131,7 +131,7 @@
// strictness configuration.
continue;
}
- Integer count = (Integer)elementCounts.get(qname);
+ Integer count = (Integer) elementCounts.get(qname);
if (count == null) count = new Integer(0);
elementCounts.put(qname, new Integer(count.intValue() + 1));
Deserializer dser = param.getDeserializer(count.intValue(), values);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCMethod.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCMethod.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCMethod.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCMethod.java Wed Dec 21 19:38:20 2005
@@ -45,7 +45,7 @@
public boolean hasNext() {
if (cache != null) return true;
while (idx < params.size()) {
- RPCParameter param = (RPCParameter)params.get(idx);
+ RPCParameter param = (RPCParameter) params.get(idx);
idx++;
if (param.mode != badMode) {
cache = param;
@@ -93,7 +93,7 @@
}
public RPCParameter getParameter(QName qname) {
- return (RPCParameter)parameters.get(qname);
+ return (RPCParameter) parameters.get(qname);
}
public Method getJavaMethod() {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCParameter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCParameter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCParameter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCParameter.java Wed Dec 21 19:38:20 2005
@@ -57,8 +57,8 @@
}
}
- public static final int MODE_IN = 0;
- public static final int MODE_OUT = 1;
+ public static final int MODE_IN = 0;
+ public static final int MODE_OUT = 1;
public static final int MODE_INOUT = 2;
int mode;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCRequestElement.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCRequestElement.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCRequestElement.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCRequestElement.java Wed Dec 21 19:38:20 2005
@@ -59,7 +59,7 @@
parameter.serialize(context, value);
} catch (Exception e) {
throw new XMLStreamException("Couldn't serialize RPCParameter",
- e);
+ e);
}
}
writer.writeEndElement();
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCResponseElement.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCResponseElement.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCResponseElement.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCResponseElement.java Wed Dec 21 19:38:20 2005
@@ -56,10 +56,10 @@
RPCParameter parameter = (RPCParameter) outParams.next();
try {
parameter.serialize(context,
- values.getValue(parameter.getQName()));
+ values.getValue(parameter.getQName()));
} catch (Exception e) {
throw new XMLStreamException("Couldn't serialize RPCParameter",
- e);
+ e);
}
}
writer.writeEndElement();
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCValues.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCValues.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCValues.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/RPCValues.java Wed Dec 21 19:38:20 2005
@@ -35,7 +35,7 @@
}
public void setIndexedValue(QName paramName, int index, Object value) {
- ArrayList coll = (ArrayList)values.get(paramName);
+ ArrayList coll = (ArrayList) values.get(paramName);
if (coll == null) {
coll = new ArrayList();
values.put(paramName, coll);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java Wed Dec 21 19:38:20 2005
@@ -22,10 +22,10 @@
import org.apache.axis2.client.async.Callback;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.databinding.utils.BeanUtil;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.databinding.utils.BeanUtil;
import org.apache.wsdl.WSDLConstants;
import javax.xml.namespace.QName;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCStub.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCStub.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCStub.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCStub.java Wed Dec 21 19:38:20 2005
@@ -26,7 +26,7 @@
public class RPCStub extends Stub {
/**
* TODO: Make this method non-static and fix the xsl's that generate code to "extend" RPCStub when appropriate.
- *
+ *
* @param factory
* @param env
* @param methodNamespaceURI
@@ -35,11 +35,11 @@
* @param values
*/
public static void setValueRPC(OMFactory factory,
- SOAPEnvelope env,
- String methodNamespaceURI,
- String methodName,
- String[] paramNames,
- Object[] values) {
+ SOAPEnvelope env,
+ String methodNamespaceURI,
+ String methodName,
+ String[] paramNames,
+ Object[] values) {
SOAPBody body = env.getBody();
OMNamespace methodNamespace = factory.createOMNamespace(methodNamespaceURI,
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/StubSupporter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/StubSupporter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/StubSupporter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/StubSupporter.java Wed Dec 21 19:38:20 2005
@@ -23,44 +23,44 @@
public class StubSupporter {
public static OMElement createRPCMappedElement(
- String elementName,
- OMNamespace ns,
- Object value,
- OMFactory fac) {
+ String elementName,
+ OMNamespace ns,
+ Object value,
+ OMFactory fac) {
OMElement returnElement = fac.createOMElement(elementName, ns);
Class inputParamClass = value.getClass();
if (inputParamClass.equals(String.class)) {
returnElement.addChild(
- fac.createText(returnElement, value.toString()));
+ fac.createText(returnElement, value.toString()));
} else if (inputParamClass.equals(Integer.class)) {
returnElement.addChild(
- fac.createText(
- returnElement,
- String.valueOf(((Integer) value).intValue())));
+ fac.createText(
+ returnElement,
+ String.valueOf(((Integer) value).intValue())));
} else if (inputParamClass.equals(Float.class)) {
returnElement.addChild(
- fac.createText(
- returnElement,
- String.valueOf(((Float) value).floatValue())));
+ fac.createText(
+ returnElement,
+ String.valueOf(((Float) value).floatValue())));
} else if (inputParamClass.equals(Double.class)) {
returnElement.addChild(
- fac.createText(
- returnElement,
- String.valueOf(((Double) value).doubleValue())));
+ fac.createText(
+ returnElement,
+ String.valueOf(((Double) value).doubleValue())));
//todo this seems to be a long list... need to complete this
} else if (inputParamClass.equals(OMElement.class)) {
returnElement.addChild((OMElement) value);
} else {
returnElement.addChild(
- fac.createText(returnElement, value.toString()));
+ fac.createText(returnElement, value.toString()));
}
return returnElement;
}
public static Object getRPCMappedElementValue(
- OMElement elt,
- Class outputTypeClass) {
+ OMElement elt,
+ Class outputTypeClass) {
Object outputObj = null;
if (outputTypeClass.equals(String.class)) {
outputObj = elt.getText();
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Wed Dec 21 19:38:20 2005
@@ -22,9 +22,9 @@
package org.apache.axis2.rpc.receivers;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.databinding.utils.BeanUtil;
-import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
+import org.apache.axis2.databinding.utils.BeanUtil;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.om.OMAbstractFactory;
@@ -102,11 +102,11 @@
SOAPEnvelope envelope = getSOAPFactory().getDefaultEnvelope();
OMElement bodyContent = null;
- if(resObject instanceof Object[]){
- QName resName = new QName("http://soapenc/", method.getName() + "Response", "res");
- OMElement bodyChild = getResponseElement(resName,(Object[])resObject);
+ if (resObject instanceof Object[]) {
+ QName resName = new QName("http://soapenc/", method.getName() + "Response", "res");
+ OMElement bodyChild = getResponseElement(resName, (Object[]) resObject);
envelope.getBody().addChild(bodyChild);
- } else {
+ } else {
processResponse(resObject, bodyContent, ns, envelope);
}
@@ -119,19 +119,19 @@
private Object[] processRequest(OMElement methodElement) throws AxisFault {
Class[] parameters = method.getParameterTypes();
- return BeanUtil.deserialize(methodElement,parameters);
+ return BeanUtil.deserialize(methodElement, parameters);
}
- private OMElement getResponseElement(QName resname, Object [] objs){
- return BeanUtil.getOMElement(resname,objs);
+ private OMElement getResponseElement(QName resname, Object [] objs) {
+ return BeanUtil.getOMElement(resname, objs);
}
private void processResponse(Object resObject, OMElement bodyContent, OMNamespace ns, SOAPEnvelope envelope) {
if (resObject != null) {
//todo first check to see where the desrilizer for the return object
//simple type
- if(resObject instanceof OMElement){
- bodyContent=(OMElement)resObject;
+ if (resObject instanceof OMElement) {
+ bodyContent = (OMElement) resObject;
} else if (SimpleTypeMapper.isSimpleType(resObject)) {
bodyContent = getSOAPFactory().createOMElement(
method.getName() + "Response", ns);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java Wed Dec 21 19:38:20 2005
@@ -1,7 +1,11 @@
package org.apache.axis2.schema;
import javax.xml.namespace.QName;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -27,7 +31,6 @@
public class BeanWriterMetaInfoHolder {
-
private boolean ordered = false;
private boolean anonymous = false;
private boolean extension = false;
@@ -41,6 +44,7 @@
/**
* get the anon status
+ *
* @return
*/
public boolean isAnonymous() {
@@ -49,6 +53,7 @@
/**
* Set the anonymous flag
+ *
* @param anonymous
*/
public void setAnonymous(boolean anonymous) {
@@ -58,6 +63,7 @@
/**
* set the extensions base class name. Valid only when the isExtension
* retruns true
+ *
* @param extensionClassName
* @return
*/
@@ -68,6 +74,7 @@
/**
* set the extensions base class name. Valid only when the isExtension
* retruns true
+ *
* @param extensionClassName
*/
public void setExtensionClassName(String extensionClassName) {
@@ -76,6 +83,7 @@
/**
* get the extension status
+ *
* @return
*/
public boolean isExtension() {
@@ -84,6 +92,7 @@
/**
* set the extension status
+ *
* @param extension
*/
public void setExtension(boolean extension) {
@@ -92,6 +101,7 @@
/**
* ge the ordered statu
+ *
* @return
*/
public boolean isOrdered() {
@@ -101,6 +111,7 @@
/**
* set the ordered flag. this marks whether the
* items are ordered or not
+ *
* @param ordered
*/
public void setOrdered(boolean ordered) {
@@ -109,89 +120,98 @@
/**
* Register a mapping
+ *
* @param qName
* @param schemaName
* @param javaClassName
*/
- public void registerMapping(QName qName,QName schemaName,String javaClassName){
- registerMapping(qName,schemaName,javaClassName,SchemaConstants.ELEMENT_TYPE);
+ public void registerMapping(QName qName, QName schemaName, String javaClassName) {
+ registerMapping(qName, schemaName, javaClassName, SchemaConstants.ELEMENT_TYPE);
}
/**
* Register a mapping
+ *
* @param qName
* @param schemaName
* @param javaClassName
* @param type
*/
- public void registerMapping(QName qName,QName schemaName,String javaClassName,Integer type){
- this.elementToJavaClassMap.put(qName,javaClassName);
- this.elementToSchemaQNameMap.put(qName,schemaName);
- this.specialTypeFlagMap.put(qName,type);
+ public void registerMapping(QName qName, QName schemaName, String javaClassName, Integer type) {
+ this.elementToJavaClassMap.put(qName, javaClassName);
+ this.elementToSchemaQNameMap.put(qName, schemaName);
+ this.specialTypeFlagMap.put(qName, type);
}
/**
* Get the schema name for the given QName
+ *
* @param eltQName
* @return
*/
- public QName getSchemaQNameForQName(QName eltQName){
- return (QName)this.elementToSchemaQNameMap.get(eltQName);
+ public QName getSchemaQNameForQName(QName eltQName) {
+ return (QName) this.elementToSchemaQNameMap.get(eltQName);
}
/**
* get the class name for the QName
+ *
* @param eltQName
* @return
*/
- public String getClassNameForQName(QName eltQName){
- return (String)this.elementToJavaClassMap.get(eltQName);
+ public String getClassNameForQName(QName eltQName) {
+ return (String) this.elementToJavaClassMap.get(eltQName);
}
/**
* Get whether a given QName is an attribute
+ *
* @param qName
* @return
*/
- public boolean getAttributeStatusForQName(QName qName){
+ public boolean getAttributeStatusForQName(QName qName) {
Integer attribState = (Integer) specialTypeFlagMap.get(qName);
return attribState != null && attribState.equals(SchemaConstants.ATTRIBUTE_TYPE);
}
/**
* Get whether a given QName represents a anyType
+ *
* @param qName
* @return
*/
- public boolean getAnyStatusForQName(QName qName){
+ public boolean getAnyStatusForQName(QName qName) {
Integer anyState = (Integer) specialTypeFlagMap.get(qName);
return anyState != null && anyState.equals(SchemaConstants.ANY_TYPE);
}
/**
- * Get whether a given QName refers to an array
+ * Get whether a given QName refers to an array
+ *
* @param qName
* @return
*/
- public boolean getArrayStatusForQName(QName qName){
+ public boolean getArrayStatusForQName(QName qName) {
Integer anyState = (Integer) specialTypeFlagMap.get(qName);
return anyState != null && anyState.equals(SchemaConstants.ANY_ARRAY_TYPE);
}
/**
* Get whether a given QName has the any attribute status
+ *
* @param qName
* @return
*/
- public boolean getAnyAttributeStatusForQName(QName qName){
+ public boolean getAnyAttributeStatusForQName(QName qName) {
Integer anyState = (Integer) specialTypeFlagMap.get(qName);
return anyState != null && anyState.equals(SchemaConstants.ANY_ATTRIBUTE_TYPE);
}
+
/**
- * Clears the whole set of tables.
+ * Clears the whole set of tables.
*/
- public void clearTables(){
+ public void clearTables() {
this.elementToJavaClassMap.clear();
this.elementToSchemaQNameMap.clear();
this.elementToSchemaQNameMap.clear();
@@ -204,84 +224,91 @@
/**
* add the maxOccurs associated with a QName
+ *
* @param qName
* @param minOccurs
*/
- public void addMinOccurs(QName qName, long minOccurs){
- this.qNameMinOccursCountMap.put(qName,new Long(minOccurs));
+ public void addMinOccurs(QName qName, long minOccurs) {
+ this.qNameMinOccursCountMap.put(qName, new Long(minOccurs));
}
/**
* register a QName for the order
+ *
* @param qName
* @param index
*/
- public void registerQNameIndex(QName qName, int index){
- this.qNameOrderMap.put(new Integer(index),qName);
+ public void registerQNameIndex(QName qName, int index) {
+ this.qNameOrderMap.put(new Integer(index), qName);
}
/**
* Add the minOccurs associated with a QName
+ *
* @param qName
* @return
*/
- public long getMinOccurs(QName qName){
- Long l =(Long) this.qNameMinOccursCountMap.get(qName);
- return l!=null?l.longValue():1; //default for min is 1
+ public long getMinOccurs(QName qName) {
+ Long l = (Long) this.qNameMinOccursCountMap.get(qName);
+ return l != null ? l.longValue() : 1; //default for min is 1
}
/**
* get the maxOccurs associated with a QName
+ *
* @param qName
* @return
*/
- public long getMaxOccurs(QName qName){
- Long l =(Long) this.qNameMaxOccursCountMap.get(qName);
- return l!=null?l.longValue():1; //default for max is 1
+ public long getMaxOccurs(QName qName) {
+ Long l = (Long) this.qNameMaxOccursCountMap.get(qName);
+ return l != null ? l.longValue() : 1; //default for max is 1
}
/**
* Add the maxOccurs associated with a QName
+ *
* @param qName
* @param maxOccurs
*/
- public void addMaxOccurs(QName qName, long maxOccurs){
- this.qNameMaxOccursCountMap.put(qName,new Long(maxOccurs));
+ public void addMaxOccurs(QName qName, long maxOccurs) {
+ this.qNameMaxOccursCountMap.put(qName, new Long(maxOccurs));
}
/**
- * @deprecated Use #getQNameArray
* @return
+ * @deprecated Use #getQNameArray
*/
- public Iterator getElementQNameIterator(){
+ public Iterator getElementQNameIterator() {
return elementToJavaClassMap.keySet().iterator();
}
/**
* get the QName array - may not be ordered
+ *
* @return
*/
- public QName[] getQNameArray(){
- Set keySet =elementToJavaClassMap.keySet();
- return (QName[])keySet.toArray(new QName[keySet.size()]);
+ public QName[] getQNameArray() {
+ Set keySet = elementToJavaClassMap.keySet();
+ return (QName[]) keySet.toArray(new QName[keySet.size()]);
}
/**
* Get the ordered QName array - useful in sequences where the order needs to be preserved
* Note - #registerQNameIndex needs to be called if this is to work properly!
+ *
* @return
*/
- public QName[] getOrderedQNameArray(){
+ public QName[] getOrderedQNameArray() {
//get the keys of the order map
Set set = qNameOrderMap.keySet();
int count = set.size();
- Integer[] keys =(Integer[]) set.toArray(new Integer[count]);
+ Integer[] keys = (Integer[]) set.toArray(new Integer[count]);
Arrays.sort(keys);
//Now refill the Ordered QName Array
QName[] returnQNames = new QName[count];
for (int i = 0; i < keys.length; i++) {
- returnQNames[i] = (QName)qNameOrderMap.get(keys[i]);
+ returnQNames[i] = (QName) qNameOrderMap.get(keys[i]);
}
return returnQNames;
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/CompilerOptions.java Wed Dec 21 19:38:20 2005
@@ -31,7 +31,7 @@
* Generated output file
*/
private File outputLocation;
- private String packageName=null;
+ private String packageName = null;
/**
* This flag tells the databinder to either write the output or
@@ -69,9 +69,9 @@
public CompilerOptions setPackageName(String packageName) {
//validate the package name
//should be ***.***.***. type value
- if (packageName!=null && testValue(packageName)){
- this.packageName = packageName;
- }else{
+ if (packageName != null && testValue(packageName)) {
+ this.packageName = packageName;
+ } else {
throw new RuntimeException("Unsupported value!");
}
@@ -87,9 +87,9 @@
return this;
}
- private boolean testValue(String wordToMatch){
- Pattern pat = Pattern.compile("^(\\w+\\.)+$");
- Matcher m= pat.matcher(wordToMatch);
- return m.matches();
+ private boolean testValue(String wordToMatch) {
+ Pattern pat = Pattern.compile("^(\\w+\\.)+$");
+ Matcher m = pat.matcher(wordToMatch);
+ return m.matches();
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompilationException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompilationException.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompilationException.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompilationException.java Wed Dec 21 19:38:20 2005
@@ -19,7 +19,7 @@
* A simeple extension from the java.lang.exception to serve as the schema compilers
* Exception
*/
-public class SchemaCompilationException extends Exception{
+public class SchemaCompilationException extends Exception {
public SchemaCompilationException() {
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java Wed Dec 21 19:38:20 2005
@@ -3,10 +3,35 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.schema.util.SchemaPropertyLoader;
import org.apache.axis2.schema.writer.BeanWriter;
-import org.apache.ws.commons.schema.*;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.apache.ws.commons.schema.XmlSchemaAll;
+import org.apache.ws.commons.schema.XmlSchemaAny;
+import org.apache.ws.commons.schema.XmlSchemaAnyAttribute;
+import org.apache.ws.commons.schema.XmlSchemaAttribute;
+import org.apache.ws.commons.schema.XmlSchemaChoice;
+import org.apache.ws.commons.schema.XmlSchemaComplexContent;
+import org.apache.ws.commons.schema.XmlSchemaComplexContentExtension;
+import org.apache.ws.commons.schema.XmlSchemaComplexContentRestriction;
+import org.apache.ws.commons.schema.XmlSchemaComplexType;
+import org.apache.ws.commons.schema.XmlSchemaContent;
+import org.apache.ws.commons.schema.XmlSchemaElement;
+import org.apache.ws.commons.schema.XmlSchemaImport;
+import org.apache.ws.commons.schema.XmlSchemaObject;
+import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
+import org.apache.ws.commons.schema.XmlSchemaObjectTable;
+import org.apache.ws.commons.schema.XmlSchemaParticle;
+import org.apache.ws.commons.schema.XmlSchemaSequence;
+import org.apache.ws.commons.schema.XmlSchemaSimpleType;
+import org.apache.ws.commons.schema.XmlSchemaSimpleTypeContent;
+import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
+import org.apache.ws.commons.schema.XmlSchemaType;
import javax.xml.namespace.QName;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -41,9 +66,9 @@
private ArrayList processedElementList;
- private BeanWriter writer=null;
+ private BeanWriter writer = null;
- private Map baseSchemaTypeMap =null;
+ private Map baseSchemaTypeMap = null;
private static final String ANY_ELEMENT_FIELD_NAME = "extraElements";
private static final String EXTRA_ATTRIBUTE_FIELD_NAME = "extraAttributes";
@@ -55,14 +80,15 @@
/**
* Constructor - Accepts a options bean
+ *
* @param options
*/
public SchemaCompiler(CompilerOptions options) throws SchemaCompilationException {
- if (options==null){
+ if (options == null) {
//create an empty options object
this.options = new CompilerOptions();
- }else{
+ } else {
this.options = options;
}
@@ -78,7 +104,7 @@
this.writer.init(this.options);
//load the base types
- baseSchemaTypeMap =SchemaPropertyLoader.getTypeMapperInstance().getTypeMap();
+ baseSchemaTypeMap = SchemaPropertyLoader.getTypeMapperInstance().getTypeMap();
}
@@ -86,18 +112,19 @@
/**
* Compile a list of schemas
* This actually calls the compile (XmlSchema s) method repeatedly
- * @see #compile(org.apache.ws.commons.schema.XmlSchema)
+ *
* @param schemalist
* @throws SchemaCompilationException
+ * @see #compile(org.apache.ws.commons.schema.XmlSchema)
*/
- public void compile(List schemalist) throws SchemaCompilationException{
+ public void compile(List schemalist) throws SchemaCompilationException {
XmlSchema schema;
try {
for (int i = 0; i < schemalist.size(); i++) {
- schema = (XmlSchema)schemalist.get(i);
+ schema = (XmlSchema) schemalist.get(i);
compile(schema);
}
- }catch(SchemaCompilationException e) {
+ } catch (SchemaCompilationException e) {
throw e;
} catch (Exception e) {
throw new SchemaCompilationException(e);
@@ -105,36 +132,36 @@
}
/**
- *
* Compile (rather codegen) a single schema element
+ *
* @param schema
* @throws SchemaCompilationException
*/
- public void compile(XmlSchema schema) throws SchemaCompilationException{
+ public void compile(XmlSchema schema) throws SchemaCompilationException {
//First look for the schemas that are imported and process them
//Note that these are processed recursively!
XmlSchemaObjectCollection includes = schema.getIncludes();
- if (includes!=null){
+ if (includes != null) {
Iterator tempIterator = includes.getIterator();
while (tempIterator.hasNext()) {
- Object o = tempIterator.next();
- if (o instanceof XmlSchemaImport){
+ Object o = tempIterator.next();
+ if (o instanceof XmlSchemaImport) {
XmlSchema schema1 = ((XmlSchemaImport) o).getSchema();
- if (schema1!=null) compile(schema1);
+ if (schema1 != null) compile(schema1);
}
}
}
//select all the elements. We generate the code for types
//only if the elements refer them!!!
XmlSchemaObjectTable elements = schema.getElements();
- Iterator xmlSchemaElement1Iterator = elements.getValues();
+ Iterator xmlSchemaElement1Iterator = elements.getValues();
while (xmlSchemaElement1Iterator.hasNext()) {
//this is the set of outer elements so we need to generate classes
//The outermost elements do not contain occurence counts (!) so we do not need
//to check for arraytypes
- processElement((XmlSchemaElement)xmlSchemaElement1Iterator.next(),true);
+ processElement((XmlSchemaElement) xmlSchemaElement1Iterator.next(), true);
}
@@ -146,93 +173,96 @@
// write
while (xmlSchemaElement2Iterator.hasNext()) {
//this is the set of outer elements so we need to generate classes
- writeElement((XmlSchemaElement)xmlSchemaElement2Iterator.next());
+ writeElement((XmlSchemaElement) xmlSchemaElement2Iterator.next());
}
- if (options.isWrapClasses()){
+ if (options.isWrapClasses()) {
writer.writeBatch();
}
}
/**
- * Writes the element
+ * Writes the element
+ *
* @param xsElt
* @throws SchemaCompilationException
*/
- private void writeElement(XmlSchemaElement xsElt) throws SchemaCompilationException{
+ private void writeElement(XmlSchemaElement xsElt) throws SchemaCompilationException {
- if (this.processedElementMap.containsKey(xsElt.getQName())){
+ if (this.processedElementMap.containsKey(xsElt.getQName())) {
return;
}
XmlSchemaType schemaType = xsElt.getSchemaType();
- if (schemaType!=null){
+ if (schemaType != null) {
BeanWriterMetaInfoHolder metainf = new BeanWriterMetaInfoHolder();
- if (schemaType.getName()!=null){
+ if (schemaType.getName() != null) {
//this is a named type
QName qName = schemaType.getQName();
//find the class name
- String className = findClassName(qName,isArray(xsElt));
+ String className = findClassName(qName, isArray(xsElt));
//this means the schema type actually returns a different QName
- if (changedTypeMap.containsKey(qName)){
+ if (changedTypeMap.containsKey(qName)) {
metainf.registerMapping(xsElt.getQName(),
- (QName)changedTypeMap.get(qName),
+ (QName) changedTypeMap.get(qName),
className);
- }else{
+ } else {
metainf.registerMapping(xsElt.getQName(),
qName,
className);
}
- }else{
+ } else {
//we are going to special case the anonymous complex type. Our algorithm for dealing
//with it is to generate a single object that has the complex content inside. Really the
//intent of the user when he declares the complexType anonymously is to use it privately
//First copy the schema types content into the metainf holder
- metainf = (BeanWriterMetaInfoHolder)this.processedAnonymousComplexTypesMap.get(xsElt);
+ metainf = (BeanWriterMetaInfoHolder) this.processedAnonymousComplexTypesMap.get(xsElt);
metainf.setAnonymous(true);
}
- String writtenClassName = writer.write(xsElt,processedTypemap,metainf);
- processedElementMap.put(xsElt.getQName(),writtenClassName);
+ String writtenClassName = writer.write(xsElt, processedTypemap, metainf);
+ processedElementMap.put(xsElt.getQName(), writtenClassName);
}
}
/**
* Process the element
+ *
* @param xsElt
- * @param isOuter - We need to know this since the treatment of outer elements is different that
- * inner elements
+ * @param isOuter - We need to know this since the treatment of outer elements is different that
+ * inner elements
* @throws SchemaCompilationException
*/
- private void processElement(XmlSchemaElement xsElt,boolean isOuter) throws SchemaCompilationException{
- processElement(xsElt,isOuter,false);
+ private void processElement(XmlSchemaElement xsElt, boolean isOuter) throws SchemaCompilationException {
+ processElement(xsElt, isOuter, false);
}
/**
* Process and Element
+ *
* @param xsElt
- * @param isOuter-We need to know this since the treatment of outer elements is different that
- * inner elements
+ * @param isOuter-We need to know this since the treatment of outer elements is different that
+ * inner elements
* @param isArray-flag saying whether the elements represents an array
* @throws SchemaCompilationException
*/
- private void processElement(XmlSchemaElement xsElt,boolean isOuter,boolean isArray) throws SchemaCompilationException{
+ private void processElement(XmlSchemaElement xsElt, boolean isOuter, boolean isArray) throws SchemaCompilationException {
//The processing element logic seems to be quite simple. Look at the relevant schema type
//for each and every element and process that accordingly.
//this means that any unused type definitions would not be generated!
- if (isOuter && processedElementList.contains(xsElt.getQName())){
+ if (isOuter && processedElementList.contains(xsElt.getQName())) {
return;
}
XmlSchemaType schemaType = xsElt.getSchemaType();
- if (schemaType!=null){
- processSchema(xsElt,schemaType);
+ if (schemaType != null) {
+ processSchema(xsElt, schemaType);
//at this time it is not wise to directly write the class for the element
//so we push the complete element to an arraylist and let the process
//pass through. We'll be iterating through the elements writing them
@@ -241,9 +271,9 @@
//There can be instances where the SchemaType is null but the schemaTypeName is not
//this specifically happens with xsd:anyType.
- if (!isOuter){
- String className = findClassName(xsElt.getSchemaTypeName(),isArray(xsElt));
- this.processedElementMap.put(xsElt.getQName(),className);
+ if (!isOuter) {
+ String className = findClassName(xsElt.getSchemaTypeName(), isArray(xsElt));
+ this.processedElementMap.put(xsElt.getQName(), className);
}
this.processedElementList.add(xsElt.getQName());
@@ -251,27 +281,28 @@
/**
* Finds a class name from the given Qname
+ *
* @param schemaType
* @return
*/
- private String findClassName(QName qName,boolean isArray) {
+ private String findClassName(QName qName, boolean isArray) {
//find the class name
String className;
if (processedTypemap.containsKey(qName)) {
- className = (String)processedTypemap.get(qName);
- }else if(simpleTypesMap.containsKey(qName)){
- className =(String)simpleTypesMap.get(qName);
- }else if(baseSchemaTypeMap.containsKey(qName)){
- className =(String)baseSchemaTypeMap.get(qName);
- }else{
+ className = (String) processedTypemap.get(qName);
+ } else if (simpleTypesMap.containsKey(qName)) {
+ className = (String) simpleTypesMap.get(qName);
+ } else if (baseSchemaTypeMap.containsKey(qName)) {
+ className = (String) baseSchemaTypeMap.get(qName);
+ } else {
// We seem to have failed in finding a class name for the
//contained schema type. We better set the default then
//however it's better if the default can be set through the
//property file
className = OMElement.class.getName();
}
- if (isArray){
+ if (isArray) {
//append the square braces that say this is an array
//hope this works for all cases!!!!!!!
//todo this however is a thing that needs to be
@@ -283,34 +314,34 @@
/**
* Process a schema element
+ *
* @param schemaType
* @throws SchemaCompilationException
*/
- private void processSchema(XmlSchemaElement xsElt,XmlSchemaType schemaType) throws SchemaCompilationException {
- if (schemaType instanceof XmlSchemaComplexType){
+ private void processSchema(XmlSchemaElement xsElt, XmlSchemaType schemaType) throws SchemaCompilationException {
+ if (schemaType instanceof XmlSchemaComplexType) {
//write classes for complex types
XmlSchemaComplexType complexType = (XmlSchemaComplexType) schemaType;
- if (complexType.getName()!=null){
+ if (complexType.getName() != null) {
processNamedComplexSchemaType(complexType);
- }else{
- processAnonymousComplexSchemaType(xsElt,complexType);
+ } else {
+ processAnonymousComplexSchemaType(xsElt, complexType);
}
- }else if (schemaType instanceof XmlSchemaSimpleType){
+ } else if (schemaType instanceof XmlSchemaSimpleType) {
//process simple type
- processSimpleSchemaType(xsElt,(XmlSchemaSimpleType)schemaType);
+ processSimpleSchemaType(xsElt, (XmlSchemaSimpleType) schemaType);
}
}
/**
- *
* @param complexType
* @throws SchemaCompilationException
*/
- private void processAnonymousComplexSchemaType(XmlSchemaElement elt,XmlSchemaComplexType complexType) throws SchemaCompilationException{
- XmlSchemaParticle particle = complexType.getParticle();
+ private void processAnonymousComplexSchemaType(XmlSchemaElement elt, XmlSchemaComplexType complexType) throws SchemaCompilationException {
+ XmlSchemaParticle particle = complexType.getParticle();
BeanWriterMetaInfoHolder metaInfHolder = new BeanWriterMetaInfoHolder();
- if (particle!=null){
+ if (particle != null) {
//Process the particle
processParticle(particle, metaInfHolder);
}
@@ -319,9 +350,9 @@
XmlSchemaObjectCollection attribs = complexType.getAttributes();
Iterator attribIterator = attribs.getIterator();
while (attribIterator.hasNext()) {
- Object o = attribIterator.next();
- if (o instanceof XmlSchemaAttribute){
- processAttribute((XmlSchemaAttribute)o,metaInfHolder);
+ Object o = attribIterator.next();
+ if (o instanceof XmlSchemaAttribute) {
+ processAttribute((XmlSchemaAttribute) o, metaInfHolder);
}
}
@@ -329,29 +360,30 @@
//process any attribute
//somehow the xml schema parser does not seem to pickup the any attribute!!
XmlSchemaAnyAttribute anyAtt = complexType.getAnyAttribute();
- if (anyAtt!=null){
+ if (anyAtt != null) {
processAnyAttribute(metaInfHolder);
}
//since this is a special case (an unnamed complex type) we'll put the already processed
//metainf holder in a special map to be used later
- this.processedAnonymousComplexTypesMap.put(elt,metaInfHolder);
+ this.processedAnonymousComplexTypesMap.put(elt, metaInfHolder);
}
/**
* handle the complex types which are named
+ *
* @param complexType
*/
- private void processNamedComplexSchemaType(XmlSchemaComplexType complexType) throws SchemaCompilationException{
+ private void processNamedComplexSchemaType(XmlSchemaComplexType complexType) throws SchemaCompilationException {
if (processedTypemap.containsKey(complexType.getQName())
- || baseSchemaTypeMap.containsKey(complexType.getQName())){
+ || baseSchemaTypeMap.containsKey(complexType.getQName())) {
return;
}
- XmlSchemaParticle particle = complexType.getParticle();
+ XmlSchemaParticle particle = complexType.getParticle();
BeanWriterMetaInfoHolder metaInfHolder = new BeanWriterMetaInfoHolder();
- if (particle!=null){
+ if (particle != null) {
//Process the particle
processParticle(particle, metaInfHolder);
}
@@ -360,9 +392,9 @@
XmlSchemaObjectCollection attribs = complexType.getAttributes();
Iterator attribIterator = attribs.getIterator();
while (attribIterator.hasNext()) {
- Object o = attribIterator.next();
- if (o instanceof XmlSchemaAttribute){
- processAttribute((XmlSchemaAttribute)o,metaInfHolder);
+ Object o = attribIterator.next();
+ if (o instanceof XmlSchemaAttribute) {
+ processAttribute((XmlSchemaAttribute) o, metaInfHolder);
}
}
@@ -370,7 +402,7 @@
//process any attribute
//somehow the xml schema parser does not seem to pickup the any attribute!!
XmlSchemaAnyAttribute anyAtt = complexType.getAnyAttribute();
- if (anyAtt!=null){
+ if (anyAtt != null) {
processAnyAttribute(metaInfHolder);
}
@@ -378,16 +410,16 @@
//write the class. This type mapping would have been populated right now
//Note - We always write classes for complex types
- String fullyQualifiedClassName = writer.write(complexType,processedTypemap,metaInfHolder);
+ String fullyQualifiedClassName = writer.write(complexType, processedTypemap, metaInfHolder);
//populate the type mapping with the elements
- processedTypemap.put(complexType.getQName(),fullyQualifiedClassName);
-
+ processedTypemap.put(complexType.getQName(), fullyQualifiedClassName);
}
/**
* Handle any attribute
+ *
* @param metainf
*/
private void processAnyAttribute(BeanWriterMetaInfoHolder metainf) {
@@ -401,16 +433,17 @@
/**
* Process the attribute
+ *
* @param att
* @param metainf
*/
- public void processAttribute(XmlSchemaAttribute att,BeanWriterMetaInfoHolder metainf){
+ public void processAttribute(XmlSchemaAttribute att, BeanWriterMetaInfoHolder metainf) {
//for now we assume (!!!) that attributes refer to standard types only
QName schemaTypeName = att.getSchemaTypeName();
- if (baseSchemaTypeMap.containsKey(schemaTypeName)){
+ if (baseSchemaTypeMap.containsKey(schemaTypeName)) {
metainf.registerMapping(att.getQName(),
schemaTypeName,
- baseSchemaTypeMap.get(schemaTypeName).toString(),SchemaConstants.ATTRIBUTE_TYPE);
+ baseSchemaTypeMap.get(schemaTypeName).toString(), SchemaConstants.ATTRIBUTE_TYPE);
} else {
//this attribute refers to a custom type, probably one of the extended simple types.
//handle it here
@@ -418,7 +451,8 @@
}
/**
- * Process a particle- A particle may be a sequence,all or a choice
+ * Process a particle- A particle may be a sequence,all or a choice
+ *
* @param particle
* @param metainfHolder
* @throws SchemaCompilationException
@@ -426,19 +460,18 @@
private void processParticle(XmlSchemaParticle particle, //particle being processed
BeanWriterMetaInfoHolder metainfHolder // metainf holder
) throws SchemaCompilationException {
- if (particle instanceof XmlSchemaSequence ){
- XmlSchemaObjectCollection items = ((XmlSchemaSequence)particle).getItems();
- process(items, metainfHolder,true);
- }else if (particle instanceof XmlSchemaAll){
- XmlSchemaObjectCollection items = ((XmlSchemaAll)particle).getItems();
- process(items, metainfHolder,false);
- }else if (particle instanceof XmlSchemaChoice){
+ if (particle instanceof XmlSchemaSequence) {
+ XmlSchemaObjectCollection items = ((XmlSchemaSequence) particle).getItems();
+ process(items, metainfHolder, true);
+ } else if (particle instanceof XmlSchemaAll) {
+ XmlSchemaObjectCollection items = ((XmlSchemaAll) particle).getItems();
+ process(items, metainfHolder, false);
+ } else if (particle instanceof XmlSchemaChoice) {
//put the code here to handle the choice!
}
}
/**
- *
* @param items
* @param metainfHolder
* @param order
@@ -454,53 +487,53 @@
for (int i = 0; i < count; i++) {
XmlSchemaObject item = items.getItem(i);
- if (item instanceof XmlSchemaElement){
+ if (item instanceof XmlSchemaElement) {
//recursively process the element
XmlSchemaElement xsElt = (XmlSchemaElement) item;
boolean isArray = isArray(xsElt);
- processElement(xsElt,false,isArray); //we know for sure this is not an outer type
+ processElement(xsElt, false, isArray); //we know for sure this is not an outer type
processedElements.put(xsElt, (isArray) ? Boolean.TRUE : Boolean.FALSE);
- if (order){
+ if (order) {
//we need to keep the order of the elements. So push the elements to another
//hashmap with the order number
- elementOrderMap.put(xsElt,new Integer(i));
+ elementOrderMap.put(xsElt, new Integer(i));
}
- }else if (item instanceof XmlSchemaComplexContent){
+ } else if (item instanceof XmlSchemaComplexContent) {
// process the extension
- XmlSchemaContent content = ((XmlSchemaComplexContent)item).getContent();
- if (content instanceof XmlSchemaComplexContentExtension){
+ XmlSchemaContent content = ((XmlSchemaComplexContent) item).getContent();
+ if (content instanceof XmlSchemaComplexContentExtension) {
// handle the complex extension
- }else if (content instanceof XmlSchemaComplexContentRestriction){
+ } else if (content instanceof XmlSchemaComplexContentRestriction) {
//handle complex restriction
}
//handle xsd:any ! We place an OMElement in the generated class
- }else if (item instanceof XmlSchemaAny){
- processAny((XmlSchemaAny)item,metainfHolder);
+ } else if (item instanceof XmlSchemaAny) {
+ processAny((XmlSchemaAny) item, metainfHolder);
}
}
// loop through the processed items and add them to the matainf object
- Iterator processedElementsIterator= processedElements.keySet().iterator();
- while(processedElementsIterator.hasNext()){
- XmlSchemaElement elt = (XmlSchemaElement)processedElementsIterator.next();
+ Iterator processedElementsIterator = processedElements.keySet().iterator();
+ while (processedElementsIterator.hasNext()) {
+ XmlSchemaElement elt = (XmlSchemaElement) processedElementsIterator.next();
QName qName = elt.getQName();
- String clazzName = (String)processedElementMap.get(qName);
+ String clazzName = (String) processedElementMap.get(qName);
metainfHolder.registerMapping(qName,
elt.getSchemaTypeName()
- ,clazzName,
- ((Boolean)processedElements.get(elt)).booleanValue()?
- SchemaConstants.ANY_ARRAY_TYPE:
+ , clazzName,
+ ((Boolean) processedElements.get(elt)).booleanValue() ?
+ SchemaConstants.ANY_ARRAY_TYPE :
SchemaConstants.ELEMENT_TYPE);
//register the occurence counts
- metainfHolder.addMaxOccurs(qName,elt.getMaxOccurs());
- metainfHolder.addMinOccurs(qName,elt.getMinOccurs());
+ metainfHolder.addMaxOccurs(qName, elt.getMaxOccurs());
+ metainfHolder.addMinOccurs(qName, elt.getMinOccurs());
//we need the order to be preserved. So record the order also
- if (order){
+ if (order) {
//record the order in the metainf holder
Integer integer = (Integer) elementOrderMap.get(elt);
metainfHolder.registerQNameIndex(qName,
@@ -515,10 +548,11 @@
/**
* process the 'any'
+ *
* @param any
* @param metainf
*/
- private void processAny(XmlSchemaAny any,BeanWriterMetaInfoHolder metainf) {
+ private void processAny(XmlSchemaAny any, BeanWriterMetaInfoHolder metainf) {
//handle the minoccurs/maxoccurs here.
//However since the any element does not have a name
//we need to put a name here
@@ -531,26 +565,27 @@
/**
* Handle the simple content
+ *
* @param simpleType
*/
- private void processSimpleSchemaType(XmlSchemaElement xsElt,XmlSchemaSimpleType simpleType){
+ private void processSimpleSchemaType(XmlSchemaElement xsElt, XmlSchemaSimpleType simpleType) {
// handle the restriction
XmlSchemaSimpleTypeContent content = simpleType.getContent();
- if (content!=null){
- if (content instanceof XmlSchemaSimpleTypeRestriction){
+ if (content != null) {
+ if (content instanceof XmlSchemaSimpleTypeRestriction) {
XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content;
QName baseTypeName = restriction.getBaseTypeName();
//check whether the base type is one of the base schema types
- if (baseSchemaTypeMap.containsKey(baseTypeName)){
+ if (baseSchemaTypeMap.containsKey(baseTypeName)) {
//this is a basic xsd datatype. Populate the map and populate
//the mappings map
- String className =(String)baseSchemaTypeMap.get(baseTypeName);
- this.simpleTypesMap.put(simpleType.getQName(),className);
+ String className = (String) baseSchemaTypeMap.get(baseTypeName);
+ this.simpleTypesMap.put(simpleType.getQName(), className);
//set the old schema type QName and the new schema type QName
- this.changedTypeMap.put(simpleType.getQName(),baseTypeName);
- }else{
+ this.changedTypeMap.put(simpleType.getQName(), baseTypeName);
+ } else {
//recurse
- if (restriction.getBaseType()!= null){
+ if (restriction.getBaseType() != null) {
processSimpleSchemaType(xsElt, restriction.getBaseType());
}
//processSimpleSchemaType(xsElt, new XmlSchemaSimpleType());
@@ -569,18 +604,19 @@
* and maxOccurs counts. If Maxoccurs is greater than one (1) then the
* content is an array.
* Also no higher level element will have the maxOccurs greater than one
+ *
* @param particle
* @return
* @throws SchemaCompilationException
*/
- private boolean isArray(XmlSchemaParticle particle) throws SchemaCompilationException{
+ private boolean isArray(XmlSchemaParticle particle) throws SchemaCompilationException {
long minOccurs = particle.getMinOccurs();
long maxOccurs = particle.getMaxOccurs();
- if (maxOccurs < minOccurs){
+ if (maxOccurs < minOccurs) {
throw new SchemaCompilationException();
- }else{
- return (maxOccurs>1);
+ } else {
+ return (maxOccurs > 1);
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaConstants.java Wed Dec 21 19:38:20 2005
@@ -23,7 +23,6 @@
public class SchemaConstants {
-
public static final String URI_DEFAULT_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
public static final QName XSD_STRING = new QName(URI_DEFAULT_SCHEMA_XSD, "string");
public static final QName XSD_BOOLEAN = new QName(URI_DEFAULT_SCHEMA_XSD, "boolean");
@@ -85,5 +84,5 @@
public static final Integer ANY_ATTRIBUTE_TYPE = new Integer(3);
public static final Integer ANY_ARRAY_TYPE = new Integer(4);
-
+
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/XSD2Java.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/XSD2Java.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/XSD2Java.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/XSD2Java.java Wed Dec 21 19:38:20 2005
@@ -29,44 +29,44 @@
/**
* for now the arguments this main method accepts is the source schema and the output
* location
+ *
* @param args
*/
public static void main(String[] args) {
- if (args.length!=2){
+ if (args.length != 2) {
// printout the options
System.out.println("Argument1 - Source schema file name");
System.out.println("Argument2 - Output folder name");
- } else{
- compile(args[0],args[1]);
+ } else {
+ compile(args[0], args[1]);
}
}
/**
- *
* @param xsdName
* @param outputLocation
*/
- private static void compile(String xsdName,String outputLocation) {
+ private static void compile(String xsdName, String outputLocation) {
try {
//load the current Schema through a file
//first read the file into a DOM
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
- DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
+ DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
Document doc = builder.parse(new File(xsdName));
//now read it to a schema
- XmlSchemaCollection schemaCol = new XmlSchemaCollection();
- XmlSchema currentSchema = schemaCol.read(doc,null);
+ XmlSchemaCollection schemaCol = new XmlSchemaCollection();
+ XmlSchema currentSchema = schemaCol.read(doc, null);
File outputFolder = new File(outputLocation);
- if (outputFolder.exists()){
- if (outputFolder.isFile()) {
+ if (outputFolder.exists()) {
+ if (outputFolder.isFile()) {
throw new IOException("specified location is not a folder!");
}
- }else{
+ } else {
outputFolder.mkdirs();
}
@@ -81,7 +81,7 @@
compiler.compile(currentSchema);
} catch (Exception e) {
- throw new RuntimeException("Compiler caused an exception",e);
+ throw new RuntimeException("Compiler caused an exception", e);
}
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java Wed Dec 21 19:38:20 2005
@@ -1,8 +1,37 @@
package org.apache.axis2.schema.typemap;
+import org.apache.axis2.databinding.types.Day;
+import org.apache.axis2.databinding.types.Duration;
+import org.apache.axis2.databinding.types.Entities;
+import org.apache.axis2.databinding.types.Entity;
+import org.apache.axis2.databinding.types.HexBinary;
+import org.apache.axis2.databinding.types.IDRef;
+import org.apache.axis2.databinding.types.IDRefs;
+import org.apache.axis2.databinding.types.Id;
+import org.apache.axis2.databinding.types.Language;
+import org.apache.axis2.databinding.types.Month;
+import org.apache.axis2.databinding.types.MonthDay;
+import org.apache.axis2.databinding.types.NCName;
+import org.apache.axis2.databinding.types.NMToken;
+import org.apache.axis2.databinding.types.NMTokens;
+import org.apache.axis2.databinding.types.Name;
+import org.apache.axis2.databinding.types.NegativeInteger;
+import org.apache.axis2.databinding.types.NonNegativeInteger;
+import org.apache.axis2.databinding.types.NonPositiveInteger;
+import org.apache.axis2.databinding.types.NormalizedString;
+import org.apache.axis2.databinding.types.Notation;
+import org.apache.axis2.databinding.types.PositiveInteger;
+import org.apache.axis2.databinding.types.Time;
+import org.apache.axis2.databinding.types.Token;
+import org.apache.axis2.databinding.types.URI;
+import org.apache.axis2.databinding.types.UnsignedByte;
+import org.apache.axis2.databinding.types.UnsignedInt;
+import org.apache.axis2.databinding.types.UnsignedLong;
+import org.apache.axis2.databinding.types.UnsignedShort;
+import org.apache.axis2.databinding.types.Year;
+import org.apache.axis2.databinding.types.YearMonth;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.schema.SchemaConstants;
-import org.apache.axis2.databinding.types.*;
import javax.xml.namespace.QName;
import java.math.BigDecimal;
@@ -29,14 +58,14 @@
* Most code from Axis 1 Codebase
*/
public class JavaTypeMap implements TypeMap {
-
+
public Map getTypeMap() {
return typeMap;
}
- private static Map typeMap = new HashMap();
+ private static Map typeMap = new HashMap();
- static{
+ static {
// If SOAP 1.1 over the wire, map wrapper classes to XSD primitives.
addTypemapping(SchemaConstants.XSD_STRING, java.lang.String.class.getName());
@@ -55,11 +84,11 @@
//anytype is mapped to the OMElement instead of the java.lang.Object
addTypemapping(SchemaConstants.XSD_ANYTYPE, OMElement.class.getName());
- //Qname maps to jax rpc QName class
+ //Qname maps to jax rpc QName class
addTypemapping(SchemaConstants.XSD_QNAME, javax.xml.namespace.QName.class.getName());
//xsd Date is mapped to the java.util.date!
- addTypemapping(SchemaConstants.XSD_DATE, java.util.Date.class.getName());
+ addTypemapping(SchemaConstants.XSD_DATE, java.util.Date.class.getName());
// Mapping for xsd:time. Map to Axis type Time
addTypemapping(SchemaConstants.XSD_TIME, Time.class.getName());
@@ -74,7 +103,7 @@
addTypemapping(SchemaConstants.XSD_DAY, Day.class.getName());
addTypemapping(SchemaConstants.XSD_MONTHDAY, MonthDay.class.getName());
- // xsd:token
+ // xsd:token
addTypemapping(SchemaConstants.XSD_TOKEN, Token.class.getName());
// a xsd:normalizedString
@@ -96,7 +125,7 @@
addTypemapping(SchemaConstants.XSD_NONNEGATIVEINTEGER, NonNegativeInteger.class.getName());
// a xsd:negativeInteger
- addTypemapping(SchemaConstants.XSD_NEGATIVEINTEGER, NegativeInteger.class.getName() );
+ addTypemapping(SchemaConstants.XSD_NEGATIVEINTEGER, NegativeInteger.class.getName());
// a xsd:positiveInteger
addTypemapping(SchemaConstants.XSD_POSITIVEINTEGER, PositiveInteger.class.getName());
@@ -110,11 +139,11 @@
// a xsd:NCName
addTypemapping(SchemaConstants.XSD_NCNAME, NCName.class.getName());
- // a xsd:ID
+ // a xsd:ID
addTypemapping(SchemaConstants.XSD_ID, Id.class.getName());
// a xml:lang
- // addTypemapping(SchemaConstants.XML_LANG,Language.class.getName());
+ // addTypemapping(SchemaConstants.XML_LANG,Language.class.getName());
// a xsd:language
addTypemapping(SchemaConstants.XSD_LANGUAGE, Language.class.getName());
@@ -141,16 +170,16 @@
addTypemapping(SchemaConstants.XSD_IDREFS, IDRefs.class.getName());
// a xsd:Duration
- addTypemapping(SchemaConstants.XSD_DURATION, Duration.class.getName() );
+ addTypemapping(SchemaConstants.XSD_DURATION, Duration.class.getName());
// a xsd:anyURI
- addTypemapping(SchemaConstants.XSD_ANYURI, URI.class.getName() );
-
+ addTypemapping(SchemaConstants.XSD_ANYURI, URI.class.getName());
}
- private static void addTypemapping(QName name,String str) {
- typeMap.put( name,str);
+
+ private static void addTypemapping(QName name, String str) {
+ typeMap.put(name, str);
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/TypeMap.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/TypeMap.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/TypeMap.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/typemap/TypeMap.java Wed Dec 21 19:38:20 2005
@@ -19,7 +19,6 @@
/**
* This is a typemapper for the bean writer
- *
*/
public interface TypeMap {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/util/SchemaPropertyLoader.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/util/SchemaPropertyLoader.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/util/SchemaPropertyLoader.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/util/SchemaPropertyLoader.java Wed Dec 21 19:38:20 2005
@@ -1,8 +1,8 @@
package org.apache.axis2.schema.util;
+import org.apache.axis2.schema.SchemaCompiler;
import org.apache.axis2.schema.typemap.TypeMap;
import org.apache.axis2.schema.writer.BeanWriter;
-import org.apache.axis2.schema.SchemaCompiler;
import java.util.Properties;
/*
@@ -25,35 +25,35 @@
* Loads the properties for the schema compiler
*/
public class SchemaPropertyLoader {
- private static String unwrappedBeanTemplate = null;
- private static BeanWriter beanWriterInstance = null;
- private static TypeMap typeMapperInstance = null;
+ private static String unwrappedBeanTemplate = null;
+ private static BeanWriter beanWriterInstance = null;
+ private static TypeMap typeMapperInstance = null;
private static final String SCHEMA_COMPILER_PROPERTIES = "/org/apache/axis2/schema/schema-compile.properties";
private static final String BEAN_WRITER_KEY = "schema.bean.writer.class";
private static final String BEAN_WRITER_UNWRAPPED_TEMPLATE_KEY = "schema.bean.writer.template.wrapped";
private static final String BEAN_WRITER_TYPEMAP_KEY = "schema.bean.typemap";
- static{
+ static {
try {
//load the properties
Properties props = new Properties();
props.load(SchemaCompiler.class.getResourceAsStream(SCHEMA_COMPILER_PROPERTIES));
- String beanWriterClassName = props.getProperty(BEAN_WRITER_KEY);
- if (beanWriterClassName!=null){
- beanWriterInstance = (BeanWriter)Class.forName(beanWriterClassName).newInstance();
+ String beanWriterClassName = props.getProperty(BEAN_WRITER_KEY);
+ if (beanWriterClassName != null) {
+ beanWriterInstance = (BeanWriter) Class.forName(beanWriterClassName).newInstance();
}
- String typeMapperClassName = props.getProperty(BEAN_WRITER_TYPEMAP_KEY);
- if (typeMapperClassName !=null){
- typeMapperInstance = (TypeMap)Class.forName(typeMapperClassName).newInstance();
+ String typeMapperClassName = props.getProperty(BEAN_WRITER_TYPEMAP_KEY);
+ if (typeMapperClassName != null) {
+ typeMapperInstance = (TypeMap) Class.forName(typeMapperClassName).newInstance();
}
unwrappedBeanTemplate = props.getProperty(BEAN_WRITER_UNWRAPPED_TEMPLATE_KEY);
-
+
} catch (Exception e) {
- throw new RuntimeException(e);
+ throw new RuntimeException(e);
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/BeanWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/BeanWriter.java?rev=358474&r1=358473&r2=358474&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/BeanWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/writer/BeanWriter.java Wed Dec 21 19:38:20 2005
@@ -33,7 +33,8 @@
/**
- * Init the write with compiler options
+ * Init the write with compiler options
+ *
* @param options
* @throws IOException
*/
@@ -43,20 +44,22 @@
* Writes a wrapped class. This will have effect only if the CompilerOptions wrapclassses
* returns true
*/
- public void writeBatch() throws SchemaCompilationException;
+ public void writeBatch() throws SchemaCompilationException;
/**
* Write a complex type
+ *
* @param complexType
* @param typeMap
* @param metainf
* @return
* @throws SchemaCompilationException
*/
- public String write(XmlSchemaComplexType complexType, Map typeMap, BeanWriterMetaInfoHolder metainf) throws SchemaCompilationException ;
+ public String write(XmlSchemaComplexType complexType, Map typeMap, BeanWriterMetaInfoHolder metainf) throws SchemaCompilationException;
/**
* Write a element
+ *
* @param element
* @param typeMap
* @param metainf
@@ -66,9 +69,9 @@
public String write(XmlSchemaElement element, Map typeMap, BeanWriterMetaInfoHolder metainf) throws SchemaCompilationException;
-
/**
* Write a simple type
+ *
* @param simpleType
* @param typeMap
* @param metainf