Merge

Thu, 02 Nov 2017 11:33:47 -0700

author
asaha
date
Thu, 02 Nov 2017 11:33:47 -0700
changeset 1557
8aec7ba7bfe3
parent 1556
9738b7faaee4
parent 1525
8b2ad0e9a4ed
child 1568
25e6ecbfeb09

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Oct 03 23:30:37 2017 -0700
     1.2 +++ b/.hgtags	Thu Nov 02 11:33:47 2017 -0700
     1.3 @@ -794,4 +794,14 @@
     1.4  bedae7043858b1e2cdef09d5dd68f4585320b5df jdk8u152-b09
     1.5  32a01bf45f0f32783a5c98e5f68feb9a6e1ffd16 jdk8u161-b00
     1.6  d69b55e7aee8c5c9f3a4f73a0bb89943f6dca4fa jdk8u161-b01
     1.7 +b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u161-b02
     1.8 +d9877e4e1f2b84201aa431e82fce648e69f02e65 jdk8u161-b03
     1.9 +df10b5ca4d33be24ac11ab2be1810c0368d9eba7 jdk8u161-b04
    1.10 +1e4379566867606b9b24d4b3708c50f814515c21 jdk8u161-b05
    1.11 +0dd7f8a46659c0de85a99fd45e8a30993c567c42 jdk8u162-b00
    1.12 +06086cb6c349be92c287645f4fb494f85feb33c7 jdk8u162-b01
    1.13 +0b606a477f3e76f8c9a03f936c2f1e158ebbd6c5 jdk8u162-b02
    1.14 +1c18ed39c7b685a5084ab051a00ed5a5e058d8c0 jdk8u162-b03
    1.15 +3a6541ac3828ffbb5366f16921e5cafb74a94e17 jdk8u162-b04
    1.16 +62d8e1ddcb4ccba9b510d18c88d3676a03c15e2c jdk8u162-b05
    1.17  b43391a4015f0c890c90ab33fe03b941876d2ee6 jdk8u171-b00
     2.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java	Tue Oct 03 23:30:37 2017 -0700
     2.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java	Thu Nov 02 11:33:47 2017 -0700
     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,15 @@
    2.11  
    2.12  /* this file is generated by RelaxNGCC */
    2.13  package com.sun.xml.internal.xsom.impl.parser.state;
    2.14 +
    2.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    2.16 +import com.sun.xml.internal.xsom.impl.*;
    2.17 +import com.sun.xml.internal.xsom.impl.parser.*;
    2.18 +import com.sun.xml.internal.xsom.parser.*;
    2.19 +
    2.20 +import org.xml.sax.Attributes;
    2.21 +import org.xml.sax.Locator;
    2.22  import org.xml.sax.SAXException;
    2.23 -import org.xml.sax.XMLReader;
    2.24 -import org.xml.sax.Attributes;
    2.25 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    2.26 -
    2.27 -    import com.sun.xml.internal.xsom.*;
    2.28 -    import com.sun.xml.internal.xsom.parser.*;
    2.29 -    import com.sun.xml.internal.xsom.impl.*;
    2.30 -    import com.sun.xml.internal.xsom.impl.parser.*;
    2.31 -    import org.xml.sax.Locator;
    2.32 -    import org.xml.sax.ContentHandler;
    2.33 -    import org.xml.sax.helpers.*;
    2.34 -    import java.util.*;
    2.35 -    import java.math.BigInteger;
    2.36 -
    2.37 -
    2.38  
    2.39  class attributeDeclBody extends NGCCHandler {
    2.40      private String name;
    2.41 @@ -458,7 +451,7 @@
    2.42              break;
    2.43          case 11:
    2.44              {
    2.45 -                name = $value;
    2.46 +                name = WhiteSpaceProcessor.collapse($value);
    2.47                  $_ngcc_current_state = 10;
    2.48              }
    2.49              break;
     3.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java	Tue Oct 03 23:30:37 2017 -0700
     3.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java	Thu Nov 02 11:33:47 2017 -0700
     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,14 @@
    3.11  
    3.12  /* this file is generated by RelaxNGCC */
    3.13  package com.sun.xml.internal.xsom.impl.parser.state;
    3.14 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    3.15 +import com.sun.xml.internal.xsom.impl.*;
    3.16 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    3.17 +import com.sun.xml.internal.xsom.parser.*;
    3.18 +
    3.19 +import org.xml.sax.Attributes;
    3.20 +import org.xml.sax.Locator;
    3.21  import org.xml.sax.SAXException;
    3.22 -import org.xml.sax.XMLReader;
    3.23 -import org.xml.sax.Attributes;
    3.24 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    3.25 -
    3.26 -    import com.sun.xml.internal.xsom.*;
    3.27 -    import com.sun.xml.internal.xsom.parser.*;
    3.28 -    import com.sun.xml.internal.xsom.impl.*;
    3.29 -    import com.sun.xml.internal.xsom.impl.parser.*;
    3.30 -    import org.xml.sax.Locator;
    3.31 -    import org.xml.sax.ContentHandler;
    3.32 -    import org.xml.sax.helpers.*;
    3.33 -    import java.util.*;
    3.34 -    import java.math.BigInteger;
    3.35 -
    3.36 -
    3.37  
    3.38  class attributeGroupDecl extends NGCCHandler {
    3.39      private AnnotationImpl annotation;
    3.40 @@ -401,7 +393,7 @@
    3.41              break;
    3.42          case 12:
    3.43              {
    3.44 -                name = $value;
    3.45 +                name = WhiteSpaceProcessor.collapse($value);
    3.46                  $_ngcc_current_state = 11;
    3.47              }
    3.48              break;
     4.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java	Tue Oct 03 23:30:37 2017 -0700
     4.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java	Thu Nov 02 11:33:47 2017 -0700
     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,17 @@
    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.*;
    4.17 +import com.sun.xml.internal.xsom.impl.*;
    4.18 +import com.sun.xml.internal.xsom.impl.parser.*;
    4.19 +import com.sun.xml.internal.xsom.parser.*;
    4.20 +
    4.21 +import java.util.Collections;
    4.22 +import org.xml.sax.Attributes;
    4.23 +import org.xml.sax.Locator;
    4.24  import org.xml.sax.SAXException;
    4.25 -import org.xml.sax.XMLReader;
    4.26 -import org.xml.sax.Attributes;
    4.27 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    4.28 -
    4.29 -    import com.sun.xml.internal.xsom.*;
    4.30 -    import com.sun.xml.internal.xsom.parser.*;
    4.31 -    import com.sun.xml.internal.xsom.impl.*;
    4.32 -    import com.sun.xml.internal.xsom.impl.parser.*;
    4.33 -    import org.xml.sax.Locator;
    4.34 -    import org.xml.sax.ContentHandler;
    4.35 -    import org.xml.sax.helpers.*;
    4.36 -    import java.util.*;
    4.37 -    import java.math.BigInteger;
    4.38 -
    4.39 -
    4.40  
    4.41  class complexType extends NGCCHandler {
    4.42      private Integer finalValue;
    4.43 @@ -1683,7 +1678,7 @@
    4.44              break;
    4.45          case 70:
    4.46              {
    4.47 -                name = $value;
    4.48 +                name = WhiteSpaceProcessor.collapse($value);
    4.49                  $_ngcc_current_state = 69;
    4.50              }
    4.51              break;
     5.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java	Tue Oct 03 23:30:37 2017 -0700
     5.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java	Thu Nov 02 11:33:47 2017 -0700
     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,18 @@
    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.*;
    5.18 +import com.sun.xml.internal.xsom.parser.*;
    5.19 +
    5.20 +import java.util.ArrayList;
    5.21 +import java.util.List;
    5.22 +
    5.23 +import org.xml.sax.Attributes;
    5.24 +import org.xml.sax.Locator;
    5.25  import org.xml.sax.SAXException;
    5.26 -import org.xml.sax.XMLReader;
    5.27 -import org.xml.sax.Attributes;
    5.28 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    5.29 -
    5.30 -    import com.sun.xml.internal.xsom.*;
    5.31 -    import com.sun.xml.internal.xsom.parser.*;
    5.32 -    import com.sun.xml.internal.xsom.impl.*;
    5.33 -    import com.sun.xml.internal.xsom.impl.parser.*;
    5.34 -    import org.xml.sax.Locator;
    5.35 -    import org.xml.sax.ContentHandler;
    5.36 -    import org.xml.sax.helpers.*;
    5.37 -    import java.util.*;
    5.38 -    import java.math.BigInteger;
    5.39 -
    5.40 -
    5.41  
    5.42  class elementDeclBody extends NGCCHandler {
    5.43      private Integer finalValue;
    5.44 @@ -813,7 +809,7 @@
    5.45              break;
    5.46          case 22:
    5.47              {
    5.48 -                name = $value;
    5.49 +                name = WhiteSpaceProcessor.collapse($value);
    5.50                  $_ngcc_current_state = 21;
    5.51              }
    5.52              break;
     6.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java	Tue Oct 03 23:30:37 2017 -0700
     6.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java	Thu Nov 02 11:33:47 2017 -0700
     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,15 @@
    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.impl.*;
    6.17 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    6.18 +import com.sun.xml.internal.xsom.parser.*;
    6.19 +
    6.20 +import org.xml.sax.Attributes;
    6.21 +import org.xml.sax.Locator;
    6.22  import org.xml.sax.SAXException;
    6.23 -import org.xml.sax.XMLReader;
    6.24 -import org.xml.sax.Attributes;
    6.25 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    6.26 -
    6.27 -    import com.sun.xml.internal.xsom.*;
    6.28 -    import com.sun.xml.internal.xsom.parser.*;
    6.29 -    import com.sun.xml.internal.xsom.impl.*;
    6.30 -    import com.sun.xml.internal.xsom.impl.parser.*;
    6.31 -    import org.xml.sax.Locator;
    6.32 -    import org.xml.sax.ContentHandler;
    6.33 -    import org.xml.sax.helpers.*;
    6.34 -    import java.util.*;
    6.35 -    import java.math.BigInteger;
    6.36 -
    6.37 -
    6.38  
    6.39  class group extends NGCCHandler {
    6.40      private AnnotationImpl annotation;
    6.41 @@ -403,7 +396,7 @@
    6.42              break;
    6.43          case 9:
    6.44              {
    6.45 -                name = $value;
    6.46 +                name = WhiteSpaceProcessor.collapse($value);
    6.47                  $_ngcc_current_state = 8;
    6.48              }
    6.49              break;
     7.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java	Tue Oct 03 23:30:37 2017 -0700
     7.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java	Thu Nov 02 11:33:47 2017 -0700
     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,18 @@
    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.*;
    7.19 +import com.sun.xml.internal.xsom.parser.*;
    7.20 +
    7.21 +import java.util.ArrayList;
    7.22 +import java.util.List;
    7.23 +
    7.24 +import org.xml.sax.Attributes;
    7.25  import org.xml.sax.SAXException;
    7.26 -import org.xml.sax.XMLReader;
    7.27 -import org.xml.sax.Attributes;
    7.28 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    7.29 -
    7.30 -    import com.sun.xml.internal.xsom.*;
    7.31 -    import com.sun.xml.internal.xsom.parser.*;
    7.32 -    import com.sun.xml.internal.xsom.impl.*;
    7.33 -    import com.sun.xml.internal.xsom.impl.parser.*;
    7.34 -    import org.xml.sax.Locator;
    7.35 -    import org.xml.sax.ContentHandler;
    7.36 -    import org.xml.sax.helpers.*;
    7.37 -    import java.util.*;
    7.38 -    import java.math.BigInteger;
    7.39 -
    7.40 -
    7.41  
    7.42  class identityConstraint extends NGCCHandler {
    7.43      private String name;
    7.44 @@ -471,7 +467,7 @@
    7.45          switch($_ngcc_current_state) {
    7.46          case 15:
    7.47              {
    7.48 -                name = $value;
    7.49 +                name = WhiteSpaceProcessor.collapse($value);
    7.50                  $_ngcc_current_state = 14;
    7.51              }
    7.52              break;
     8.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java	Tue Oct 03 23:30:37 2017 -0700
     8.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java	Thu Nov 02 11:33:47 2017 -0700
     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,16 @@
    8.11  
    8.12  /* this file is generated by RelaxNGCC */
    8.13  package com.sun.xml.internal.xsom.impl.parser.state;
    8.14 +
    8.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    8.16 +import com.sun.xml.internal.xsom.*;
    8.17 +import com.sun.xml.internal.xsom.impl.*;
    8.18 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    8.19 +import com.sun.xml.internal.xsom.parser.*;
    8.20 +
    8.21 +import org.xml.sax.Attributes;
    8.22 +import org.xml.sax.Locator;
    8.23  import org.xml.sax.SAXException;
    8.24 -import org.xml.sax.XMLReader;
    8.25 -import org.xml.sax.Attributes;
    8.26 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    8.27 -
    8.28 -    import com.sun.xml.internal.xsom.*;
    8.29 -    import com.sun.xml.internal.xsom.parser.*;
    8.30 -    import com.sun.xml.internal.xsom.impl.*;
    8.31 -    import com.sun.xml.internal.xsom.impl.parser.*;
    8.32 -    import org.xml.sax.Locator;
    8.33 -    import org.xml.sax.ContentHandler;
    8.34 -    import org.xml.sax.helpers.*;
    8.35 -    import java.util.*;
    8.36 -    import java.math.BigInteger;
    8.37 -
    8.38 -
    8.39  
    8.40  class notation extends NGCCHandler {
    8.41      private String name;
    8.42 @@ -435,7 +429,7 @@
    8.43              break;
    8.44          case 13:
    8.45              {
    8.46 -                name = $value;
    8.47 +                name = WhiteSpaceProcessor.collapse($value);
    8.48                  $_ngcc_current_state = 12;
    8.49              }
    8.50              break;
     9.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java	Tue Oct 03 23:30:37 2017 -0700
     9.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java	Thu Nov 02 11:33:47 2017 -0700
     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,12 @@
    9.11  
    9.12  /* this file is generated by RelaxNGCC */
    9.13  package com.sun.xml.internal.xsom.impl.parser.state;
    9.14 -import org.xml.sax.SAXException;
    9.15 -import org.xml.sax.XMLReader;
    9.16 -import org.xml.sax.Attributes;
    9.17 +
    9.18 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
    9.19  import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
    9.20  
    9.21 -    import com.sun.xml.internal.xsom.*;
    9.22 -    import com.sun.xml.internal.xsom.parser.*;
    9.23 -    import com.sun.xml.internal.xsom.impl.*;
    9.24 -    import com.sun.xml.internal.xsom.impl.parser.*;
    9.25 -    import org.xml.sax.Locator;
    9.26 -    import org.xml.sax.ContentHandler;
    9.27 -    import org.xml.sax.helpers.*;
    9.28 -    import java.util.*;
    9.29 -    import java.math.BigInteger;
    9.30 -
    9.31 -
    9.32 +import org.xml.sax.Attributes;
    9.33 +import org.xml.sax.SAXException;
    9.34  
    9.35  class qname extends NGCCHandler {
    9.36      private String qvalue;
    9.37 @@ -150,7 +140,7 @@
    9.38              break;
    9.39          case 1:
    9.40              {
    9.41 -                qvalue = $value;
    9.42 +                qvalue = WhiteSpaceProcessor.collapse($value);
    9.43                  $_ngcc_current_state = 0;
    9.44              }
    9.45              break;
    10.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java	Tue Oct 03 23:30:37 2017 -0700
    10.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java	Thu Nov 02 11:33:47 2017 -0700
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it
   10.10 @@ -25,22 +25,21 @@
   10.11  
   10.12  /* this file is generated by RelaxNGCC */
   10.13  package com.sun.xml.internal.xsom.impl.parser.state;
   10.14 +
   10.15 +import com.sun.xml.internal.bind.WhiteSpaceProcessor;
   10.16 +import com.sun.xml.internal.xsom.*;
   10.17 +import com.sun.xml.internal.xsom.impl.*;
   10.18 +import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
   10.19 +import com.sun.xml.internal.xsom.parser.*;
   10.20 +
   10.21 +import java.util.Collections;
   10.22 +import java.util.HashSet;
   10.23 +import java.util.Set;
   10.24 +import java.util.StringTokenizer;
   10.25 +
   10.26 +import org.xml.sax.Attributes;
   10.27 +import org.xml.sax.Locator;
   10.28  import org.xml.sax.SAXException;
   10.29 -import org.xml.sax.XMLReader;
   10.30 -import org.xml.sax.Attributes;
   10.31 -import com.sun.xml.internal.xsom.impl.parser.NGCCRuntimeEx;
   10.32 -
   10.33 -    import com.sun.xml.internal.xsom.*;
   10.34 -    import com.sun.xml.internal.xsom.parser.*;
   10.35 -    import com.sun.xml.internal.xsom.impl.*;
   10.36 -    import com.sun.xml.internal.xsom.impl.parser.*;
   10.37 -    import org.xml.sax.Locator;
   10.38 -    import org.xml.sax.ContentHandler;
   10.39 -    import org.xml.sax.helpers.*;
   10.40 -    import java.util.*;
   10.41 -    import java.math.BigInteger;
   10.42 -
   10.43 -
   10.44  
   10.45  class simpleType extends NGCCHandler {
   10.46      private AnnotationImpl annotation;
   10.47 @@ -373,7 +372,7 @@
   10.48          switch($_ngcc_current_state) {
   10.49          case 13:
   10.50              {
   10.51 -                name = $value;
   10.52 +                name = WhiteSpaceProcessor.collapse($value);
   10.53                  $_ngcc_current_state = 12;
   10.54              }
   10.55              break;

mercurial