Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b646446a5 -> d1ada3d16
Fix compile failure with Java6 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1ada3d1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1ada3d1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1ada3d1 Branch: refs/heads/3.0.x-fixes Commit: d1ada3d1607f9802b971b94a0bcbed464d302e4a Parents: b646446 Author: Daniel Kulp <[email protected]> Authored: Fri Dec 12 14:52:41 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Fri Dec 12 14:52:41 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/cxf/javascript/ParticleInfo.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d1ada3d1/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java index 6fee422..7f88ae9 100644 --- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java +++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/ParticleInfo.java @@ -31,7 +31,6 @@ import org.apache.cxf.common.xmlschema.SchemaCollection; import org.apache.cxf.common.xmlschema.XmlSchemaUtils; import org.apache.ws.commons.schema.XmlSchema; import org.apache.ws.commons.schema.XmlSchemaChoice; -import org.apache.ws.commons.schema.XmlSchemaChoiceMember; import org.apache.ws.commons.schema.XmlSchemaElement; import org.apache.ws.commons.schema.XmlSchemaObject; import org.apache.ws.commons.schema.XmlSchemaParticle; @@ -166,11 +165,10 @@ public final class ParticleInfo implements ItemInfo { throw new UnsupportedConstruct(message.toString()); } - elementInfo.children = new LinkedList<>(); + elementInfo.children = new LinkedList<ParticleInfo>(); - List<XmlSchemaChoiceMember> items = choice.getItems(); - for (XmlSchemaChoiceMember item : items) { - XmlSchemaObject schemaObject = (XmlSchemaObject)item; + List<XmlSchemaObject> items = choice.getItems(); + for (XmlSchemaObject schemaObject : items) { ParticleInfo childParticle = ParticleInfo.forLocalItem(schemaObject, currentSchema, schemaCollection, prefixAccumulator, contextName);
