Fixed PMD warnings (Type: CollapsibleIfStatements)

Author: Knut Anders Hatlen

src/org/opensolaris/opengrok/analysis/TextAnalyzer.java

@@ -40,20 +40,18 @@ public final void analyze(Document doc, InputStream in) throws IOException {
     	byte[] head = new byte[3];
     	int br = in.read(head, 0, 3);
 
-    	if (br >= 2) {
-    		if ((head[0] == (byte)0xFE && head[1] == (byte)0xFF) || (head[0] == (byte)0xFF && (byte)head[1] == (byte)0xFE)) {
-    			charset = "UTF16";
-    			in.reset();	
-    		}
-    	}
-    	if (br >= 3) {
-    		if (head[0] == (byte)0xEF && head[1] == (byte)0xBB && head[2] == (byte)0xBF) {
-    			/* InputStreamReader does not properly discard BOM on UTF8 streams,
-    			 * so don't reset the stream. */ 
-    			charset = "UTF8";
-    		}
-    	}
-    	
+        if (br >= 2 &&
+                (head[0] == (byte)0xFE && head[1] == (byte)0xFF) ||
+                (head[0] == (byte)0xFF && head[1] == (byte)0xFE)) {
+            charset = "UTF-16";
+            in.reset();
+        } else if (br >= 3 & head[0] == (byte)0xEF && head[1] == (byte)0xBB &&
+                head[2] == (byte)0xBF) {
+            // InputStreamReader does not properly discard BOM on UTF8 streams,
+            // so don't reset the stream.
+            charset = "UTF-8";
+        }
+
     	if (charset == null) {
     		in.reset();
     		charset = Charset.defaultCharset().name();