--- old/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java 2013-08-20 00:51:33.400042122 +0200 +++ new/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java 2013-08-20 00:51:33.336039288 +0200 @@ -83,35 +83,35 @@ $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: + case 1: { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 1: + case 0: { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); + } + break; + case 5: + { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } else { - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); } } break; - case 0: - { - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); - } - break; default: { unexpectedEnterElement($__qname); @@ -126,35 +126,35 @@ $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: + case 1: { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 1: + case 0: { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); + } + break; + case 5: + { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } else { - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); } } break; - case 0: - { - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); - } - break; default: { unexpectedLeaveElement($__qname); @@ -169,17 +169,6 @@ $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: - { - if(($__uri.equals("") && $__local.equals("maxOccurs"))) { - $_ngcc_current_state = 7; - } - else { - $_ngcc_current_state = 1; - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); - } - } - break; case 1: { if(($__uri.equals("") && $__local.equals("minOccurs"))) { @@ -196,6 +185,17 @@ revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; + case 5: + { + if(($__uri.equals("") && $__local.equals("maxOccurs"))) { + $_ngcc_current_state = 7; + } + else { + $_ngcc_current_state = 1; + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); + } + } + break; default: { unexpectedEnterAttribute($__qname); @@ -210,26 +210,15 @@ $localName = $__local; $qname = $__qname; switch($_ngcc_current_state) { - case 5: - { - $_ngcc_current_state = 1; - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); - } - break; case 1: { $_ngcc_current_state = 0; $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); } break; - case 6: + case 0: { - if(($__uri.equals("") && $__local.equals("maxOccurs"))) { - $_ngcc_current_state = 1; - } - else { - unexpectedLeaveAttribute($__qname); - } + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); } break; case 2: @@ -242,9 +231,20 @@ } } break; - case 0: + case 5: { - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); + $_ngcc_current_state = 1; + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); + } + break; + case 6: + { + if(($__uri.equals("") && $__local.equals("maxOccurs"))) { + $_ngcc_current_state = 1; + } + else { + unexpectedLeaveAttribute($__qname); + } } break; default: @@ -258,35 +258,42 @@ public void text(String $value) throws SAXException { int $ai; switch($_ngcc_current_state) { - case 5: + case 1: { - if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { + if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 1; + $_ngcc_current_state = 0; $runtime.sendText(super._cookie, $value); } } break; - case 1: + case 0: { - if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) { + revertToParentFromText(this, super._cookie, $value); + } + break; + case 3: + { + v = $value; + $_ngcc_current_state = 2; + action0(); + } + break; + case 5: + { + if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) { $runtime.consumeAttribute($ai); $runtime.sendText(super._cookie, $value); } else { - $_ngcc_current_state = 0; + $_ngcc_current_state = 1; $runtime.sendText(super._cookie, $value); } } break; - case 0: - { - revertToParentFromText(this, super._cookie, $value); - } - break; case 7: { if($value.equals("unbounded")) { @@ -300,13 +307,6 @@ } } break; - case 3: - { - v = $value; - $_ngcc_current_state = 2; - action0(); - } - break; } } @@ -316,7 +316,7 @@ } public boolean accepted() { - return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 5)))); + return((($_ngcc_current_state == 5) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 1)))); }