svn commit: r1004854 - /commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java

[niallp]

Author: niallp
Date: Tue Oct  5 23:47:22 2010
New Revision: 1004854

URL: http://svn.apache.org/viewvc?rev=1004854&view=rev
Log:
Change the visibility of the *utility* methods from private to package (so that 
the XmlStreamReaderUtilitiesTest can also be run against the "compatibility" 
version of XmlStreamReader)

Modified:
    
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java

Modified: 
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java?rev=1004854&r1=1004853&r2=1004854&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
 (original)
+++ 
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
 Tue Oct  5 23:47:22 2010
@@ -434,7 +434,7 @@ public class XmlStreamReader extends Rea
     }
 
     // InputStream is passed for XmlStreamReaderException creation only
-    private String calculateRawEncoding(String bomEnc, String xmlGuessEnc,
+    String calculateRawEncoding(String bomEnc, String xmlGuessEnc,
             String xmlEnc, InputStream is) throws IOException {
         String encoding;
         if (bomEnc == null) {
@@ -480,7 +480,7 @@ public class XmlStreamReader extends Rea
     }
 
     // InputStream is passed for XmlStreamReaderException creation only
-    private String calculateHttpEncoding(String cTMime, String cTEnc,
+    String calculateHttpEncoding(String cTMime, String cTEnc,
             String bomEnc, String xmlGuessEnc, String xmlEnc, InputStream is,
             boolean lenient) throws IOException {
         String encoding;
@@ -527,7 +527,7 @@ public class XmlStreamReader extends Rea
     }
 
     // returns MIME type or NULL if httpContentType is NULL
-    private static String getContentTypeMime(String httpContentType) {
+    static String getContentTypeMime(String httpContentType) {
         String mime = null;
         if (httpContentType != null) {
             int i = httpContentType.indexOf(";");
@@ -542,7 +542,7 @@ public class XmlStreamReader extends Rea
 
     // returns charset parameter value, NULL if not present, NULL if
     // httpContentType is NULL
-    private static String getContentTypeEncoding(String httpContentType) {
+    static String getContentTypeEncoding(String httpContentType) {
         String encoding = null;
         if (httpContentType != null) {
             int i = httpContentType.indexOf(";");
@@ -558,7 +558,7 @@ public class XmlStreamReader extends Rea
 
     // returns the BOM in the stream, NULL if not present,
     // if there was BOM the in the stream it is consumed
-    private static String getBOMEncoding(BufferedInputStream is)
+    static String getBOMEncoding(BufferedInputStream is)
             throws IOException {
         String encoding = null;
         int[] bytes = new int[3];
@@ -668,7 +668,7 @@ public class XmlStreamReader extends Rea
     }
 
     // indicates if the MIME type belongs to the APPLICATION XML family
-    private static boolean isAppXml(String mime) {
+    static boolean isAppXml(String mime) {
         return mime != null
                 && (mime.equals("application/xml")
                         || mime.equals("application/xml-dtd")
@@ -678,7 +678,7 @@ public class XmlStreamReader extends Rea
     }
 
     // indicates if the MIME type belongs to the TEXT XML family
-    private static boolean isTextXml(String mime) {
+    static boolean isTextXml(String mime) {
         return mime != null
                 && (mime.equals("text/xml")
                         || mime.equals("text/xml-external-parsed-entity") || 
(mime