Commit c71d734d authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Android: Fix Javaparser



Make sure to send output down the right channel in case some
parser is appended.

Change-Id: Ibb6810acf7498c07d5169b6133d8d04ce21ce993
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent f1741032
...@@ -37,15 +37,26 @@ using namespace ProjectExplorer; ...@@ -37,15 +37,26 @@ using namespace ProjectExplorer;
JavaParser::JavaParser() : JavaParser::JavaParser() :
m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$")) m_javaRegExp(QLatin1String("^(.*\\[javac\\]\\s)(.*\\.java):(\\d+):(.*)$"))
{ { }
}
void JavaParser::stdOutput(const QString &line) void JavaParser::stdOutput(const QString &line)
{ {
stdError(line); parse(line);
IOutputParser::stdOutput(line);
} }
void JavaParser::stdError(const QString &line) void JavaParser::stdError(const QString &line)
{
parse(line);
IOutputParser::stdError(line);
}
void JavaParser::setProjectFileList(const QStringList &fileList)
{
m_fileList = fileList;
}
void JavaParser::parse(const QString &line)
{ {
if (m_javaRegExp.indexIn(line) > -1) { if (m_javaRegExp.indexIn(line) > -1) {
bool ok; bool ok;
...@@ -67,10 +78,5 @@ void JavaParser::stdError(const QString &line) ...@@ -67,10 +78,5 @@ void JavaParser::stdError(const QString &line)
emit addTask(task); emit addTask(task);
return; return;
} }
IOutputParser::stdError(line);
}
void JavaParser::setProjectFileList(const QStringList &fileList)
{
m_fileList = fileList;
} }
...@@ -46,6 +46,8 @@ public: ...@@ -46,6 +46,8 @@ public:
void setProjectFileList(const QStringList &fileList); void setProjectFileList(const QStringList &fileList);
private: private:
void parse(const QString &line);
QRegExp m_javaRegExp; QRegExp m_javaRegExp;
QStringList m_fileList; QStringList m_fileList;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment