1 files changed, 25 insertions, 31 deletions
diff --git a/src/plugins/android/javaparser.cpp b/src/plugins/android/javaparser.cpp
index 1f45263675f..8be5f08b82e 100644
--- a/src/plugins/android/javaparser.cpp
+++ b/src/plugins/android/javaparser.cpp
@@ -51,39 +51,33 @@ void JavaParser::setSourceDirectory(const Utils::FilePath &sourceDirectory)
     m_sourceDirectory = sourceDirectory;
 }
 
-void JavaParser::handleLine(const QString &line, Utils::OutputFormat type)
+IOutputParser::Status JavaParser::doHandleLine(const QString &line, Utils::OutputFormat type)
 {
-    parse(line);
-    IOutputParser::handleLine(line, type);
-}
-
-void JavaParser::parse(const QString &line)
-{
-    if (m_javaRegExp.indexIn(line) > -1) {
-        bool ok;
-        int lineno = m_javaRegExp.cap(3).toInt(&ok);
-        if (!ok)
-            lineno = -1;
-        Utils::FilePath file = Utils::FilePath::fromUserInput(m_javaRegExp.cap(2));
-        if (file.isChildOf(m_buildDirectory)) {
-            Utils::FilePath relativePath = file.relativeChildPath(m_buildDirectory);
-            file = m_sourceDirectory.pathAppended(relativePath.toString());
-        }
+    Q_UNUSED(type);
+    if (m_javaRegExp.indexIn(line) == -1)
+        return Status::NotHandled;
 
-        if (file.toFileInfo().isRelative()) {
-            for (int i = 0; i < m_fileList.size(); i++)
-                if (m_fileList[i].endsWith(file.toString())) {
-                    file = Utils::FilePath::fromString(m_fileList[i]);
-                    break;
-                }
-        }
-
-        CompileTask task(Task::Error,
-                         m_javaRegExp.cap(4).trimmed(),
-                         absoluteFilePath(file),
-                         lineno);
-        emit addTask(task, 1);
-        return;
+    bool ok;
+    int lineno = m_javaRegExp.cap(3).toInt(&ok);
+    if (!ok)
+        lineno = -1;
+    Utils::FilePath file = Utils::FilePath::fromUserInput(m_javaRegExp.cap(2));
+    if (file.isChildOf(m_buildDirectory)) {
+        Utils::FilePath relativePath = file.relativeChildPath(m_buildDirectory);
+        file = m_sourceDirectory.pathAppended(relativePath.toString());
+    }
+    if (file.toFileInfo().isRelative()) {
+        for (int i = 0; i < m_fileList.size(); i++)
+            if (m_fileList[i].endsWith(file.toString())) {
+                file = Utils::FilePath::fromString(m_fileList[i]);
+                break;
+            }
     }
 
+    CompileTask task(Task::Error,
+                     m_javaRegExp.cap(4).trimmed(),
+                     absoluteFilePath(file),
+                     lineno);
+    emit addTask(task, 1);
+    return Status::Done;
 }