jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -23,24 +23,21 @@
  * questions.
  */
 
 /* this file is generated by RelaxNGCC */
 package com.sun.xml.internal.xsom.impl.parser.state;
+
 import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
 import org.xml.sax.Attributes;
+import com.sun.xml.internal.bind.WhiteSpaceProcessor;
 import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
 
-    import com.sun.xml.internal.xsom.*;
-    import com.sun.xml.internal.xsom.parser.*;
-    import com.sun.xml.internal.xsom.impl.*;
-    import com.sun.xml.internal.xsom.impl.parser.*;
-    import org.xml.sax.Locator;
-    import org.xml.sax.ContentHandler;
-    import org.xml.sax.helpers.*;
-    import java.util.*;
-    import java.math.BigInteger;
+import com.sun.xml.internal.xsom.parser.*;
+import com.sun.xml.internal.xsom.impl.*;
+import com.sun.xml.internal.xsom.impl.parser.*;
+import org.xml.sax.Locator;
+import java.util.*;
 
 
 
 class elementDeclBody extends NGCCHandler {
     private Integer finalValue;

@@ -811,11 +808,12 @@
                 $_ngcc_current_state = 33;
             }
             break;
         case 22:
             {
-                name = $value;
+                // <xs:element> with attribute 'name' = $value
+                name = WhiteSpaceProcessor.collapse($value);
                 $_ngcc_current_state = 21;
             }
             break;
         case 28:
             {

@@ -846,12 +844,13 @@
                 revertToParentFromText(makeResult(), super._cookie, $value);
             }
             break;
         case 6:
             {
+                // <xs:element> with attribute 'type' = $value
                 NGCCHandler h = new qname(this, super._source, $runtime, 10);
-                spawnChildFromText(h, $value);
+                spawnChildFromText(h, WhiteSpaceProcessor.collapse($value));
             }
             break;
         case 24:
             {
                 if(($ai = $runtime.getAttributeIndex("","form"))>=0) {

@@ -1000,12 +999,13 @@
                 spawnChildFromText(h, $value);
             }
             break;
         case 15:
             {
+                // <xs:element> -> with attribute 'substitutionGroup' = $value
                 NGCCHandler h = new qname(this, super._source, $runtime, 27);
-                spawnChildFromText(h, $value);
+                spawnChildFromText(h, WhiteSpaceProcessor.collapse($value));
             }
             break;
         case 26:
             {
                 if($value.equals("unqualified")) {