svn commit: r1446968 - in /tomcat/trunk/java/org/apache/jasper/xmlparser: XMLChar.java XMLEncodingDetector.java XMLStringBuffer.java

[markt]

Author: markt
Date: Sat Feb 16 22:33:26 2013
New Revision: 1446968

URL: http://svn.apache.org/r1446968
Log:
UCDetector
 - use final
 - reduce visibility
 - remove unused code

Modified:
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
    tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java?rev=1446968&r1=1446967&r2=1446968&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLChar.java Sat Feb 16 
22:33:26 2013
@@ -843,32 +843,4 @@ public class XMLChar {
         }
         return false;
     } // isValidIANAEncoding(String):boolean
-
-    /**
-     * Returns true if the encoding name is a valid Java encoding.
-     * This method does not verify that there is a decoder available
-     * for this encoding, only that the characters are valid for an
-     * Java encoding name.
-     *
-     * @param javaEncoding The Java encoding name.
-     */
-    public static boolean isValidJavaEncoding(String javaEncoding) {
-        if (javaEncoding != null) {
-            int length = javaEncoding.length();
-            if (length > 0) {
-                for (int i = 1; i < length; i++) {
-                    char c = javaEncoding.charAt(i);
-                    if ((c < 'A' || c > 'Z') && (c < 'a' || c > 'z') &&
-                        (c < '0' || c > '9') && c != '.' && c != '_' &&
-                        c != '-') {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    } // isValidIANAEncoding(String):boolean
-
-
 } // class XMLChar

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1446968&r1=1446967&r2=1446968&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Sat 
Feb 16 22:33:26 2013
@@ -50,10 +50,10 @@ public class XMLEncodingDetector {
     private Reader reader;
 
     // org.apache.xerces.impl.XMLEntityManager fields
-    public static final int DEFAULT_BUFFER_SIZE = 2048;
-    public static final int DEFAULT_XMLDECL_BUFFER_SIZE = 64;
-    private SymbolTable fSymbolTable;
-    private XMLEncodingDetector fCurrentEntity;
+    private static final int DEFAULT_BUFFER_SIZE = 2048;
+    private static final int DEFAULT_XMLDECL_BUFFER_SIZE = 64;
+    private final SymbolTable fSymbolTable;
+    private final XMLEncodingDetector fCurrentEntity;
     private int fBufferSize = DEFAULT_BUFFER_SIZE;
 
     // org.apache.xerces.impl.XMLEntityManager.ScannedEntity fields
@@ -62,15 +62,15 @@ public class XMLEncodingDetector {
     private int count;
 
     // org.apache.xerces.impl.XMLScanner fields
-    private XMLString fString = new XMLString();
-    private XMLStringBuffer fStringBuffer = new XMLStringBuffer();
-    private XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
+    private final XMLString fString = new XMLString();
+    private final XMLStringBuffer fStringBuffer = new XMLStringBuffer();
+    private final XMLStringBuffer fStringBuffer2 = new XMLStringBuffer();
     private static final String fVersionSymbol = "version";
     private static final String fEncodingSymbol = "encoding";
     private static final String fStandaloneSymbol = "standalone";
 
     // org.apache.xerces.impl.XMLDocumentFragmentScannerImpl fields
-    private String[] fStrings = new String[3];
+    private final String[] fStrings = new String[3];
 
     private ErrorDispatcher err;
 

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java?rev=1446968&r1=1446967&r2=1446968&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLStringBuffer.java Sat Feb 
16 22:33:26 2013
@@ -54,7 +54,7 @@ public class XMLStringBuffer
     //
 
     /** Default buffer size (32). */
-    public static final int DEFAULT_SIZE = 32;
+    private static final int DEFAULT_SIZE = 32;
 
     //
     // Constructors



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org