1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java Thu Aug 08 10:10:38 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java Fri Aug 23 09:57:21 2013 +0100 1.3 @@ -74,21 +74,10 @@ 1.4 $localName = $__local; 1.5 $qname = $__qname; 1.6 switch($_ngcc_current_state) { 1.7 - case 6: 1.8 - { 1.9 - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.10 - $runtime.consumeAttribute($ai); 1.11 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.12 - } 1.13 - else { 1.14 - unexpectedEnterElement($__qname); 1.15 - } 1.16 - } 1.17 - break; 1.18 case 2: 1.19 { 1.20 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { 1.21 - NGCCHandler h = new annotation(this, super._source, $runtime, 610, null,AnnotationContext.SCHEMA); 1.22 + NGCCHandler h = new annotation(this, super._source, $runtime, 372, null,AnnotationContext.SCHEMA); 1.23 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.24 } 1.25 else { 1.26 @@ -97,6 +86,11 @@ 1.27 } 1.28 } 1.29 break; 1.30 + case 0: 1.31 + { 1.32 + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); 1.33 + } 1.34 + break; 1.35 case 7: 1.36 { 1.37 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) { 1.38 @@ -108,9 +102,15 @@ 1.39 } 1.40 } 1.41 break; 1.42 - case 0: 1.43 + case 6: 1.44 { 1.45 - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); 1.46 + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.47 + $runtime.consumeAttribute($ai); 1.48 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.49 + } 1.50 + else { 1.51 + unexpectedEnterElement($__qname); 1.52 + } 1.53 } 1.54 break; 1.55 default: 1.56 @@ -127,17 +127,6 @@ 1.57 $localName = $__local; 1.58 $qname = $__qname; 1.59 switch($_ngcc_current_state) { 1.60 - case 6: 1.61 - { 1.62 - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.63 - $runtime.consumeAttribute($ai); 1.64 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.65 - } 1.66 - else { 1.67 - unexpectedLeaveElement($__qname); 1.68 - } 1.69 - } 1.70 - break; 1.71 case 1: 1.72 { 1.73 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) { 1.74 @@ -161,6 +150,17 @@ 1.75 revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); 1.76 } 1.77 break; 1.78 + case 6: 1.79 + { 1.80 + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.81 + $runtime.consumeAttribute($ai); 1.82 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.83 + } 1.84 + else { 1.85 + unexpectedLeaveElement($__qname); 1.86 + } 1.87 + } 1.88 + break; 1.89 default: 1.90 { 1.91 unexpectedLeaveElement($__qname); 1.92 @@ -175,16 +175,6 @@ 1.93 $localName = $__local; 1.94 $qname = $__qname; 1.95 switch($_ngcc_current_state) { 1.96 - case 6: 1.97 - { 1.98 - if(($__uri.equals("") && $__local.equals("schemaLocation"))) { 1.99 - $_ngcc_current_state = 5; 1.100 - } 1.101 - else { 1.102 - unexpectedEnterAttribute($__qname); 1.103 - } 1.104 - } 1.105 - break; 1.106 case 2: 1.107 { 1.108 $_ngcc_current_state = 1; 1.109 @@ -196,6 +186,16 @@ 1.110 revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); 1.111 } 1.112 break; 1.113 + case 6: 1.114 + { 1.115 + if(($__uri.equals("") && $__local.equals("schemaLocation"))) { 1.116 + $_ngcc_current_state = 5; 1.117 + } 1.118 + else { 1.119 + unexpectedEnterAttribute($__qname); 1.120 + } 1.121 + } 1.122 + break; 1.123 default: 1.124 { 1.125 unexpectedEnterAttribute($__qname); 1.126 @@ -210,16 +210,6 @@ 1.127 $localName = $__local; 1.128 $qname = $__qname; 1.129 switch($_ngcc_current_state) { 1.130 - case 4: 1.131 - { 1.132 - if(($__uri.equals("") && $__local.equals("schemaLocation"))) { 1.133 - $_ngcc_current_state = 2; 1.134 - } 1.135 - else { 1.136 - unexpectedLeaveAttribute($__qname); 1.137 - } 1.138 - } 1.139 - break; 1.140 case 2: 1.141 { 1.142 $_ngcc_current_state = 1; 1.143 @@ -231,6 +221,16 @@ 1.144 revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); 1.145 } 1.146 break; 1.147 + case 4: 1.148 + { 1.149 + if(($__uri.equals("") && $__local.equals("schemaLocation"))) { 1.150 + $_ngcc_current_state = 2; 1.151 + } 1.152 + else { 1.153 + unexpectedLeaveAttribute($__qname); 1.154 + } 1.155 + } 1.156 + break; 1.157 default: 1.158 { 1.159 unexpectedLeaveAttribute($__qname); 1.160 @@ -242,6 +242,17 @@ 1.161 public void text(String $value) throws SAXException { 1.162 int $ai; 1.163 switch($_ngcc_current_state) { 1.164 + case 2: 1.165 + { 1.166 + $_ngcc_current_state = 1; 1.167 + $runtime.sendText(super._cookie, $value); 1.168 + } 1.169 + break; 1.170 + case 0: 1.171 + { 1.172 + revertToParentFromText(this, super._cookie, $value); 1.173 + } 1.174 + break; 1.175 case 5: 1.176 { 1.177 schemaLocation = $value; 1.178 @@ -256,23 +267,12 @@ 1.179 } 1.180 } 1.181 break; 1.182 - case 2: 1.183 - { 1.184 - $_ngcc_current_state = 1; 1.185 - $runtime.sendText(super._cookie, $value); 1.186 - } 1.187 - break; 1.188 - case 0: 1.189 - { 1.190 - revertToParentFromText(this, super._cookie, $value); 1.191 - } 1.192 - break; 1.193 } 1.194 } 1.195 1.196 public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { 1.197 switch($__cookie__) { 1.198 - case 610: 1.199 + case 372: 1.200 { 1.201 $_ngcc_current_state = 1; 1.202 }