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

changeset 533:494d27cb3cd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coffeys
date Thu, 20 Dec 2012 12:44:27 +0000
parents c598313b43e6 (current diff) ac66e6701b65 (diff)
children eaeaa603e9b9
files .hgtags
diffstat 4 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 18 12:35:14 2012 +0000
+++ b/.hgtags	Thu Dec 20 12:44:27 2012 +0000
@@ -236,3 +236,4 @@
 8e3a4e47ce71a0add89eca5b079e02ae3a81c594 jdk7u12-b02
 1aa52991dfa7468d676557bf9fd6fd0e98c3d097 jdk7u12-b03
 464e19bd9db89b200a002e2001d0e8f352cf5ff9 jdk7u12-b04
+3db0cfb507771458da8978248de7598ebe7c20d8 jdk7u12-b05
--- a/src/com/sun/org/apache/xerces/internal/impl/Version.java	Tue Dec 18 12:35:14 2012 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/Version.java	Thu Dec 20 12:44:27 2012 +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	Tue Dec 18 12:35:14 2012 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Thu Dec 20 12:44:27 2012 +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	Tue Dec 18 12:35:14 2012 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java	Thu Dec 20 12:44:27 2012 +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