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