Mercurial > hg > release > icedtea7-forest-2.4 > jaxp

changeset 538:14adb683be4e icedtea-2.4-branchpoint

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u12-b09
author andrew
date Mon, 14 Jan 2013 15:00:18 +0000
parents b67573b17099 (current diff) 23191c790e12 (diff)
children cba4d3377850
files .hgtags src/com/sun/org/apache/xerces/internal/impl/Version.java src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
diffstat 4 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 03 15:32:36 2013 +0000
+++ b/.hgtags	Mon Jan 14 15:00:18 2013 +0000
@@ -220,6 +220,16 @@
 78d9e4853388a2e7be18ff18c0b5330c074cb514 jdk7u9-b02
 b12a2d557c5e302b614c5f7e25ad6c8a0e138742 jdk7u9-b04
 ab4bbb93b3831aca230c62431f7fe02b56793450 jdk7u9-b05
+254ed6ae237ee631179819570cf7fb265c6fb3a8 jdk7u10-b10
+c1df39bcc9c1bcdfb2a92682650264b3b7771ce8 jdk7u10-b11
+00cfd60368048c4969785eb52ec50cf5691c4367 jdk7u10-b12
+51efccc2b4e908fa0475075739c1463d1dd50efc jdk7u10-b13
+c245a6332320a86342683e6f732f3f8f2f4de69a jdk7u10-b14
+89b043ba2e01e969090e23a5a7a2e9f7165ff5a0 jdk7u10-b15
+5449d5396bd8deee90f18f29899343129e3cdc4e jdk7u10-b16
+86c75e6aa3a7fa9a587fc7dd2d08af8aa8ffb9a9 jdk7u10-b17
+162a2c6ad8718a63253fa53724f704a4f85731bc jdk7u10-b18
+c59eb287de720ae5ce8087f179ec01f4f6525a32 jdk7u10-b30
 1365e7472a3b737dda4a73e06ad41718d667d9be jdk7u8-b01
 0a313d4307930be3a64106b9b8c90f9342673aa0 jdk7u8-b02
 36cba5ea434944cef64fa281112b158fae93c0fa jdk7u8-b03
@@ -235,3 +245,6 @@
 464e19bd9db89b200a002e2001d0e8f352cf5ff9 jdk7u12-b04
 3db0cfb507771458da8978248de7598ebe7c20d8 jdk7u12-b05
 c84c463893504a93a38f4abfa4d057869e9ae918 jdk7u12-b06
+1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07
+427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08
+366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09
--- a/src/com/sun/org/apache/xerces/internal/impl/Version.java	Thu Jan 03 15:32:36 2013 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/Version.java	Mon Jan 14 15:00:18 2013 +0000
@@ -74,7 +74,7 @@
 
     /** Version string.
      * @deprecated  getVersion() should be used instead.  */
-    public static String fVersion = "Xerces-J 2.7.1";
+    public static final String fVersion = getVersion();
 
     private static final String fImmutableVersion = "Xerces-J 2.7.1";
 
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Thu Jan 03 15:32:36 2013 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Mon Jan 14 15:00:18 2013 +0000
@@ -193,9 +193,12 @@
                 null,
     };
 
-    protected static final char [] cdata = {'[','C','D','A','T','A','['};
-    protected static final char [] xmlDecl = {'<','?','x','m','l'};
-    protected static final char [] endTag = {'<','/'};
+    private static final char [] cdata = {'[','C','D','A','T','A','['};
+    private static final char [] endTag = {'<','/'};
+
+    //this variable is also used by XMLDocumentScannerImpl in the same package
+    static final char [] xmlDecl = {'<','?','x','m','l'};
+
     // debugging
 
     /** Debug scanner state. */
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	Thu Jan 03 15:32:36 2013 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	Mon Jan 14 15:00:18 2013 +0000
@@ -71,7 +71,7 @@
     /** Listeners which should know when load is being called */
     private Vector listeners = new Vector();
 
-    public static final boolean [] VALID_NAMES = new boolean[127];
+    private static final boolean [] VALID_NAMES = new boolean[127];
 
     /**
      * Debug printing of buffer. This debugging flag works best when you