MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

copy/paste problems fix WI-6376, IDEA-68278, IDEA-68956, IDEA-66122, IDEA-62935, IDEA-67697

Browse Source
This commit is contained in:
Konstantin Bulenkov
2011-05-20 19:13:09 +04:00
parent c15ff45554
commit 387ecdf8dd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/diff/impl/util/DiffPanelOutterComponent.java
+6 -2
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.diff.DiffRequest;
import com.intellij.openapi.diff.DiffToolbar;
import com.intellij.openapi.diff.ex.DiffStatusBar;
import com.intellij.openapi.diff.impl.DiffToolbarComponent;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import javax.swing.*;
@@ -104,8 +105,11 @@ public class DiffPanelOutterComponent extends JPanel implements DataProvider {
return null;
}
}
FocusDiffSide side = (FocusDiffSide)myDataProvider.getData(FocusDiffSide.DATA_KEY.getName());
if (side != null) return side.getEditor();
final FocusDiffSide side = (FocusDiffSide)myDataProvider.getData(FocusDiffSide.DATA_KEY.getName());
if (side != null) {
final Editor editor = side.getEditor();
return editor != null && editor.getComponent().hasFocus() ? editor : null;
}
}
return myDataProvider.getData(dataId);
}