Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 7 insertions, 3 deletions

diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java
index a7519429381d..1f4b93238f9c 100644
--- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java
+++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java
@@ -75,6 +75,7 @@ public abstract class TestResultsPanel extends JPanel implements Disposable {
     Disposer.register(this, myToolbarPanel);
     final Splitter splitter = createSplitter(mySplitterProportionProperty, mySplitterDefaultProportion);
     Disposer.register(this, new Disposable(){
+      @Override
       public void dispose() {
         remove(splitter);
         splitter.dispose();
@@ -91,6 +92,7 @@ public abstract class TestResultsPanel extends JPanel implements Disposable {
     rightPanel.add(SameHeightPanel.wrap(myStatusLine, myToolbarPanel), BorderLayout.NORTH);
     myStatisticsSplitter = createSplitter(myStatisticsSplitterProportionProperty, 0.5f);
     new AwtVisitor(myConsole) {
+      @Override
       public boolean visit(Component component) {
         if (component instanceof JScrollPane) {
           ((JScrollPane) component).putClientProperty(UIUtil.KEEP_BORDER_SIDES, SideBorder.TOP | SideBorder.LEFT);
@@ -104,6 +106,7 @@ public abstract class TestResultsPanel extends JPanel implements Disposable {
       showStatistics();
     }
     myProperties.addListener(TestConsoleProperties.SHOW_STATISTICS, new TestFrameworkPropertyListener<Boolean>() {
+      @Override
       public void onChanged(Boolean value) {
         if (value.booleanValue()) {
           showStatistics();
@@ -145,6 +148,7 @@ public abstract class TestResultsPanel extends JPanel implements Disposable {
     return outputTab;
   }
 
+  @Override
   public void dispose() {
   }
 
@@ -167,9 +171,9 @@ public abstract class TestResultsPanel extends JPanel implements Disposable {
     }
 
     splitter.addPropertyChangeListener(new PropertyChangeListener() {
-      public void propertyChange(final PropertyChangeEvent evt) {
-        if (propertiesComponent == null) return;
-        if (evt.getPropertyName().equals(Splitter.PROP_PROPORTION)) {
+      @Override
+      public void propertyChange(@NotNull final PropertyChangeEvent event) {
+        if (event.getPropertyName().equals(Splitter.PROP_PROPORTION)) {
           propertiesComponent.setValue(proportionProperty, String.valueOf(splitter.getProportion()));
         }
       }