diff --git a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java index 4cf6390f19c0..0b0632aa8fdf 100644 --- a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java @@ -18,7 +18,6 @@ package com.intellij.openapi.diff.impl.settings; import com.intellij.application.options.colors.ColorAndFontSettingsListener; import com.intellij.application.options.colors.PreviewPanel; -import com.intellij.diff.DiffContentFactory; import com.intellij.diff.DiffContext; import com.intellij.diff.contents.DiffContent; import com.intellij.diff.requests.ContentDiffRequest; @@ -30,14 +29,12 @@ import com.intellij.diff.util.DiffUtil; import com.intellij.diff.util.TextDiffTypeFactory.TextDiffTypeImpl; import com.intellij.diff.util.ThreeSide; import com.intellij.openapi.diff.DiffBundle; -import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.event.*; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.ex.util.EditorUtil; -import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.ui.IdeBorderFactory; @@ -112,12 +109,6 @@ class DiffPreviewPanel implements PreviewPanel { myContents = Arrays.asList(DiffPreviewProvider.getContents()); } - private static DiffContent convert(@NotNull com.intellij.openapi.diff.DiffContent content) { - Document document = content.getDocument(); - FileType fileType = content.getContentType(); - return DiffContentFactory.getInstance().create(null, document, fileType); - } - @NotNull @Override public List getContents() { diff --git a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java index 6ad6cb479202..f1fe07b82d07 100644 --- a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java +++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewProvider.java @@ -51,9 +51,9 @@ public abstract class DiffPreviewProvider { @NotNull String right, @NotNull FileType fileType) { return new DiffContent[]{ - createContent(left, StdFileTypes.JAVA), - createContent(center, StdFileTypes.JAVA), - createContent(right, StdFileTypes.JAVA)}; + createContent(left, fileType), + createContent(center, fileType), + createContent(right, fileType)}; } @NotNull