1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java Thu Aug 08 10:10:38 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java Fri Aug 23 09:57:21 2013 +0100
1.3 @@ -118,30 +118,81 @@
1.4 $localName = $__local;
1.5 $qname = $__qname;
1.6 switch($_ngcc_current_state) {
1.7 - case 2:
1.8 + case 0:
1.9 + {
1.10 + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
1.11 + }
1.12 + break;
1.13 + case 1:
1.14 {
1.15 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
1.16 - NGCCHandler h = new annotation(this, super._source, $runtime, 581, null,AnnotationContext.SCHEMA);
1.17 + NGCCHandler h = new annotation(this, super._source, $runtime, 684, null,AnnotationContext.SCHEMA);
1.18 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.19 }
1.20 else {
1.21 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
1.22 - NGCCHandler h = new simpleType(this, super._source, $runtime, 582);
1.23 + NGCCHandler h = new simpleType(this, super._source, $runtime, 685);
1.24 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.25 }
1.26 else {
1.27 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
1.28 - NGCCHandler h = new complexType(this, super._source, $runtime, 583);
1.29 + NGCCHandler h = new complexType(this, super._source, $runtime, 686);
1.30 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.31 }
1.32 else {
1.33 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
1.34 - NGCCHandler h = new group(this, super._source, $runtime, 584);
1.35 + NGCCHandler h = new group(this, super._source, $runtime, 687);
1.36 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.37 }
1.38 else {
1.39 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
1.40 - NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 585);
1.41 + NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 688);
1.42 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.43 + }
1.44 + else {
1.45 + unexpectedEnterElement($__qname);
1.46 + }
1.47 + }
1.48 + }
1.49 + }
1.50 + }
1.51 + }
1.52 + break;
1.53 + case 14:
1.54 + {
1.55 + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
1.56 + $runtime.consumeAttribute($ai);
1.57 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
1.58 + }
1.59 + else {
1.60 + unexpectedEnterElement($__qname);
1.61 + }
1.62 + }
1.63 + break;
1.64 + case 2:
1.65 + {
1.66 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
1.67 + NGCCHandler h = new annotation(this, super._source, $runtime, 689, null,AnnotationContext.SCHEMA);
1.68 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.69 + }
1.70 + else {
1.71 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
1.72 + NGCCHandler h = new simpleType(this, super._source, $runtime, 690);
1.73 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.74 + }
1.75 + else {
1.76 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
1.77 + NGCCHandler h = new complexType(this, super._source, $runtime, 691);
1.78 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.79 + }
1.80 + else {
1.81 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
1.82 + NGCCHandler h = new group(this, super._source, $runtime, 692);
1.83 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.84 + }
1.85 + else {
1.86 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
1.87 + NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 693);
1.88 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.89 }
1.90 else {
1.91 @@ -165,57 +216,6 @@
1.92 }
1.93 }
1.94 break;
1.95 - case 0:
1.96 - {
1.97 - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
1.98 - }
1.99 - break;
1.100 - case 14:
1.101 - {
1.102 - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
1.103 - $runtime.consumeAttribute($ai);
1.104 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
1.105 - }
1.106 - else {
1.107 - unexpectedEnterElement($__qname);
1.108 - }
1.109 - }
1.110 - break;
1.111 - case 1:
1.112 - {
1.113 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
1.114 - NGCCHandler h = new annotation(this, super._source, $runtime, 576, null,AnnotationContext.SCHEMA);
1.115 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.116 - }
1.117 - else {
1.118 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
1.119 - NGCCHandler h = new simpleType(this, super._source, $runtime, 577);
1.120 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.121 - }
1.122 - else {
1.123 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
1.124 - NGCCHandler h = new complexType(this, super._source, $runtime, 578);
1.125 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.126 - }
1.127 - else {
1.128 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
1.129 - NGCCHandler h = new group(this, super._source, $runtime, 579);
1.130 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.131 - }
1.132 - else {
1.133 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
1.134 - NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 580);
1.135 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
1.136 - }
1.137 - else {
1.138 - unexpectedEnterElement($__qname);
1.139 - }
1.140 - }
1.141 - }
1.142 - }
1.143 - }
1.144 - }
1.145 - break;
1.146 default:
1.147 {
1.148 unexpectedEnterElement($__qname);
1.149 @@ -230,17 +230,22 @@
1.150 $localName = $__local;
1.151 $qname = $__qname;
1.152 switch($_ngcc_current_state) {
1.153 - case 2:
1.154 - {
1.155 - $_ngcc_current_state = 1;
1.156 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
1.157 - }
1.158 - break;
1.159 case 0:
1.160 {
1.161 revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
1.162 }
1.163 break;
1.164 + case 1:
1.165 + {
1.166 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
1.167 + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
1.168 + $_ngcc_current_state = 0;
1.169 + }
1.170 + else {
1.171 + unexpectedLeaveElement($__qname);
1.172 + }
1.173 + }
1.174 + break;
1.175 case 14:
1.176 {
1.177 if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
1.178 @@ -252,15 +257,10 @@
1.179 }
1.180 }
1.181 break;
1.182 - case 1:
1.183 + case 2:
1.184 {
1.185 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
1.186 - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
1.187 - $_ngcc_current_state = 0;
1.188 - }
1.189 - else {
1.190 - unexpectedLeaveElement($__qname);
1.191 - }
1.192 + $_ngcc_current_state = 1;
1.193 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
1.194 }
1.195 break;
1.196 default:
1.197 @@ -277,12 +277,6 @@
1.198 $localName = $__local;
1.199 $qname = $__qname;
1.200 switch($_ngcc_current_state) {
1.201 - case 2:
1.202 - {
1.203 - $_ngcc_current_state = 1;
1.204 - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
1.205 - }
1.206 - break;
1.207 case 0:
1.208 {
1.209 revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
1.210 @@ -298,6 +292,12 @@
1.211 }
1.212 }
1.213 break;
1.214 + case 2:
1.215 + {
1.216 + $_ngcc_current_state = 1;
1.217 + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
1.218 + }
1.219 + break;
1.220 default:
1.221 {
1.222 unexpectedEnterAttribute($__qname);
1.223 @@ -312,10 +312,9 @@
1.224 $localName = $__local;
1.225 $qname = $__qname;
1.226 switch($_ngcc_current_state) {
1.227 - case 2:
1.228 + case 0:
1.229 {
1.230 - $_ngcc_current_state = 1;
1.231 - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
1.232 + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
1.233 }
1.234 break;
1.235 case 12:
1.236 @@ -328,9 +327,10 @@
1.237 }
1.238 }
1.239 break;
1.240 - case 0:
1.241 + case 2:
1.242 {
1.243 - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
1.244 + $_ngcc_current_state = 1;
1.245 + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
1.246 }
1.247 break;
1.248 default:
1.249 @@ -344,6 +344,19 @@
1.250 public void text(String $value) throws SAXException {
1.251 int $ai;
1.252 switch($_ngcc_current_state) {
1.253 + case 0:
1.254 + {
1.255 + revertToParentFromText(this, super._cookie, $value);
1.256 + }
1.257 + break;
1.258 + case 14:
1.259 + {
1.260 + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
1.261 + $runtime.consumeAttribute($ai);
1.262 + $runtime.sendText(super._cookie, $value);
1.263 + }
1.264 + }
1.265 + break;
1.266 case 2:
1.267 {
1.268 $_ngcc_current_state = 1;
1.269 @@ -357,84 +370,71 @@
1.270 action4();
1.271 }
1.272 break;
1.273 - case 0:
1.274 - {
1.275 - revertToParentFromText(this, super._cookie, $value);
1.276 - }
1.277 - break;
1.278 - case 14:
1.279 - {
1.280 - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
1.281 - $runtime.consumeAttribute($ai);
1.282 - $runtime.sendText(super._cookie, $value);
1.283 - }
1.284 - }
1.285 - break;
1.286 }
1.287 }
1.288
1.289 public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
1.290 switch($__cookie__) {
1.291 - case 581:
1.292 + case 689:
1.293 {
1.294 $_ngcc_current_state = 1;
1.295 }
1.296 break;
1.297 - case 582:
1.298 + case 690:
1.299 {
1.300 newSt = ((SimpleTypeImpl)$__result__);
1.301 action3();
1.302 $_ngcc_current_state = 1;
1.303 }
1.304 break;
1.305 - case 583:
1.306 + case 691:
1.307 {
1.308 newCt = ((ComplexTypeImpl)$__result__);
1.309 action2();
1.310 $_ngcc_current_state = 1;
1.311 }
1.312 break;
1.313 - case 584:
1.314 + case 692:
1.315 {
1.316 newGrp = ((ModelGroupDeclImpl)$__result__);
1.317 action1();
1.318 $_ngcc_current_state = 1;
1.319 }
1.320 break;
1.321 - case 585:
1.322 + case 693:
1.323 {
1.324 newAg = ((AttGroupDeclImpl)$__result__);
1.325 action0();
1.326 $_ngcc_current_state = 1;
1.327 }
1.328 break;
1.329 - case 576:
1.330 + case 684:
1.331 {
1.332 $_ngcc_current_state = 1;
1.333 }
1.334 break;
1.335 - case 577:
1.336 + case 685:
1.337 {
1.338 newSt = ((SimpleTypeImpl)$__result__);
1.339 action3();
1.340 $_ngcc_current_state = 1;
1.341 }
1.342 break;
1.343 - case 578:
1.344 + case 686:
1.345 {
1.346 newCt = ((ComplexTypeImpl)$__result__);
1.347 action2();
1.348 $_ngcc_current_state = 1;
1.349 }
1.350 break;
1.351 - case 579:
1.352 + case 687:
1.353 {
1.354 newGrp = ((ModelGroupDeclImpl)$__result__);
1.355 action1();
1.356 $_ngcc_current_state = 1;
1.357 }
1.358 break;
1.359 - case 580:
1.360 + case 688:
1.361 {
1.362 newAg = ((AttGroupDeclImpl)$__result__);
1.363 action0();
