IO-162 Minor refactoring to improve readability

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1004122 13f79535-47bb-0310-9956-ffa450edef68

Author: Niall Pemberton

src/java/org/apache/commons/io/input/XmlStreamReader.java

@@ -603,8 +603,12 @@ private static String getContentTypeMime(String httpContentType) {
         String mime = null;
         if (httpContentType != null) {
             int i = httpContentType.indexOf(";");
-            mime = ((i == -1) ? httpContentType : httpContentType.substring(0,
-                    i)).trim();
+            if (i >= 0) {
+                mime = httpContentType.substring(0, i);
+            } else {
+                mime = httpContentType;
+            }
+            mime = mime.trim();
         }
         return mime;
     }
@@ -701,12 +705,11 @@ private static String getXmlProlog(InputStream is, String guessedEnc)
      * otherwise false
      */
     private static boolean isAppXml(String mime) {
-        return mime != null
-                && (mime.equals("application/xml")
-                        || mime.equals("application/xml-dtd")
-                        || mime
-                                .equals("application/xml-external-parsed-entity") || (mime
-                        .startsWith("application/") && mime.endsWith("+xml")));
+        return mime != null &&
+               (mime.equals("application/xml") || 
+                mime.equals("application/xml-dtd") ||
+                mime.equals("application/xml-external-parsed-entity") ||
+               (mime.startsWith("application/") && mime.endsWith("+xml")));
     }
 
     /**
@@ -717,10 +720,10 @@ private static boolean isAppXml(String mime) {
      * otherwise false
      */
     private static boolean isTextXml(String mime) {
-        return mime != null
-                && (mime.equals("text/xml")
-                        || mime.equals("text/xml-external-parsed-entity") || (mime
-                        .startsWith("text/") && mime.endsWith("+xml")));
+        return mime != null &&
+              (mime.equals("text/xml") ||
+               mime.equals("text/xml-external-parsed-entity") ||
+              (mime.startsWith("text/") && mime.endsWith("+xml")));
     }
 
     private static final MessageFormat RAW_EX_1 = new MessageFormat(