8159240: XSOM parser incorrectly processes type names with whitespaces jdk8u161-b03

Mon, 02 Oct 2017 14:20:23 +0100

author
aefimov
date
Mon, 02 Oct 2017 14:20:23 +0100
changeset 1518
d9877e4e1f2b
parent 1517
31ab5999e551
child 1519
df10b5ca4d33

8159240: XSOM parser incorrectly processes type names with whitespaces
Reviewed-by: coffeys

src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java file | annotate | diff | comparison | revisions
src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java	Tue Oct 10 12:47:11 2017 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java	Mon Oct 02 14:20:23 2017 +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, 2017, 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 @@ -25,22 +25,15 @@
    1.11  
    1.12  /* this file is generated by RelaxNGCC */
    1.13  package com.sun.xml.internal.xsom.impl.parser.state;
    1.14 +
    1.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    1.16 +import com.sun.xml.internal.xsom.impl.*;
    1.17 +import com.sun.xml.internal.xsom.impl.parser.*;
    1.18 +import com.sun.xml.internal.xsom.parser.*;
    1.19 +
    1.20 +import org.xml.sax.Attributes;
    1.21 +import org.xml.sax.Locator;
    1.22  import org.xml.sax.SAXException;
    1.23 -import org.xml.sax.XMLReader;
    1.24 -import org.xml.sax.Attributes;
    1.25 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    1.26 -
    1.27 -    import com.sun.xml.internal.xsom.*;
    1.28 -    import com.sun.xml.internal.xsom.parser.*;
    1.29 -    import com.sun.xml.internal.xsom.impl.*;
    1.30 -    import com.sun.xml.internal.xsom.impl.parser.*;
    1.31 -    import org.xml.sax.Locator;
    1.32 -    import org.xml.sax.ContentHandler;
    1.33 -    import org.xml.sax.helpers.*;
    1.34 -    import java.util.*;
    1.35 -    import java.math.BigInteger;
    1.36 -
    1.37 -
    1.38  
    1.39  class attributeDeclBody extends NGCCHandler {
    1.40      private String name;
    1.41 @@ -458,7 +451,7 @@
    1.42              break;
    1.43          case 11:
    1.44              {
    1.45 -                name = $value;
    1.46 +                name = WhiteSpaceProcessor.collapse($value);
    1.47                  $_ngcc_current_state = 10;
    1.48              }
    1.49              break;
     2.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java	Tue Oct 10 12:47:11 2017 -0700
     2.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java	Mon Oct 02 14:20:23 2017 +0100
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -25,22 +25,14 @@
    2.11  
    2.12  /* this file is generated by RelaxNGCC */
    2.13  package com.sun.xml.internal.xsom.impl.parser.state;
    2.14 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    2.15 +import com.sun.xml.internal.xsom.impl.*;
    2.16 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    2.17 +import com.sun.xml.internal.xsom.parser.*;
    2.18 +
    2.19 +import org.xml.sax.Attributes;
    2.20 +import org.xml.sax.Locator;
    2.21  import org.xml.sax.SAXException;
    2.22 -import org.xml.sax.XMLReader;
    2.23 -import org.xml.sax.Attributes;
    2.24 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    2.25 -
    2.26 -    import com.sun.xml.internal.xsom.*;
    2.27 -    import com.sun.xml.internal.xsom.parser.*;
    2.28 -    import com.sun.xml.internal.xsom.impl.*;
    2.29 -    import com.sun.xml.internal.xsom.impl.parser.*;
    2.30 -    import org.xml.sax.Locator;
    2.31 -    import org.xml.sax.ContentHandler;
    2.32 -    import org.xml.sax.helpers.*;
    2.33 -    import java.util.*;
    2.34 -    import java.math.BigInteger;
    2.35 -
    2.36 -
    2.37  
    2.38  class attributeGroupDecl extends NGCCHandler {
    2.39      private AnnotationImpl annotation;
    2.40 @@ -401,7 +393,7 @@
    2.41              break;
    2.42          case 12:
    2.43              {
    2.44 -                name = $value;
    2.45 +                name = WhiteSpaceProcessor.collapse($value);
    2.46                  $_ngcc_current_state = 11;
    2.47              }
    2.48              break;
     3.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java	Tue Oct 10 12:47:11 2017 -0700
     3.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java	Mon Oct 02 14:20:23 2017 +0100
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -25,22 +25,17 @@
    3.11  
    3.12  /* this file is generated by RelaxNGCC */
    3.13  package com.sun.xml.internal.xsom.impl.parser.state;
    3.14 +
    3.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    3.16 +import com.sun.xml.internal.xsom.*;
    3.17 +import com.sun.xml.internal.xsom.impl.*;
    3.18 +import com.sun.xml.internal.xsom.impl.parser.*;
    3.19 +import com.sun.xml.internal.xsom.parser.*;
    3.20 +
    3.21 +import java.util.Collections;
    3.22 +import org.xml.sax.Attributes;
    3.23 +import org.xml.sax.Locator;
    3.24  import org.xml.sax.SAXException;
    3.25 -import org.xml.sax.XMLReader;
    3.26 -import org.xml.sax.Attributes;
    3.27 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    3.28 -
    3.29 -    import com.sun.xml.internal.xsom.*;
    3.30 -    import com.sun.xml.internal.xsom.parser.*;
    3.31 -    import com.sun.xml.internal.xsom.impl.*;
    3.32 -    import com.sun.xml.internal.xsom.impl.parser.*;
    3.33 -    import org.xml.sax.Locator;
    3.34 -    import org.xml.sax.ContentHandler;
    3.35 -    import org.xml.sax.helpers.*;
    3.36 -    import java.util.*;
    3.37 -    import java.math.BigInteger;
    3.38 -
    3.39 -
    3.40  
    3.41  class complexType extends NGCCHandler {
    3.42      private Integer finalValue;
    3.43 @@ -1683,7 +1678,7 @@
    3.44              break;
    3.45          case 70:
    3.46              {
    3.47 -                name = $value;
    3.48 +                name = WhiteSpaceProcessor.collapse($value);
    3.49                  $_ngcc_current_state = 69;
    3.50              }
    3.51              break;
     4.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java	Tue Oct 10 12:47:11 2017 -0700
     4.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java	Mon Oct 02 14:20:23 2017 +0100
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -25,22 +25,18 @@
    4.11  
    4.12  /* this file is generated by RelaxNGCC */
    4.13  package com.sun.xml.internal.xsom.impl.parser.state;
    4.14 +
    4.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    4.16 +import com.sun.xml.internal.xsom.impl.*;
    4.17 +import com.sun.xml.internal.xsom.impl.parser.*;
    4.18 +import com.sun.xml.internal.xsom.parser.*;
    4.19 +
    4.20 +import java.util.ArrayList;
    4.21 +import java.util.List;
    4.22 +
    4.23 +import org.xml.sax.Attributes;
    4.24 +import org.xml.sax.Locator;
    4.25  import org.xml.sax.SAXException;
    4.26 -import org.xml.sax.XMLReader;
    4.27 -import org.xml.sax.Attributes;
    4.28 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    4.29 -
    4.30 -    import com.sun.xml.internal.xsom.*;
    4.31 -    import com.sun.xml.internal.xsom.parser.*;
    4.32 -    import com.sun.xml.internal.xsom.impl.*;
    4.33 -    import com.sun.xml.internal.xsom.impl.parser.*;
    4.34 -    import org.xml.sax.Locator;
    4.35 -    import org.xml.sax.ContentHandler;
    4.36 -    import org.xml.sax.helpers.*;
    4.37 -    import java.util.*;
    4.38 -    import java.math.BigInteger;
    4.39 -
    4.40 -
    4.41  
    4.42  class elementDeclBody extends NGCCHandler {
    4.43      private Integer finalValue;
    4.44 @@ -813,7 +809,7 @@
    4.45              break;
    4.46          case 22:
    4.47              {
    4.48 -                name = $value;
    4.49 +                name = WhiteSpaceProcessor.collapse($value);
    4.50                  $_ngcc_current_state = 21;
    4.51              }
    4.52              break;
     5.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java	Tue Oct 10 12:47:11 2017 -0700
     5.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java	Mon Oct 02 14:20:23 2017 +0100
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -25,22 +25,15 @@
    5.11  
    5.12  /* this file is generated by RelaxNGCC */
    5.13  package com.sun.xml.internal.xsom.impl.parser.state;
    5.14 +
    5.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    5.16 +import com.sun.xml.internal.xsom.impl.*;
    5.17 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    5.18 +import com.sun.xml.internal.xsom.parser.*;
    5.19 +
    5.20 +import org.xml.sax.Attributes;
    5.21 +import org.xml.sax.Locator;
    5.22  import org.xml.sax.SAXException;
    5.23 -import org.xml.sax.XMLReader;
    5.24 -import org.xml.sax.Attributes;
    5.25 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    5.26 -
    5.27 -    import com.sun.xml.internal.xsom.*;
    5.28 -    import com.sun.xml.internal.xsom.parser.*;
    5.29 -    import com.sun.xml.internal.xsom.impl.*;
    5.30 -    import com.sun.xml.internal.xsom.impl.parser.*;
    5.31 -    import org.xml.sax.Locator;
    5.32 -    import org.xml.sax.ContentHandler;
    5.33 -    import org.xml.sax.helpers.*;
    5.34 -    import java.util.*;
    5.35 -    import java.math.BigInteger;
    5.36 -
    5.37 -
    5.38  
    5.39  class group extends NGCCHandler {
    5.40      private AnnotationImpl annotation;
    5.41 @@ -403,7 +396,7 @@
    5.42              break;
    5.43          case 9:
    5.44              {
    5.45 -                name = $value;
    5.46 +                name = WhiteSpaceProcessor.collapse($value);
    5.47                  $_ngcc_current_state = 8;
    5.48              }
    5.49              break;
     6.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java	Tue Oct 10 12:47:11 2017 -0700
     6.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java	Mon Oct 02 14:20:23 2017 +0100
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -25,22 +25,18 @@
    6.11  
    6.12  /* this file is generated by RelaxNGCC */
    6.13  package com.sun.xml.internal.xsom.impl.parser.state;
    6.14 +
    6.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    6.16 +import com.sun.xml.internal.xsom.*;
    6.17 +import com.sun.xml.internal.xsom.impl.*;
    6.18 +import com.sun.xml.internal.xsom.impl.parser.*;
    6.19 +import com.sun.xml.internal.xsom.parser.*;
    6.20 +
    6.21 +import java.util.ArrayList;
    6.22 +import java.util.List;
    6.23 +
    6.24 +import org.xml.sax.Attributes;
    6.25  import org.xml.sax.SAXException;
    6.26 -import org.xml.sax.XMLReader;
    6.27 -import org.xml.sax.Attributes;
    6.28 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    6.29 -
    6.30 -    import com.sun.xml.internal.xsom.*;
    6.31 -    import com.sun.xml.internal.xsom.parser.*;
    6.32 -    import com.sun.xml.internal.xsom.impl.*;
    6.33 -    import com.sun.xml.internal.xsom.impl.parser.*;
    6.34 -    import org.xml.sax.Locator;
    6.35 -    import org.xml.sax.ContentHandler;
    6.36 -    import org.xml.sax.helpers.*;
    6.37 -    import java.util.*;
    6.38 -    import java.math.BigInteger;
    6.39 -
    6.40 -
    6.41  
    6.42  class identityConstraint extends NGCCHandler {
    6.43      private String name;
    6.44 @@ -471,7 +467,7 @@
    6.45          switch($_ngcc_current_state) {
    6.46          case 15:
    6.47              {
    6.48 -                name = $value;
    6.49 +                name = WhiteSpaceProcessor.collapse($value);
    6.50                  $_ngcc_current_state = 14;
    6.51              }
    6.52              break;
     7.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java	Tue Oct 10 12:47:11 2017 -0700
     7.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java	Mon Oct 02 14:20:23 2017 +0100
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it
    7.10 @@ -25,22 +25,16 @@
    7.11  
    7.12  /* this file is generated by RelaxNGCC */
    7.13  package com.sun.xml.internal.xsom.impl.parser.state;
    7.14 +
    7.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    7.16 +import com.sun.xml.internal.xsom.*;
    7.17 +import com.sun.xml.internal.xsom.impl.*;
    7.18 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    7.19 +import com.sun.xml.internal.xsom.parser.*;
    7.20 +
    7.21 +import org.xml.sax.Attributes;
    7.22 +import org.xml.sax.Locator;
    7.23  import org.xml.sax.SAXException;
    7.24 -import org.xml.sax.XMLReader;
    7.25 -import org.xml.sax.Attributes;
    7.26 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    7.27 -
    7.28 -    import com.sun.xml.internal.xsom.*;
    7.29 -    import com.sun.xml.internal.xsom.parser.*;
    7.30 -    import com.sun.xml.internal.xsom.impl.*;
    7.31 -    import com.sun.xml.internal.xsom.impl.parser.*;
    7.32 -    import org.xml.sax.Locator;
    7.33 -    import org.xml.sax.ContentHandler;
    7.34 -    import org.xml.sax.helpers.*;
    7.35 -    import java.util.*;
    7.36 -    import java.math.BigInteger;
    7.37 -
    7.38 -
    7.39  
    7.40  class notation extends NGCCHandler {
    7.41      private String name;
    7.42 @@ -435,7 +429,7 @@
    7.43              break;
    7.44          case 13:
    7.45              {
    7.46 -                name = $value;
    7.47 +                name = WhiteSpaceProcessor.collapse($value);
    7.48                  $_ngcc_current_state = 12;
    7.49              }
    7.50              break;
     8.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java	Tue Oct 10 12:47:11 2017 -0700
     8.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java	Mon Oct 02 14:20:23 2017 +0100
     8.3 @@ -1,5 +1,5 @@
     8.4  /*
     8.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     8.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     8.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8   *
     8.9   * This code is free software; you can redistribute it and/or modify it
    8.10 @@ -25,22 +25,12 @@
    8.11  
    8.12  /* this file is generated by RelaxNGCC */
    8.13  package com.sun.xml.internal.xsom.impl.parser.state;
    8.14 -import org.xml.sax.SAXException;
    8.15 -import org.xml.sax.XMLReader;
    8.16 -import org.xml.sax.Attributes;
    8.17 +
    8.18 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    8.19  import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    8.20  
    8.21 -    import com.sun.xml.internal.xsom.*;
    8.22 -    import com.sun.xml.internal.xsom.parser.*;
    8.23 -    import com.sun.xml.internal.xsom.impl.*;
    8.24 -    import com.sun.xml.internal.xsom.impl.parser.*;
    8.25 -    import org.xml.sax.Locator;
    8.26 -    import org.xml.sax.ContentHandler;
    8.27 -    import org.xml.sax.helpers.*;
    8.28 -    import java.util.*;
    8.29 -    import java.math.BigInteger;
    8.30 -
    8.31 -
    8.32 +import org.xml.sax.Attributes;
    8.33 +import org.xml.sax.SAXException;
    8.34  
    8.35  class qname extends NGCCHandler {
    8.36      private String qvalue;
    8.37 @@ -150,7 +140,7 @@
    8.38              break;
    8.39          case 1:
    8.40              {
    8.41 -                qvalue = $value;
    8.42 +                qvalue = WhiteSpaceProcessor.collapse($value);
    8.43                  $_ngcc_current_state = 0;
    8.44              }
    8.45              break;
     9.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java	Tue Oct 10 12:47:11 2017 -0700
     9.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java	Mon Oct 02 14:20:23 2017 +0100
     9.3 @@ -1,5 +1,5 @@
     9.4  /*
     9.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     9.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
     9.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8   *
     9.9   * This code is free software; you can redistribute it and/or modify it
    9.10 @@ -25,22 +25,21 @@
    9.11  
    9.12  /* this file is generated by RelaxNGCC */
    9.13  package com.sun.xml.internal.xsom.impl.parser.state;
    9.14 +
    9.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    9.16 +import com.sun.xml.internal.xsom.*;
    9.17 +import com.sun.xml.internal.xsom.impl.*;
    9.18 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    9.19 +import com.sun.xml.internal.xsom.parser.*;
    9.20 +
    9.21 +import java.util.Collections;
    9.22 +import java.util.HashSet;
    9.23 +import java.util.Set;
    9.24 +import java.util.StringTokenizer;
    9.25 +
    9.26 +import org.xml.sax.Attributes;
    9.27 +import org.xml.sax.Locator;
    9.28  import org.xml.sax.SAXException;
    9.29 -import org.xml.sax.XMLReader;
    9.30 -import org.xml.sax.Attributes;
    9.31 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    9.32 -
    9.33 -    import com.sun.xml.internal.xsom.*;
    9.34 -    import com.sun.xml.internal.xsom.parser.*;
    9.35 -    import com.sun.xml.internal.xsom.impl.*;
    9.36 -    import com.sun.xml.internal.xsom.impl.parser.*;
    9.37 -    import org.xml.sax.Locator;
    9.38 -    import org.xml.sax.ContentHandler;
    9.39 -    import org.xml.sax.helpers.*;
    9.40 -    import java.util.*;
    9.41 -    import java.math.BigInteger;
    9.42 -
    9.43 -
    9.44  
    9.45  class simpleType extends NGCCHandler {
    9.46      private AnnotationImpl annotation;
    9.47 @@ -373,7 +372,7 @@
    9.48          switch($_ngcc_current_state) {
    9.49          case 13:
    9.50              {
    9.51 -                name = $value;
    9.52 +                name = WhiteSpaceProcessor.collapse($value);
    9.53                  $_ngcc_current_state = 12;
    9.54              }
    9.55              break;

mercurial