From 5cae85b0aacac9972eb3b7c08efcd5f5b4148ca0 Mon Sep 17 00:00:00 2001 From: Andrei Kuznetsov Date: Thu, 3 Oct 2019 22:34:22 +0300 Subject: [PATCH] Fix compilation in Android plugin after rebase to newer master (merging AndroidStudio 3.5) GitOrigin-RevId: f966a11c817e51ab15e53198255cd40f75e693b8 --- .../com/intellij/build/output/BuildOutputInstantReader.java | 5 +++++ .../output/MavenBuildToolLogTestUtils.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java b/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java index c84b7c677803..e3a320539df4 100644 --- a/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java +++ b/platform/lang-api/src/com/intellij/build/output/BuildOutputInstantReader.java @@ -17,4 +17,9 @@ public interface BuildOutputInstantReader { void pushBack(); void pushBack(int numberOfLines); + + // FIXME-ank: this method should be removed + default String getCurrentLine(){ + return null; + } } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java index 83ed72d45316..daac1d0693a4 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/externalSystemIntegration/output/MavenBuildToolLogTestUtils.java @@ -371,7 +371,7 @@ public abstract class MavenBuildToolLogTestUtils extends UsefulTestCase { throw new UnsupportedOperationException(); } - private String getCurrentLine() { + public String getCurrentLine() { // FIXME-ank: made public (should be private) if (myPosition >= myLines.size() || myPosition < 0) { return null; }