1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java Thu Aug 08 10:10:38 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java Fri Aug 23 09:57:21 2013 +0100 1.3 @@ -85,18 +85,6 @@ 1.4 $localName = $__local; 1.5 $qname = $__qname; 1.6 switch($_ngcc_current_state) { 1.7 - case 2: 1.8 - { 1.9 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { 1.10 - NGCCHandler h = new annotation(this, super._source, $runtime, 418, null,AnnotationContext.SIMPLETYPE_DECL); 1.11 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.12 - } 1.13 - else { 1.14 - $_ngcc_current_state = 1; 1.15 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.16 - } 1.17 - } 1.18 - break; 1.19 case 12: 1.20 { 1.21 if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { 1.22 @@ -109,26 +97,10 @@ 1.23 } 1.24 } 1.25 break; 1.26 - case 0: 1.27 - { 1.28 - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); 1.29 - } 1.30 - break; 1.31 - case 11: 1.32 - { 1.33 - if(($ai = $runtime.getAttributeIndex("","value"))>=0) { 1.34 - $runtime.consumeAttribute($ai); 1.35 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.36 - } 1.37 - else { 1.38 - unexpectedEnterElement($__qname); 1.39 - } 1.40 - } 1.41 - break; 1.42 case 4: 1.43 { 1.44 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { 1.45 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 420, fa); 1.46 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 230, fa); 1.47 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.48 } 1.49 else { 1.50 @@ -148,6 +120,34 @@ 1.51 } 1.52 } 1.53 break; 1.54 + case 11: 1.55 + { 1.56 + if(($ai = $runtime.getAttributeIndex("","value"))>=0) { 1.57 + $runtime.consumeAttribute($ai); 1.58 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.59 + } 1.60 + else { 1.61 + unexpectedEnterElement($__qname); 1.62 + } 1.63 + } 1.64 + break; 1.65 + case 0: 1.66 + { 1.67 + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); 1.68 + } 1.69 + break; 1.70 + case 2: 1.71 + { 1.72 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { 1.73 + NGCCHandler h = new annotation(this, super._source, $runtime, 228, null,AnnotationContext.SIMPLETYPE_DECL); 1.74 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.75 + } 1.76 + else { 1.77 + $_ngcc_current_state = 1; 1.78 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.79 + } 1.80 + } 1.81 + break; 1.82 default: 1.83 { 1.84 unexpectedEnterElement($__qname); 1.85 @@ -162,44 +162,10 @@ 1.86 $localName = $__local; 1.87 $qname = $__qname; 1.88 switch($_ngcc_current_state) { 1.89 - case 2: 1.90 - { 1.91 - $_ngcc_current_state = 1; 1.92 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.93 - } 1.94 - break; 1.95 - case 1: 1.96 - { 1.97 - if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { 1.98 - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); 1.99 - $_ngcc_current_state = 0; 1.100 - action0(); 1.101 - } 1.102 - else { 1.103 - unexpectedLeaveElement($__qname); 1.104 - } 1.105 - } 1.106 - break; 1.107 - case 0: 1.108 - { 1.109 - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); 1.110 - } 1.111 - break; 1.112 - case 11: 1.113 - { 1.114 - if(($ai = $runtime.getAttributeIndex("","value"))>=0) { 1.115 - $runtime.consumeAttribute($ai); 1.116 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.117 - } 1.118 - else { 1.119 - unexpectedLeaveElement($__qname); 1.120 - } 1.121 - } 1.122 - break; 1.123 case 4: 1.124 { 1.125 if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { 1.126 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 420, fa); 1.127 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 230, fa); 1.128 spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); 1.129 } 1.130 else { 1.131 @@ -219,6 +185,40 @@ 1.132 } 1.133 } 1.134 break; 1.135 + case 1: 1.136 + { 1.137 + if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) { 1.138 + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); 1.139 + $_ngcc_current_state = 0; 1.140 + action0(); 1.141 + } 1.142 + else { 1.143 + unexpectedLeaveElement($__qname); 1.144 + } 1.145 + } 1.146 + break; 1.147 + case 11: 1.148 + { 1.149 + if(($ai = $runtime.getAttributeIndex("","value"))>=0) { 1.150 + $runtime.consumeAttribute($ai); 1.151 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.152 + } 1.153 + else { 1.154 + unexpectedLeaveElement($__qname); 1.155 + } 1.156 + } 1.157 + break; 1.158 + case 0: 1.159 + { 1.160 + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); 1.161 + } 1.162 + break; 1.163 + case 2: 1.164 + { 1.165 + $_ngcc_current_state = 1; 1.166 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.167 + } 1.168 + break; 1.169 default: 1.170 { 1.171 unexpectedLeaveElement($__qname); 1.172 @@ -233,15 +233,15 @@ 1.173 $localName = $__local; 1.174 $qname = $__qname; 1.175 switch($_ngcc_current_state) { 1.176 - case 2: 1.177 + case 5: 1.178 { 1.179 - $_ngcc_current_state = 1; 1.180 - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.181 - } 1.182 - break; 1.183 - case 0: 1.184 - { 1.185 - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); 1.186 + if(($__uri.equals("") && $__local.equals("fixed"))) { 1.187 + $_ngcc_current_state = 7; 1.188 + } 1.189 + else { 1.190 + $_ngcc_current_state = 4; 1.191 + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.192 + } 1.193 } 1.194 break; 1.195 case 11: 1.196 @@ -254,15 +254,15 @@ 1.197 } 1.198 } 1.199 break; 1.200 - case 5: 1.201 + case 0: 1.202 { 1.203 - if(($__uri.equals("") && $__local.equals("fixed"))) { 1.204 - $_ngcc_current_state = 7; 1.205 - } 1.206 - else { 1.207 - $_ngcc_current_state = 4; 1.208 - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.209 - } 1.210 + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); 1.211 + } 1.212 + break; 1.213 + case 2: 1.214 + { 1.215 + $_ngcc_current_state = 1; 1.216 + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.217 } 1.218 break; 1.219 default: 1.220 @@ -279,12 +279,27 @@ 1.221 $localName = $__local; 1.222 $qname = $__qname; 1.223 switch($_ngcc_current_state) { 1.224 - case 2: 1.225 + case 5: 1.226 { 1.227 - $_ngcc_current_state = 1; 1.228 + $_ngcc_current_state = 4; 1.229 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.230 } 1.231 break; 1.232 + case 9: 1.233 + { 1.234 + if(($__uri.equals("") && $__local.equals("value"))) { 1.235 + $_ngcc_current_state = 5; 1.236 + } 1.237 + else { 1.238 + unexpectedLeaveAttribute($__qname); 1.239 + } 1.240 + } 1.241 + break; 1.242 + case 0: 1.243 + { 1.244 + revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); 1.245 + } 1.246 + break; 1.247 case 6: 1.248 { 1.249 if(($__uri.equals("") && $__local.equals("fixed"))) { 1.250 @@ -295,24 +310,9 @@ 1.251 } 1.252 } 1.253 break; 1.254 - case 0: 1.255 + case 2: 1.256 { 1.257 - revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); 1.258 - } 1.259 - break; 1.260 - case 9: 1.261 - { 1.262 - if(($__uri.equals("") && $__local.equals("value"))) { 1.263 - $_ngcc_current_state = 5; 1.264 - } 1.265 - else { 1.266 - unexpectedLeaveAttribute($__qname); 1.267 - } 1.268 - } 1.269 - break; 1.270 - case 5: 1.271 - { 1.272 - $_ngcc_current_state = 4; 1.273 + $_ngcc_current_state = 1; 1.274 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.275 } 1.276 break; 1.277 @@ -327,15 +327,16 @@ 1.278 public void text(String $value) throws SAXException { 1.279 int $ai; 1.280 switch($_ngcc_current_state) { 1.281 - case 2: 1.282 + case 5: 1.283 { 1.284 - $_ngcc_current_state = 1; 1.285 - $runtime.sendText(super._cookie, $value); 1.286 - } 1.287 - break; 1.288 - case 0: 1.289 - { 1.290 - revertToParentFromText(result, super._cookie, $value); 1.291 + if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { 1.292 + $runtime.consumeAttribute($ai); 1.293 + $runtime.sendText(super._cookie, $value); 1.294 + } 1.295 + else { 1.296 + $_ngcc_current_state = 4; 1.297 + $runtime.sendText(super._cookie, $value); 1.298 + } 1.299 } 1.300 break; 1.301 case 7: 1.302 @@ -358,16 +359,15 @@ 1.303 $_ngcc_current_state = 9; 1.304 } 1.305 break; 1.306 - case 5: 1.307 + case 0: 1.308 { 1.309 - if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) { 1.310 - $runtime.consumeAttribute($ai); 1.311 - $runtime.sendText(super._cookie, $value); 1.312 - } 1.313 - else { 1.314 - $_ngcc_current_state = 4; 1.315 - $runtime.sendText(super._cookie, $value); 1.316 - } 1.317 + revertToParentFromText(result, super._cookie, $value); 1.318 + } 1.319 + break; 1.320 + case 2: 1.321 + { 1.322 + $_ngcc_current_state = 1; 1.323 + $runtime.sendText(super._cookie, $value); 1.324 } 1.325 break; 1.326 } 1.327 @@ -375,18 +375,18 @@ 1.328 1.329 public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { 1.330 switch($__cookie__) { 1.331 - case 418: 1.332 + case 230: 1.333 + { 1.334 + fa = ((ForeignAttributesImpl)$__result__); 1.335 + $_ngcc_current_state = 2; 1.336 + } 1.337 + break; 1.338 + case 228: 1.339 { 1.340 annotation = ((AnnotationImpl)$__result__); 1.341 $_ngcc_current_state = 1; 1.342 } 1.343 break; 1.344 - case 420: 1.345 - { 1.346 - fa = ((ForeignAttributesImpl)$__result__); 1.347 - $_ngcc_current_state = 2; 1.348 - } 1.349 - break; 1.350 } 1.351 } 1.352