From fa82b9ebe63dbd8b0df40f09e1f204f252bcac34 Mon Sep 17 00:00:00 2001 From: Daniel Marcotte Date: Thu, 6 Dec 2012 12:48:27 -0800 Subject: [PATCH] Remove duplicated editor setup --- .../com/intellij/openapi/vcs/ui/CommitMessage.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java index b9c91e66ac35..100d3aa73ff9 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java @@ -20,7 +20,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.editor.EditorSettings; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.extensions.Extensions; @@ -137,20 +136,12 @@ public class CommitMessage extends AbstractDataProviderPanel implements Disposab new EditorTextFieldProvider.AdHocEditorCustomizer() { @Override public void customize(EditorEx editor) { - editor.getScrollPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); - editor.setHorizontalScrollbarVisible(true); - EditorSettings settings = editor.getSettings(); - settings.setAdditionalColumnsCount(3); - settings.setVirtualSpace(false); - settings.setUseSoftWraps(true); - settings.setAdditionalPageAtBottom(true); - toggleEditorSpellchecking(project, editor, checkSpelling); if (useCommitMessageMargin) { editor.setColorsScheme(EditorColorsManager.getInstance().getGlobalScheme()); - settings.setRightMarginShown(true); - settings.setRightMargin(commitMessageMarginSize); + editor.getSettings().setRightMarginShown(true); + editor.getSettings().setRightMargin(commitMessageMarginSize); } } });