1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -78,29 +78,6 @@
1.11 $localName = $__local;
1.12 $qname = $__qname;
1.13 switch($_ngcc_current_state) {
1.14 - case 12:
1.15 - {
1.16 - if(($__uri.equals("") && $__local.equals("classes"))) {
1.17 - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
1.18 - $_ngcc_current_state = 11;
1.19 - }
1.20 - else {
1.21 - unexpectedEnterElement($__qname);
1.22 - }
1.23 - }
1.24 - break;
1.25 - case 2:
1.26 - {
1.27 - if(($__uri.equals("") && $__local.equals("excludes"))) {
1.28 - $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
1.29 - $_ngcc_current_state = 6;
1.30 - }
1.31 - else {
1.32 - $_ngcc_current_state = 1;
1.33 - $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
1.34 - }
1.35 - }
1.36 - break;
1.37 case 0:
1.38 {
1.39 revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
1.40 @@ -123,6 +100,29 @@
1.41 }
1.42 }
1.43 break;
1.44 + case 2:
1.45 + {
1.46 + if(($__uri.equals("") && $__local.equals("excludes"))) {
1.47 + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
1.48 + $_ngcc_current_state = 6;
1.49 + }
1.50 + else {
1.51 + $_ngcc_current_state = 1;
1.52 + $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
1.53 + }
1.54 + }
1.55 + break;
1.56 + case 12:
1.57 + {
1.58 + if(($__uri.equals("") && $__local.equals("classes"))) {
1.59 + $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
1.60 + $_ngcc_current_state = 11;
1.61 + }
1.62 + else {
1.63 + unexpectedEnterElement($__qname);
1.64 + }
1.65 + }
1.66 + break;
1.67 default:
1.68 {
1.69 unexpectedEnterElement($__qname);
1.70 @@ -137,11 +137,11 @@
1.71 $localName = $__local;
1.72 $qname = $__qname;
1.73 switch($_ngcc_current_state) {
1.74 - case 3:
1.75 + case 8:
1.76 {
1.77 - if(($__uri.equals("") && $__local.equals("excludes"))) {
1.78 + if(($__uri.equals("") && $__local.equals("includes"))) {
1.79 $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
1.80 - $_ngcc_current_state = 1;
1.81 + $_ngcc_current_state = 2;
1.82 }
1.83 else {
1.84 unexpectedLeaveElement($__qname);
1.85 @@ -159,12 +159,6 @@
1.86 }
1.87 }
1.88 break;
1.89 - case 2:
1.90 - {
1.91 - $_ngcc_current_state = 1;
1.92 - $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
1.93 - }
1.94 - break;
1.95 case 0:
1.96 {
1.97 revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
1.98 @@ -176,17 +170,23 @@
1.99 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
1.100 }
1.101 break;
1.102 - case 8:
1.103 + case 3:
1.104 {
1.105 - if(($__uri.equals("") && $__local.equals("includes"))) {
1.106 + if(($__uri.equals("") && $__local.equals("excludes"))) {
1.107 $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
1.108 - $_ngcc_current_state = 2;
1.109 + $_ngcc_current_state = 1;
1.110 }
1.111 else {
1.112 unexpectedLeaveElement($__qname);
1.113 }
1.114 }
1.115 break;
1.116 + case 2:
1.117 + {
1.118 + $_ngcc_current_state = 1;
1.119 + $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
1.120 + }
1.121 + break;
1.122 default:
1.123 {
1.124 unexpectedLeaveElement($__qname);
1.125 @@ -201,12 +201,6 @@
1.126 $localName = $__local;
1.127 $qname = $__qname;
1.128 switch($_ngcc_current_state) {
1.129 - case 2:
1.130 - {
1.131 - $_ngcc_current_state = 1;
1.132 - $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
1.133 - }
1.134 - break;
1.135 case 0:
1.136 {
1.137 revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
1.138 @@ -218,6 +212,12 @@
1.139 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
1.140 }
1.141 break;
1.142 + case 2:
1.143 + {
1.144 + $_ngcc_current_state = 1;
1.145 + $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
1.146 + }
1.147 + break;
1.148 default:
1.149 {
1.150 unexpectedEnterAttribute($__qname);
1.151 @@ -232,12 +232,6 @@
1.152 $localName = $__local;
1.153 $qname = $__qname;
1.154 switch($_ngcc_current_state) {
1.155 - case 2:
1.156 - {
1.157 - $_ngcc_current_state = 1;
1.158 - $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
1.159 - }
1.160 - break;
1.161 case 0:
1.162 {
1.163 revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
1.164 @@ -249,6 +243,12 @@
1.165 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
1.166 }
1.167 break;
1.168 + case 2:
1.169 + {
1.170 + $_ngcc_current_state = 1;
1.171 + $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
1.172 + }
1.173 + break;
1.174 default:
1.175 {
1.176 unexpectedLeaveAttribute($__qname);
1.177 @@ -260,27 +260,14 @@
1.178 public void text(String $value) throws SAXException {
1.179 int $ai;
1.180 switch($_ngcc_current_state) {
1.181 - case 6:
1.182 + case 9:
1.183 {
1.184 - __text = $value;
1.185 - $_ngcc_current_state = 4;
1.186 - action1();
1.187 + include_content = $value;
1.188 + $_ngcc_current_state = 8;
1.189 + action2();
1.190 }
1.191 break;
1.192 - case 3:
1.193 - {
1.194 - exclude_content = $value;
1.195 - $_ngcc_current_state = 3;
1.196 - action0();
1.197 - }
1.198 - break;
1.199 - case 2:
1.200 - {
1.201 - $_ngcc_current_state = 1;
1.202 - $runtime.sendText(super._cookie, $value);
1.203 - }
1.204 - break;
1.205 - case 9:
1.206 + case 8:
1.207 {
1.208 include_content = $value;
1.209 $_ngcc_current_state = 8;
1.210 @@ -299,6 +286,26 @@
1.211 action0();
1.212 }
1.213 break;
1.214 + case 3:
1.215 + {
1.216 + exclude_content = $value;
1.217 + $_ngcc_current_state = 3;
1.218 + action0();
1.219 + }
1.220 + break;
1.221 + case 6:
1.222 + {
1.223 + __text = $value;
1.224 + $_ngcc_current_state = 4;
1.225 + action1();
1.226 + }
1.227 + break;
1.228 + case 2:
1.229 + {
1.230 + $_ngcc_current_state = 1;
1.231 + $runtime.sendText(super._cookie, $value);
1.232 + }
1.233 + break;
1.234 case 10:
1.235 {
1.236 __text = $value;
1.237 @@ -306,13 +313,6 @@
1.238 action3();
1.239 }
1.240 break;
1.241 - case 8:
1.242 - {
1.243 - include_content = $value;
1.244 - $_ngcc_current_state = 8;
1.245 - action2();
1.246 - }
1.247 - break;
1.248 }
1.249 }
1.250
