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

diff: set correct window title on fail

Browse Source
This commit is contained in:
Aleksey Pivovarov
2014-12-03 16:04:04 +03:00
parent e065590cc6
commit a61e32a71b
2 changed files with 12 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/CompositeDiffPanel.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class CompositeDiffPanel implements DiffViewer {
}
if (myMap.isEmpty()) {
final ErrorDiffViewer errorDiffViewer = new ErrorDiffViewer(request);
final ErrorDiffViewer errorDiffViewer = new ErrorDiffViewer(myWindow, request);
final Content content = myUi.createContent(FICTIVE_KEY, errorDiffViewer.getComponent(), FICTIVE_KEY, null,
errorDiffViewer.getPreferredFocusedComponent());
content.setCloseable(false);
platform/platform-impl/src/com/intellij/openapi/diff/impl/ErrorDiffViewer.java
+11 -1
View File
@@ -39,7 +39,7 @@ public class ErrorDiffViewer implements DiffViewer {
@NotNull private final JPanel myPanel;
@NotNull private final DiffToolbarComponent myToolbar;
protected ErrorDiffViewer(@NotNull DiffRequest request) {
protected ErrorDiffViewer(Window window, @NotNull DiffRequest request) {
myRequest = request;
myPanel = new AbstractDataProviderPanel(new BorderLayout(), false) {
@@ -84,6 +84,16 @@ public class ErrorDiffViewer implements DiffViewer {
final JPanel messagePanel = createMessagePanel(message);
myPanel.add(messagePanel, BorderLayout.CENTER);
setWindowTitle(window, request.getWindowTitle());
}
private static void setWindowTitle(Window window, String title) {
if (title == null || title.isEmpty()) title = "Diff";
if (window instanceof JDialog) {
((JDialog)window).setTitle(title);
}
else if (window instanceof JFrame) ((JFrame)window).setTitle(title);
}
@Override