Author: tfennelly Date: 2009-12-17 10:58:30 -0500 (Thu, 17 Dec 2009) New Revision: 19425 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilderTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-5515 XSDModelBuilder not getting XSD reference type names from the right place Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java 2009-12-17 15:52:05 UTC (rev 19424) +++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java 2009-12-17 15:58:30 UTC (rev 19425) @@ -186,7 +186,6 @@ } private void expand(XSDElementDeclaration elementDeclaration, int minOccurs, int maxOccurs, Node parent, Document document) { - String elementName = elementDeclaration.getName(); XSDTypeDefinition typeDef; if(elementDeclaration.isElementDeclarationReference()) { @@ -196,8 +195,9 @@ typeDef = elementDeclaration.getTypeDefinition(); } + String elementName = elementDeclaration.getName(); if(elementDeclaration.isAbstract()) { - if(typeDef == null) { + if(typeDef != null) { addTypeImpls(typeDef, minOccurs, maxOccurs, parent, document); } return; Modified: trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilderTest.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilderTest.java 2009-12-17 15:52:05 UTC (rev 19424) +++ trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilderTest.java 2009-12-17 15:58:30 UTC (rev 19425) @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; +import java.io.StringWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -148,7 +149,11 @@ builder.setRootElementName("smooks-resource-list"); XMLFreeMarkerTemplateBuilder templateBuilder = new XMLFreeMarkerTemplateBuilder(builder); Document document = templateBuilder.getModel(); - checkNodeName(document.getDocumentElement()); + + StringWriter writer = new StringWriter(); + XmlUtil.serialize(document, true, writer); + System.out.println(writer); + //checkNodeName(document.getDocumentElement()); } private void checkNodeName(Node node) {