You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by mv...@apache.org on 2006/11/06 11:09:07 UTC
svn commit: r471695 - in
/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl:
ArrayVisitor.java FixedVisitor.java TypesVisitor.java WSDLASTVisitor.java
Author: mvescovi
Date: Mon Nov 6 03:09:04 2006
New Revision: 471695
URL: http://svn.apache.org/viewvc?view=rev&rev=471695
Log:
Fixed checkstyle problems.
Modified:
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java
incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java?view=diff&rev=471695&r1=471694&r2=471695
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/ArrayVisitor.java Mon Nov 6 03:09:04 2006
@@ -25,7 +25,6 @@
import org.apache.schemas.yoko.bindings.corba.Anonarray;
import org.apache.schemas.yoko.bindings.corba.Array;
-import org.apache.schemas.yoko.bindings.corba.Sequence;
import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
import org.apache.ws.commons.schema.XmlSchema;
@@ -35,18 +34,12 @@
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaType;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-
-
import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.wsdl.CorbaTypeImpl;
public class ArrayVisitor extends VisitorBase {
-
+
private AST identifierNode;
-
+
public ArrayVisitor(Scope scope,
XmlSchemaCollection xmlSchemas,
XmlSchema xmlSchema,
@@ -55,64 +48,64 @@
super(scope, xmlSchemas, xmlSchema, typeMapRef);
identifierNode = identifierNodeRef;
}
-
+
public static boolean accept(AST node) {
if (node.getFirstChild() != null) {
return true;
}
return false;
}
-
+
public void visit(AST node) {
// <array_declarator> ::= <identifier> <fixed_array_size>+
// <fixed_array_size> ::= "[" <positive_int_const> "]"
-
+
AST fixedArraySizeNode = node.getFirstChild();
-
+
Integer id = new Integer(1);
while (fixedArraySizeNode != null) {
Long size = new Long(fixedArraySizeNode.toString());
System.out.println("Size: " + size.toString() + " Id: " + id.toString());
-
+
visit(fixedArraySizeNode);
-
+
String name = "_" + id.toString() + "_" + getScope().tail();
XmlSchemaType stype = generateSchemaArray(name, size);
Anonarray anonarray = generateCorbaAnonarray(name, size, stype.getQName());
-
+
// add schemaType
schema.getItems().add(stype);
schema.addType(stype);
// add corbaType
typeMap.getStructOrExceptionOrUnion().add(anonarray);
-
+
fixedArraySizeNode = fixedArraySizeNode.getNextSibling();
id++;
}
-
-
+
+
}
-
+
private XmlSchemaComplexType generateSchemaArray(String name, Long size) {
- XmlSchemaComplexType complexType = new XmlSchemaComplexType(schema);
- complexType.setName(name);
-
- XmlSchemaSequence sequence = new XmlSchemaSequence();
-
- XmlSchemaElement element = new XmlSchemaElement();
- element.setMinOccurs(size);
- element.setMaxOccurs(size);
- element.setName("item");
-
- sequence.getItems().add(element);
-
- complexType.setParticle(sequence);
+ XmlSchemaComplexType complexType = new XmlSchemaComplexType(schema);
+ complexType.setName(name);
- return complexType;
+ XmlSchemaSequence sequence = new XmlSchemaSequence();
+
+ XmlSchemaElement element = new XmlSchemaElement();
+ element.setMinOccurs(size);
+ element.setMaxOccurs(size);
+ element.setName("item");
+
+ sequence.getItems().add(element);
+
+ complexType.setParticle(sequence);
+
+ return complexType;
}
-
+
private Array generateCorbaArray(String name, Long size, QName type) {
Array array = new Array();
array.setQName(new QName(typeMap.getTargetNamespace(), name));
@@ -123,7 +116,7 @@
array.setType(type);
return array;
}
-
+
private Anonarray generateCorbaAnonarray(String name, Long size, QName type) {
Anonarray anonarray = new Anonarray();
anonarray.setQName(new QName(typeMap.getTargetNamespace(), name));
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java?view=diff&rev=471695&r1=471694&r2=471695
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/FixedVisitor.java Mon Nov 6 03:09:04 2006
@@ -84,7 +84,7 @@
//AST fixedNode = typedefNode.getFirstChild();
AST digitsNode = fixedNode.getFirstChild();
AST scaleNode = digitsNode.getNextSibling();
- AST identifierNode = fixedNode.getNextSibling();
+ //AST identifierNode = fixedNode.getNextSibling();
// validate digits and scale
Long digits = new Long(digitsNode.toString());
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java?view=diff&rev=471695&r1=471694&r2=471695
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java Mon Nov 6 03:09:04 2006
@@ -19,16 +19,6 @@
package org.apache.yoko.tools.processors.idl;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.schema.Schema;
-
-import javax.xml.namespace.QName;
-
import antlr.collections.AST;
import org.apache.schemas.yoko.bindings.corba.ArgType;
@@ -36,11 +26,7 @@
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.commons.schema.XmlSchemaSerializer;
public class TypesVisitor extends VisitorBase {
Modified: incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java?view=diff&rev=471695&r1=471694&r2=471695
==============================================================================
--- incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java (original)
+++ incubator/yoko/branches/idltowsdl_anon_refactor/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java Mon Nov 6 03:09:04 2006
@@ -92,7 +92,7 @@
}
try {
- attachSchema(definition);
+ attachSchema();
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -170,7 +170,7 @@
}
}
- private void attachSchema(Definition definition) throws Exception {
+ private void attachSchema() throws Exception {
Types types = definition.createTypes();
Schema wsdlSchema = (Schema)
definition.getExtensionRegistry().createExtension(Types.class,