From 709bbc08d7922cdec972a7a361748e77d7fe2449 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 20 Feb 2014 11:32:25 +0100 Subject: [PATCH 1/2] better class naming --- .../intellij/execution/console/LanguageConsoleBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java index c62e08929e9a..c9ba26bbd3a3 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java +++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java @@ -239,7 +239,7 @@ public class LanguageConsoleBuilder { EditorEx editor = getHistoryViewer(); int endOffset = getDocument().getTextLength(); - lineSeparatorPainter = new MyRangeMarkerImpl(editor, endOffset); + lineSeparatorPainter = new LineSeparatorPainter(editor, endOffset); editor.getMarkupModel().addRangeHighlighter(lineSeparatorPainter, 0, endOffset, false, false, HighlighterLayer.ADDITIONAL_SYNTAX); } @@ -306,7 +306,7 @@ public class LanguageConsoleBuilder { } } - private final class MyRangeMarkerImpl extends RangeMarkerImpl implements RangeHighlighterEx, Getter { + private final class LineSeparatorPainter extends RangeMarkerImpl implements RangeHighlighterEx, Getter { private final CustomHighlighterRenderer renderer = new CustomHighlighterRenderer() { @Override public void paint(@NotNull Editor editor, @NotNull RangeHighlighter highlighter, @NotNull Graphics g) { @@ -332,7 +332,7 @@ public class LanguageConsoleBuilder { } }; - public MyRangeMarkerImpl(@NotNull EditorEx editor, int endOffset) { + public LineSeparatorPainter(@NotNull EditorEx editor, int endOffset) { super(editor.getDocument(), 0, endOffset, false); } From cd937d15f6c34bd1d0937231e1585be7ebc79376 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 20 Feb 2014 11:33:37 +0100 Subject: [PATCH 2/2] better class naming --- .../execution/console/LanguageConsoleBuilder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java index c9ba26bbd3a3..ef688972a61a 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java +++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java @@ -43,7 +43,7 @@ public class LanguageConsoleBuilder { } public LanguageConsoleBuilder(@NotNull Project project, @NotNull Language language) { - myConsole = new MyLanguageConsole(project, language); + myConsole = new GutteredLanguageConsole(project, language); } public LanguageConsoleBuilder processHandler(@NotNull ProcessHandler processHandler) { @@ -91,7 +91,7 @@ public class LanguageConsoleBuilder { } public LanguageConsoleBuilder historyAnnotation(@Nullable GutterContentProvider provider) { - ((MyLanguageConsole)myConsole).gutterContentProvider = provider; + ((GutteredLanguageConsole)myConsole).gutterContentProvider = provider; return this; } @@ -127,11 +127,11 @@ public class LanguageConsoleBuilder { } } - private static class MyLanguageConsole extends LanguageConsoleImpl { + private final static class GutteredLanguageConsole extends LanguageConsoleImpl { @Nullable private GutterContentProvider gutterContentProvider; - public MyLanguageConsole(@NotNull Project project, @NotNull Language language) { + public GutteredLanguageConsole(@NotNull Project project, @NotNull Language language) { super(project, language.getDisplayName() + " Console", language, false); } @@ -222,7 +222,7 @@ public class LanguageConsoleBuilder { this.lineEndGutter = lineEndGutter; // console view can invoke markupModel.removeAllHighlighters(), so, we must be aware of it - getHistoryViewer().getMarkupModel().addMarkupModelListener(MyLanguageConsole.this, new MarkupModelListener.Adapter() { + getHistoryViewer().getMarkupModel().addMarkupModelListener(GutteredLanguageConsole.this, new MarkupModelListener.Adapter() { @Override public void beforeRemoved(@NotNull RangeHighlighterEx highlighter) { if (lineSeparatorPainter == highlighter) {