From dab8de9f55d7f22cc782ca0bd35ab2442e612bb4 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 13 Apr 2011 20:32:20 +0400 Subject: [PATCH] slightly change DiffPanel interface --- .../src/com/intellij/openapi/diff/DiffPanel.java | 10 ++++++---- .../com/intellij/openapi/diff/impl/DiffPanelImpl.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffPanel.java b/platform/platform-api/src/com/intellij/openapi/diff/DiffPanel.java index 6af7bcc44655..1c9734df8911 100644 --- a/platform/platform-api/src/com/intellij/openapi/diff/DiffPanel.java +++ b/platform/platform-api/src/com/intellij/openapi/diff/DiffPanel.java @@ -15,13 +15,15 @@ */ package com.intellij.openapi.diff; -public interface DiffPanel extends DiffViewer { +import com.intellij.openapi.Disposable; +/** + * @author Konstantin Bulenkov + */ +public interface DiffPanel extends DiffViewer, Disposable { void setTitle1(String title); void setTitle2(String title); void setContents(DiffContent content1, DiffContent content2); - + void setRequestFocus(boolean requestFocus); boolean hasDifferences(); - - void dispose(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java index b456c62c6a5c..717b836374ea 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java @@ -386,7 +386,7 @@ public class DiffPanelImpl implements DiffPanelEx, ContentChangeListener, TwoSid } } - public void setIsRequestFocus(boolean isRequestFocus) { + public void setRequestFocus(boolean isRequestFocus) { myIsRequestFocus = isRequestFocus; }