1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java Thu Aug 08 10:10:38 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java Fri Aug 23 09:57:21 2013 +0100 1.3 @@ -99,10 +99,21 @@ 1.4 $localName = $__local; 1.5 $qname = $__qname; 1.6 switch($_ngcc_current_state) { 1.7 + case 9: 1.8 + { 1.9 + if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) { 1.10 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); 1.11 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.12 + } 1.13 + else { 1.14 + unexpectedEnterElement($__qname); 1.15 + } 1.16 + } 1.17 + break; 1.18 case 7: 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, 693, annotation,AnnotationContext.SIMPLETYPE_DECL); 1.22 + NGCCHandler h = new annotation(this, super._source, $runtime, 264, annotation,AnnotationContext.SIMPLETYPE_DECL); 1.23 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.24 } 1.25 else { 1.26 @@ -111,39 +122,6 @@ 1.27 } 1.28 } 1.29 break; 1.30 - case 0: 1.31 - { 1.32 - revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); 1.33 - } 1.34 - break; 1.35 - case 2: 1.36 - { 1.37 - if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { 1.38 - $runtime.consumeAttribute($ai); 1.39 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.40 - } 1.41 - else { 1.42 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { 1.43 - NGCCHandler h = new simpleType(this, super._source, $runtime, 687); 1.44 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.45 - } 1.46 - else { 1.47 - unexpectedEnterElement($__qname); 1.48 - } 1.49 - } 1.50 - } 1.51 - break; 1.52 - case 9: 1.53 - { 1.54 - if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))) { 1.55 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); 1.56 - spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.57 - } 1.58 - else { 1.59 - unexpectedEnterElement($__qname); 1.60 - } 1.61 - } 1.62 - break; 1.63 case 10: 1.64 { 1.65 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { 1.66 @@ -156,6 +134,28 @@ 1.67 } 1.68 } 1.69 break; 1.70 + case 2: 1.71 + { 1.72 + if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { 1.73 + $runtime.consumeAttribute($ai); 1.74 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.75 + } 1.76 + else { 1.77 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) { 1.78 + NGCCHandler h = new simpleType(this, super._source, $runtime, 258); 1.79 + spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.80 + } 1.81 + else { 1.82 + unexpectedEnterElement($__qname); 1.83 + } 1.84 + } 1.85 + } 1.86 + break; 1.87 + case 0: 1.88 + { 1.89 + revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs); 1.90 + } 1.91 + break; 1.92 default: 1.93 { 1.94 unexpectedEnterElement($__qname); 1.95 @@ -170,12 +170,11 @@ 1.96 $localName = $__local; 1.97 $qname = $__qname; 1.98 switch($_ngcc_current_state) { 1.99 - case 1: 1.100 + case 9: 1.101 { 1.102 - if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { 1.103 - $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); 1.104 - $_ngcc_current_state = 0; 1.105 - action0(); 1.106 + if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) { 1.107 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); 1.108 + spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); 1.109 } 1.110 else { 1.111 unexpectedLeaveElement($__qname); 1.112 @@ -188,11 +187,6 @@ 1.113 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.114 } 1.115 break; 1.116 - case 0: 1.117 - { 1.118 - revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); 1.119 - } 1.120 - break; 1.121 case 2: 1.122 { 1.123 if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { 1.124 @@ -204,11 +198,17 @@ 1.125 } 1.126 } 1.127 break; 1.128 - case 9: 1.129 + case 0: 1.130 { 1.131 - if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) { 1.132 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); 1.133 - spawnChildFromLeaveElement(h, $__uri, $__local, $__qname); 1.134 + revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname); 1.135 + } 1.136 + break; 1.137 + case 1: 1.138 + { 1.139 + if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) { 1.140 + $runtime.onLeaveElementConsumed($__uri, $__local, $__qname); 1.141 + $_ngcc_current_state = 0; 1.142 + action0(); 1.143 } 1.144 else { 1.145 unexpectedLeaveElement($__qname); 1.146 @@ -229,17 +229,23 @@ 1.147 $localName = $__local; 1.148 $qname = $__qname; 1.149 switch($_ngcc_current_state) { 1.150 + case 9: 1.151 + { 1.152 + if(($__uri.equals("") && $__local.equals("itemType"))) { 1.153 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); 1.154 + spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); 1.155 + } 1.156 + else { 1.157 + unexpectedEnterAttribute($__qname); 1.158 + } 1.159 + } 1.160 + break; 1.161 case 7: 1.162 { 1.163 $_ngcc_current_state = 2; 1.164 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.165 } 1.166 break; 1.167 - case 0: 1.168 - { 1.169 - revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); 1.170 - } 1.171 - break; 1.172 case 2: 1.173 { 1.174 if(($__uri.equals("") && $__local.equals("itemType"))) { 1.175 @@ -250,15 +256,9 @@ 1.176 } 1.177 } 1.178 break; 1.179 - case 9: 1.180 + case 0: 1.181 { 1.182 - if(($__uri.equals("") && $__local.equals("itemType"))) { 1.183 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); 1.184 - spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname); 1.185 - } 1.186 - else { 1.187 - unexpectedEnterAttribute($__qname); 1.188 - } 1.189 + revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname); 1.190 } 1.191 break; 1.192 default: 1.193 @@ -275,16 +275,6 @@ 1.194 $localName = $__local; 1.195 $qname = $__qname; 1.196 switch($_ngcc_current_state) { 1.197 - case 4: 1.198 - { 1.199 - if(($__uri.equals("") && $__local.equals("itemType"))) { 1.200 - $_ngcc_current_state = 1; 1.201 - } 1.202 - else { 1.203 - unexpectedLeaveAttribute($__qname); 1.204 - } 1.205 - } 1.206 - break; 1.207 case 7: 1.208 { 1.209 $_ngcc_current_state = 2; 1.210 @@ -296,6 +286,16 @@ 1.211 revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname); 1.212 } 1.213 break; 1.214 + case 4: 1.215 + { 1.216 + if(($__uri.equals("") && $__local.equals("itemType"))) { 1.217 + $_ngcc_current_state = 1; 1.218 + } 1.219 + else { 1.220 + unexpectedLeaveAttribute($__qname); 1.221 + } 1.222 + } 1.223 + break; 1.224 default: 1.225 { 1.226 unexpectedLeaveAttribute($__qname); 1.227 @@ -307,17 +307,20 @@ 1.228 public void text(String $value) throws SAXException { 1.229 int $ai; 1.230 switch($_ngcc_current_state) { 1.231 + case 9: 1.232 + { 1.233 + if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { 1.234 + NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 266, fa); 1.235 + spawnChildFromText(h, $value); 1.236 + } 1.237 + } 1.238 + break; 1.239 case 7: 1.240 { 1.241 $_ngcc_current_state = 2; 1.242 $runtime.sendText(super._cookie, $value); 1.243 } 1.244 break; 1.245 - case 0: 1.246 - { 1.247 - revertToParentFromText(result, super._cookie, $value); 1.248 - } 1.249 - break; 1.250 case 2: 1.251 { 1.252 if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { 1.253 @@ -326,17 +329,14 @@ 1.254 } 1.255 } 1.256 break; 1.257 - case 9: 1.258 + case 0: 1.259 { 1.260 - if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) { 1.261 - NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 695, fa); 1.262 - spawnChildFromText(h, $value); 1.263 - } 1.264 + revertToParentFromText(result, super._cookie, $value); 1.265 } 1.266 break; 1.267 case 5: 1.268 { 1.269 - NGCCHandler h = new qname(this, super._source, $runtime, 689); 1.270 + NGCCHandler h = new qname(this, super._source, $runtime, 260); 1.271 spawnChildFromText(h, $value); 1.272 } 1.273 break; 1.274 @@ -345,25 +345,25 @@ 1.275 1.276 public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { 1.277 switch($__cookie__) { 1.278 - case 693: 1.279 + case 266: 1.280 + { 1.281 + fa = ((ForeignAttributesImpl)$__result__); 1.282 + $_ngcc_current_state = 7; 1.283 + } 1.284 + break; 1.285 + case 264: 1.286 { 1.287 annotation = ((AnnotationImpl)$__result__); 1.288 $_ngcc_current_state = 2; 1.289 } 1.290 break; 1.291 - case 687: 1.292 + case 258: 1.293 { 1.294 itemType = ((SimpleTypeImpl)$__result__); 1.295 $_ngcc_current_state = 1; 1.296 } 1.297 break; 1.298 - case 695: 1.299 - { 1.300 - fa = ((ForeignAttributesImpl)$__result__); 1.301 - $_ngcc_current_state = 7; 1.302 - } 1.303 - break; 1.304 - case 689: 1.305 + case 260: 1.306 { 1.307 itemTypeName = ((UName)$__result__); 1.308 action1();