From bc7dd0961de13ad4a8d3bcbe1eb5d25d4cd107b3 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 11 Jul 2012 18:43:28 +0200
Subject: [PATCH] IDEA-88537 File Cache Conflict diff viewing dialog has no
 maximize button and is too small

---
 .../openapi/fileEditor/impl/FileDocumentManagerImpl.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
index 28efc4d225f6..7192cff0ded0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
@@ -613,6 +613,7 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl
         DiffPanelImpl diffPanel = (DiffPanelImpl)DiffManager.getInstance().createDiffPanel(diffBuilder.getWindow(), project,diffBuilder);
         diffPanel.getOptions().setShowSourcePolicy(DiffPanelOptions.ShowSourcePolicy.DONT_SHOW);
         diffBuilder.setCenterPanel(diffPanel.getComponent());
+        diffBuilder.setDimensionServiceKey("FileDocumentManager.FileCacheConflict");
         diffPanel.setDiffRequest(request);
         diffBuilder.addOkAction().setText(UIBundle.message("file.cache.conflict.save.changes.button"));
         diffBuilder.addCancelAction();