Author: bimargulies Date: Sun Oct 17 02:30:53 2010 New Revision: 1023417 URL: http://svn.apache.org/viewvc?rev=1023417&view=rev Log: more tweaks in response to crosschecks
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java?rev=1023417&r1=1023416&r2=1023417&view=diff ============================================================================== --- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java (original) +++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeclaratorVisitor.java Sun Oct 17 02:30:53 2010 @@ -170,7 +170,7 @@ public class DeclaratorVisitor extends V private XmlSchemaSimpleType duplicateXmlSchemaSimpleType(Scope newScope) { XmlSchemaSimpleType oldSimpleType = (XmlSchemaSimpleType) getSchemaType(); - XmlSchemaSimpleType simpleType = new XmlSchemaSimpleType(schema, false); + XmlSchemaSimpleType simpleType = new XmlSchemaSimpleType(schema, oldSimpleType.isTopLevel()); simpleType.setContent(oldSimpleType.getContent()); simpleType.setName(newScope.toString()); return simpleType; Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java?rev=1023417&r1=1023416&r2=1023417&view=diff ============================================================================== --- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java (original) +++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java Sun Oct 17 02:30:53 2010 @@ -47,6 +47,7 @@ import org.apache.ws.commons.schema.XmlS import org.apache.ws.commons.schema.XmlSchemaExternal; import org.apache.ws.commons.schema.XmlSchemaImport; import org.apache.ws.commons.schema.XmlSchemaObject; +import org.apache.ws.commons.schema.XmlSchemaSimpleType; import org.apache.ws.commons.schema.XmlSchemaType; import org.apache.ws.commons.schema.utils.NamespaceMap; @@ -112,10 +113,7 @@ public class ObjectReferenceVisitor exte if (wsaSchema == null) { wsaSchema = new XmlSchema(ReferenceConstants.WSADDRESSING_NAMESPACE, schemas); } - /* - * TODO: This anonymous type is ridiculous, but I don't understand this code. - */ - XmlSchemaType objectType = new XmlSchemaType(wsaSchema, false) { }; + XmlSchemaType objectType = new XmlSchemaSimpleType(wsaSchema, true); objectType.setName(ReferenceConstants.WSADDRESSING_LOCAL_NAME); setSchemaType(objectType); @@ -209,7 +207,7 @@ public class ObjectReferenceVisitor exte if (wsaSchema == null) { wsaSchema = new XmlSchema(ReferenceConstants.WSADDRESSING_NAMESPACE, schemas); } - XmlSchemaType wsaType = new XmlSchemaType(wsaSchema, false) { }; + XmlSchemaType wsaType = new XmlSchemaSimpleType(wsaSchema, true); wsaType.setName(ReferenceConstants.WSADDRESSING_LOCAL_NAME); // Check to see if we have already defined an element for this reference type. If