1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Thu Aug 08 10:10:38 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java Fri Aug 23 09:57:21 2013 +0100 1.3 @@ -78,26 +78,10 @@ 1.4 $localName = $__local; 1.5 $qname = $__qname; 1.6 switch($_ngcc_current_state) { 1.7 - case 0: 1.8 - { 1.9 - revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); 1.10 - } 1.11 - break; 1.12 - case 15: 1.13 - { 1.14 - if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) { 1.15 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); 1.16 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.17 - } 1.18 - else { 1.19 - unexpectedEnterElement($__qname); 1.20 - } 1.21 - } 1.22 - break; 1.23 case 2: 1.24 { 1.25 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) { 1.26 - NGCCHandler h = new annotation(this, super._source, $runtime, 539, null,AnnotationContext.NOTATION); 1.27 + NGCCHandler h = new annotation(this, super._source, $runtime, 209, null,AnnotationContext.NOTATION); 1.28 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.29 } 1.30 else { 1.31 @@ -106,41 +90,6 @@ 1.32 } 1.33 } 1.34 break; 1.35 - case 4: 1.36 - { 1.37 - if(($ai = $runtime.getAttributeIndex("","system"))>=0) { 1.38 - $runtime.consumeAttribute($ai); 1.39 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.40 - } 1.41 - else { 1.42 - $_ngcc_current_state = 2; 1.43 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.44 - } 1.45 - } 1.46 - break; 1.47 - case 14: 1.48 - { 1.49 - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { 1.50 - $runtime.consumeAttribute($ai); 1.51 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.52 - } 1.53 - else { 1.54 - unexpectedEnterElement($__qname); 1.55 - } 1.56 - } 1.57 - break; 1.58 - case 8: 1.59 - { 1.60 - if(($ai = $runtime.getAttributeIndex("","public"))>=0) { 1.61 - $runtime.consumeAttribute($ai); 1.62 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.63 - } 1.64 - else { 1.65 - $_ngcc_current_state = 4; 1.66 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.67 - } 1.68 - } 1.69 - break; 1.70 case 16: 1.71 { 1.72 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { 1.73 @@ -153,6 +102,57 @@ 1.74 } 1.75 } 1.76 break; 1.77 + case 14: 1.78 + { 1.79 + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { 1.80 + $runtime.consumeAttribute($ai); 1.81 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.82 + } 1.83 + else { 1.84 + unexpectedEnterElement($__qname); 1.85 + } 1.86 + } 1.87 + break; 1.88 + case 15: 1.89 + { 1.90 + if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) { 1.91 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); 1.92 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.93 + } 1.94 + else { 1.95 + unexpectedEnterElement($__qname); 1.96 + } 1.97 + } 1.98 + break; 1.99 + case 4: 1.100 + { 1.101 + if(($ai = $runtime.getAttributeIndex("","system"))>=0) { 1.102 + $runtime.consumeAttribute($ai); 1.103 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.104 + } 1.105 + else { 1.106 + $_ngcc_current_state = 2; 1.107 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.108 + } 1.109 + } 1.110 + break; 1.111 + case 8: 1.112 + { 1.113 + if(($ai = $runtime.getAttributeIndex("","public"))>=0) { 1.114 + $runtime.consumeAttribute($ai); 1.115 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.116 + } 1.117 + else { 1.118 + $_ngcc_current_state = 4; 1.119 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.120 + } 1.121 + } 1.122 + break; 1.123 + case 0: 1.124 + { 1.125 + revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs); 1.126 + } 1.127 + break; 1.128 default: 1.129 { 1.130 unexpectedEnterElement($__qname); 1.131 @@ -167,16 +167,17 @@ 1.132 $localName = $__local; 1.133 $qname = $__qname; 1.134 switch($_ngcc_current_state) { 1.135 - case 0: 1.136 + case 2: 1.137 { 1.138 - revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); 1.139 + $_ngcc_current_state = 1; 1.140 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.141 } 1.142 break; 1.143 - case 1: 1.144 + case 14: 1.145 { 1.146 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { 1.147 - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); 1.148 - $_ngcc_current_state = 0; 1.149 + if(($ai = $runtime.getAttributeIndex("","name"))>=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 @@ -186,7 +187,7 @@ 1.156 case 15: 1.157 { 1.158 if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")))) { 1.159 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); 1.160 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); 1.161 spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); 1.162 } 1.163 else { 1.164 @@ -194,12 +195,6 @@ 1.165 } 1.166 } 1.167 break; 1.168 - case 2: 1.169 - { 1.170 - $_ngcc_current_state = 1; 1.171 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.172 - } 1.173 - break; 1.174 case 4: 1.175 { 1.176 if(($ai = $runtime.getAttributeIndex("","system"))>=0) { 1.177 @@ -212,11 +207,11 @@ 1.178 } 1.179 } 1.180 break; 1.181 - case 14: 1.182 + case 1: 1.183 { 1.184 - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { 1.185 - $runtime.consumeAttribute($ai); 1.186 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.187 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) { 1.188 + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); 1.189 + $_ngcc_current_state = 0; 1.190 } 1.191 else { 1.192 unexpectedLeaveElement($__qname); 1.193 @@ -235,6 +230,11 @@ 1.194 } 1.195 } 1.196 break; 1.197 + case 0: 1.198 + { 1.199 + revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname); 1.200 + } 1.201 + break; 1.202 default: 1.203 { 1.204 unexpectedLeaveElement($__qname); 1.205 @@ -249,26 +249,31 @@ 1.206 $localName = $__local; 1.207 $qname = $__qname; 1.208 switch($_ngcc_current_state) { 1.209 - case 0: 1.210 + case 2: 1.211 { 1.212 - revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); 1.213 + $_ngcc_current_state = 1; 1.214 + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.215 } 1.216 break; 1.217 - case 15: 1.218 + case 14: 1.219 { 1.220 if(($__uri.equals("") && $__local.equals("name"))) { 1.221 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); 1.222 - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); 1.223 + $_ngcc_current_state = 13; 1.224 } 1.225 else { 1.226 unexpectedEnterAttribute($__qname); 1.227 } 1.228 } 1.229 break; 1.230 - case 2: 1.231 + case 15: 1.232 { 1.233 - $_ngcc_current_state = 1; 1.234 - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.235 + if(($__uri.equals("") && $__local.equals("name"))) { 1.236 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); 1.237 + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); 1.238 + } 1.239 + else { 1.240 + unexpectedEnterAttribute($__qname); 1.241 + } 1.242 } 1.243 break; 1.244 case 4: 1.245 @@ -282,16 +287,6 @@ 1.246 } 1.247 } 1.248 break; 1.249 - case 14: 1.250 - { 1.251 - if(($__uri.equals("") && $__local.equals("name"))) { 1.252 - $_ngcc_current_state = 13; 1.253 - } 1.254 - else { 1.255 - unexpectedEnterAttribute($__qname); 1.256 - } 1.257 - } 1.258 - break; 1.259 case 8: 1.260 { 1.261 if(($__uri.equals("") && $__local.equals("public"))) { 1.262 @@ -303,6 +298,11 @@ 1.263 } 1.264 } 1.265 break; 1.266 + case 0: 1.267 + { 1.268 + revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); 1.269 + } 1.270 + break; 1.271 default: 1.272 { 1.273 unexpectedEnterAttribute($__qname); 1.274 @@ -317,39 +317,12 @@ 1.275 $localName = $__local; 1.276 $qname = $__qname; 1.277 switch($_ngcc_current_state) { 1.278 - case 0: 1.279 - { 1.280 - revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); 1.281 - } 1.282 - break; 1.283 case 2: 1.284 { 1.285 $_ngcc_current_state = 1; 1.286 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.287 } 1.288 break; 1.289 - case 4: 1.290 - { 1.291 - $_ngcc_current_state = 2; 1.292 - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.293 - } 1.294 - break; 1.295 - case 5: 1.296 - { 1.297 - if(($__uri.equals("") && $__local.equals("system"))) { 1.298 - $_ngcc_current_state = 2; 1.299 - } 1.300 - else { 1.301 - unexpectedLeaveAttribute($__qname); 1.302 - } 1.303 - } 1.304 - break; 1.305 - case 8: 1.306 - { 1.307 - $_ngcc_current_state = 4; 1.308 - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.309 - } 1.310 - break; 1.311 case 9: 1.312 { 1.313 if(($__uri.equals("") && $__local.equals("public"))) { 1.314 @@ -370,6 +343,33 @@ 1.315 } 1.316 } 1.317 break; 1.318 + case 5: 1.319 + { 1.320 + if(($__uri.equals("") && $__local.equals("system"))) { 1.321 + $_ngcc_current_state = 2; 1.322 + } 1.323 + else { 1.324 + unexpectedLeaveAttribute($__qname); 1.325 + } 1.326 + } 1.327 + break; 1.328 + case 4: 1.329 + { 1.330 + $_ngcc_current_state = 2; 1.331 + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.332 + } 1.333 + break; 1.334 + case 8: 1.335 + { 1.336 + $_ngcc_current_state = 4; 1.337 + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.338 + } 1.339 + break; 1.340 + case 0: 1.341 + { 1.342 + revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname); 1.343 + } 1.344 + break; 1.345 default: 1.346 { 1.347 unexpectedLeaveAttribute($__qname); 1.348 @@ -381,9 +381,10 @@ 1.349 public void text(String $value) throws SAXException { 1.350 int $ai; 1.351 switch($_ngcc_current_state) { 1.352 - case 0: 1.353 + case 2: 1.354 { 1.355 - revertToParentFromText(makeResult(), super._cookie, $value); 1.356 + $_ngcc_current_state = 1; 1.357 + $runtime.sendText(super._cookie, $value); 1.358 } 1.359 break; 1.360 case 10: 1.361 @@ -392,26 +393,22 @@ 1.362 $_ngcc_current_state = 9; 1.363 } 1.364 break; 1.365 + case 14: 1.366 + { 1.367 + if(($ai = $runtime.getAttributeIndex("","name"))>=0) { 1.368 + $runtime.consumeAttribute($ai); 1.369 + $runtime.sendText(super._cookie, $value); 1.370 + } 1.371 + } 1.372 + break; 1.373 case 15: 1.374 { 1.375 if(($ai = $runtime.getAttributeIndex("","name"))>=0) { 1.376 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null); 1.377 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 224, null); 1.378 spawnChildFromText(h, $value); 1.379 } 1.380 } 1.381 break; 1.382 - case 2: 1.383 - { 1.384 - $_ngcc_current_state = 1; 1.385 - $runtime.sendText(super._cookie, $value); 1.386 - } 1.387 - break; 1.388 - case 13: 1.389 - { 1.390 - name = $value; 1.391 - $_ngcc_current_state = 12; 1.392 - } 1.393 - break; 1.394 case 4: 1.395 { 1.396 if(($ai = $runtime.getAttributeIndex("","system"))>=0) { 1.397 @@ -424,20 +421,6 @@ 1.398 } 1.399 } 1.400 break; 1.401 - case 6: 1.402 - { 1.403 - sys = $value; 1.404 - $_ngcc_current_state = 5; 1.405 - } 1.406 - break; 1.407 - case 14: 1.408 - { 1.409 - if(($ai = $runtime.getAttributeIndex("","name"))>=0) { 1.410 - $runtime.consumeAttribute($ai); 1.411 - $runtime.sendText(super._cookie, $value); 1.412 - } 1.413 - } 1.414 - break; 1.415 case 8: 1.416 { 1.417 if(($ai = $runtime.getAttributeIndex("","public"))>=0) { 1.418 @@ -450,23 +433,40 @@ 1.419 } 1.420 } 1.421 break; 1.422 + case 13: 1.423 + { 1.424 + name = $value; 1.425 + $_ngcc_current_state = 12; 1.426 + } 1.427 + break; 1.428 + case 6: 1.429 + { 1.430 + sys = $value; 1.431 + $_ngcc_current_state = 5; 1.432 + } 1.433 + break; 1.434 + case 0: 1.435 + { 1.436 + revertToParentFromText(makeResult(), super._cookie, $value); 1.437 + } 1.438 + break; 1.439 } 1.440 } 1.441 1.442 public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { 1.443 switch($__cookie__) { 1.444 - case 554: 1.445 + case 209: 1.446 + { 1.447 + ann = ((AnnotationImpl)$__result__); 1.448 + $_ngcc_current_state = 1; 1.449 + } 1.450 + break; 1.451 + case 224: 1.452 { 1.453 fa = ((ForeignAttributesImpl)$__result__); 1.454 $_ngcc_current_state = 14; 1.455 } 1.456 break; 1.457 - case 539: 1.458 - { 1.459 - ann = ((AnnotationImpl)$__result__); 1.460 - $_ngcc_current_state = 1; 1.461 - } 1.462 - break; 1.463 } 1.464 } 1.465