Lint bug fixes

This changeset fixes a couple of Lint bugs:

(1) Handle BOMs (byte order marks) in Java files. We already handle
    this for XML files (where it's common) but these can be present in
    other file types as well, such as Java.

    See http://code.google.com/p/android/issues/detail?id=25952

(2) Fix a bug (false positive) in the FloatMath detector; the visitor
    approach can get confused; do simple ASM node iteration instead
    (which is how all the other detectors work; this detector was
    written before we had the ASM DOM model)

Change-Id: I65b4e6cd8d8e6c7e591433d8eb5aedf273e2caad

1 files changed, 2 insertions, 3 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
index 3da3fc2..000abd9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
@@ -36,6 +36,7 @@ import com.android.tools.lint.detector.api.DefaultPosition;
 import com.android.tools.lint.detector.api.Detector;
 import com.android.tools.lint.detector.api.Issue;
 import com.android.tools.lint.detector.api.JavaContext;
+import com.android.tools.lint.detector.api.LintUtils;
 import com.android.tools.lint.detector.api.Location;
 import com.android.tools.lint.detector.api.Location.Handle;
 import com.android.tools.lint.detector.api.Position;
@@ -43,8 +44,6 @@ import com.android.tools.lint.detector.api.Project;
 import com.android.tools.lint.detector.api.Severity;
 import com.android.tools.lint.detector.api.XmlContext;
 import com.android.util.Pair;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -572,7 +571,7 @@ public class EclipseLintClient extends LintClient implements IDomParser {
 
     private String readPlainFile(File file) {
         try {
-            return Files.toString(file, Charsets.UTF_8);
+            return LintUtils.getEncodedString(file);
         } catch (IOException e) {
             return ""; //$NON-NLS-1$
         }