1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java Thu Aug 08 10:10:38 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java Fri Aug 23 09:57:21 2013 +0100 1.3 @@ -78,9 +78,16 @@ 1.4 $localName = $__local; 1.5 $qname = $__qname; 1.6 switch($_ngcc_current_state) { 1.7 - case 0: 1.8 + case 4: 1.9 { 1.10 - revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); 1.11 + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.12 + $runtime.consumeAttribute($ai); 1.13 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.14 + } 1.15 + else { 1.16 + $_ngcc_current_state = 2; 1.17 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.18 + } 1.19 } 1.20 break; 1.21 case 8: 1.22 @@ -109,7 +116,7 @@ 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, 498, null,AnnotationContext.SCHEMA); 1.27 + NGCCHandler h = new annotation(this, super._source, $runtime, 340, null,AnnotationContext.SCHEMA); 1.28 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs); 1.29 } 1.30 else { 1.31 @@ -118,16 +125,9 @@ 1.32 } 1.33 } 1.34 break; 1.35 - case 4: 1.36 + case 0: 1.37 { 1.38 - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.39 - $runtime.consumeAttribute($ai); 1.40 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.41 - } 1.42 - else { 1.43 - $_ngcc_current_state = 2; 1.44 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs); 1.45 - } 1.46 + revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs); 1.47 } 1.48 break; 1.49 default: 1.50 @@ -144,9 +144,16 @@ 1.51 $localName = $__local; 1.52 $qname = $__qname; 1.53 switch($_ngcc_current_state) { 1.54 - case 0: 1.55 + case 4: 1.56 { 1.57 - revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); 1.58 + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.59 + $runtime.consumeAttribute($ai); 1.60 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.61 + } 1.62 + else { 1.63 + $_ngcc_current_state = 2; 1.64 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.65 + } 1.66 } 1.67 break; 1.68 case 8: 1.69 @@ -161,6 +168,12 @@ 1.70 } 1.71 } 1.72 break; 1.73 + case 2: 1.74 + { 1.75 + $_ngcc_current_state = 1; 1.76 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.77 + } 1.78 + break; 1.79 case 1: 1.80 { 1.81 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) { 1.82 @@ -173,22 +186,9 @@ 1.83 } 1.84 } 1.85 break; 1.86 - case 2: 1.87 + case 0: 1.88 { 1.89 - $_ngcc_current_state = 1; 1.90 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.91 - } 1.92 - break; 1.93 - case 4: 1.94 - { 1.95 - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.96 - $runtime.consumeAttribute($ai); 1.97 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.98 - } 1.99 - else { 1.100 - $_ngcc_current_state = 2; 1.101 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname); 1.102 - } 1.103 + revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname); 1.104 } 1.105 break; 1.106 default: 1.107 @@ -205,9 +205,15 @@ 1.108 $localName = $__local; 1.109 $qname = $__qname; 1.110 switch($_ngcc_current_state) { 1.111 - case 0: 1.112 + case 4: 1.113 { 1.114 - revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); 1.115 + if(($__uri.equals("") && $__local.equals("schemaLocation"))) { 1.116 + $_ngcc_current_state = 6; 1.117 + } 1.118 + else { 1.119 + $_ngcc_current_state = 2; 1.120 + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.121 + } 1.122 } 1.123 break; 1.124 case 8: 1.125 @@ -227,15 +233,9 @@ 1.126 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.127 } 1.128 break; 1.129 - case 4: 1.130 + case 0: 1.131 { 1.132 - if(($__uri.equals("") && $__local.equals("schemaLocation"))) { 1.133 - $_ngcc_current_state = 6; 1.134 - } 1.135 - else { 1.136 - $_ngcc_current_state = 2; 1.137 - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname); 1.138 - } 1.139 + revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname); 1.140 } 1.141 break; 1.142 default: 1.143 @@ -262,9 +262,10 @@ 1.144 } 1.145 } 1.146 break; 1.147 - case 0: 1.148 + case 4: 1.149 { 1.150 - revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); 1.151 + $_ngcc_current_state = 2; 1.152 + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.153 } 1.154 break; 1.155 case 8: 1.156 @@ -273,12 +274,6 @@ 1.157 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.158 } 1.159 break; 1.160 - case 2: 1.161 - { 1.162 - $_ngcc_current_state = 1; 1.163 - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.164 - } 1.165 - break; 1.166 case 5: 1.167 { 1.168 if(($__uri.equals("") && $__local.equals("schemaLocation"))) { 1.169 @@ -289,12 +284,17 @@ 1.170 } 1.171 } 1.172 break; 1.173 - case 4: 1.174 + case 2: 1.175 { 1.176 - $_ngcc_current_state = 2; 1.177 + $_ngcc_current_state = 1; 1.178 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname); 1.179 } 1.180 break; 1.181 + case 0: 1.182 + { 1.183 + revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname); 1.184 + } 1.185 + break; 1.186 default: 1.187 { 1.188 unexpectedLeaveAttribute($__qname); 1.189 @@ -306,9 +306,16 @@ 1.190 public void text(String $value) throws SAXException { 1.191 int $ai; 1.192 switch($_ngcc_current_state) { 1.193 - case 0: 1.194 + case 4: 1.195 { 1.196 - revertToParentFromText(this, super._cookie, $value); 1.197 + if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.198 + $runtime.consumeAttribute($ai); 1.199 + $runtime.sendText(super._cookie, $value); 1.200 + } 1.201 + else { 1.202 + $_ngcc_current_state = 2; 1.203 + $runtime.sendText(super._cookie, $value); 1.204 + } 1.205 } 1.206 break; 1.207 case 8: 1.208 @@ -323,10 +330,10 @@ 1.209 } 1.210 } 1.211 break; 1.212 - case 6: 1.213 + case 10: 1.214 { 1.215 - schemaLocation = $value; 1.216 - $_ngcc_current_state = 5; 1.217 + ns = $value; 1.218 + $_ngcc_current_state = 9; 1.219 } 1.220 break; 1.221 case 2: 1.222 @@ -335,22 +342,15 @@ 1.223 $runtime.sendText(super._cookie, $value); 1.224 } 1.225 break; 1.226 - case 4: 1.227 + case 0: 1.228 { 1.229 - if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) { 1.230 - $runtime.consumeAttribute($ai); 1.231 - $runtime.sendText(super._cookie, $value); 1.232 - } 1.233 - else { 1.234 - $_ngcc_current_state = 2; 1.235 - $runtime.sendText(super._cookie, $value); 1.236 - } 1.237 + revertToParentFromText(this, super._cookie, $value); 1.238 } 1.239 break; 1.240 - case 10: 1.241 + case 6: 1.242 { 1.243 - ns = $value; 1.244 - $_ngcc_current_state = 9; 1.245 + schemaLocation = $value; 1.246 + $_ngcc_current_state = 5; 1.247 } 1.248 break; 1.249 } 1.250 @@ -358,7 +358,7 @@ 1.251 1.252 public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException { 1.253 switch($__cookie__) { 1.254 - case 498: 1.255 + case 340: 1.256 { 1.257 $_ngcc_current_state = 1; 1.258 }