From f517480f33bcb73f9c3ddf6d463b6530fcb8d5d6 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 20 Mar 2017 17:04:55 +0300 Subject: [PATCH] diff: remove dead code --- .../diff/tools/simple/SimpleDiffViewer.java | 1 - .../simple/ThreesideTextDiffViewerEx.java | 1 - .../diff/util/DiffDividerDrawUtil.java | 31 ++----------------- .../com/intellij/diff/util/DiffDrawUtil.java | 7 ----- .../diff/util/DiffLineSeparatorRenderer.java | 11 ------- .../properties/SvnPropertiesDiffViewer.java | 2 +- 6 files changed, 4 insertions(+), 49 deletions(-) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java index 683fcd8a6f98..b6d8220062b1 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java @@ -749,7 +749,6 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { gg.setColor(DiffDrawUtil.getDividerColor(getEditor1())); gg.fill(gg.getClipBounds()); - //DividerPolygonUtil.paintSimplePolygons(gg, divider.getWidth(), getEditor1(), getEditor2(), this); DiffDividerDrawUtil.paintPolygons(gg, divider.getWidth(), getEditor1(), getEditor2(), this); myFoldingModel.paintOnDivider(gg, divider); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java index 264204dcefd3..8b85d7a84a13 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java @@ -399,7 +399,6 @@ public abstract class ThreesideTextDiffViewerEx extends ThreesideTextDiffViewer Editor editor1 = mySide.select(getEditor(ThreeSide.LEFT), getEditor(ThreeSide.BASE)); Editor editor2 = mySide.select(getEditor(ThreeSide.BASE), getEditor(ThreeSide.RIGHT)); - //DividerPolygonUtil.paintSimplePolygons(gg, divider.getWidth(), editor1, editor2, myPaintable); DiffDividerDrawUtil.paintPolygons(gg, divider.getWidth(), editor1, editor2, myPaintable); myFoldingModel.paintOnDivider(gg, divider, mySide); diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java index 845976dd0d1e..0ce75b9101bc 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java @@ -64,20 +64,11 @@ public class DiffDividerDrawUtil { @NotNull Editor editor1, @NotNull Editor editor2, @NotNull DividerPaintable paintable) { - paintPolygons(gg, width, true, true, editor1, editor2, paintable); - } - - public static void paintSimplePolygons(@NotNull Graphics2D gg, - int width, - @NotNull Editor editor1, - @NotNull Editor editor2, - @NotNull DividerPaintable paintable) { - paintPolygons(gg, width, true, false, editor1, editor2, paintable); + paintPolygons(gg, width, true, editor1, editor2, paintable); } public static void paintPolygons(@NotNull Graphics2D gg, int width, - boolean paintBorder, boolean curved, @NotNull Editor editor1, @NotNull Editor editor2, @@ -86,7 +77,7 @@ public class DiffDividerDrawUtil { GraphicsConfig config = GraphicsUtil.setupAAPainting(gg); for (DividerPolygon polygon : polygons) { - polygon.paint(gg, width, paintBorder, curved); + polygon.paint(gg, width, curved); } config.restore(); } @@ -160,14 +151,6 @@ public class DiffDividerDrawUtil { }; } - @NotNull - private static DividerPolygon createPolygon(@NotNull Transformation[] transformations, - int startLine1, int endLine1, - int startLine2, int endLine2, - @NotNull Color color) { - return createPolygon(transformations, startLine1, endLine1, startLine2, endLine2, color, false); - } - @NotNull private static DividerPolygon createPolygon(@NotNull Transformation[] transformations, int startLine1, int endLine1, @@ -228,10 +211,6 @@ public class DiffDividerDrawUtil { @NotNull private final Color myColor; private final boolean myResolved; - public DividerPolygon(int start1, int start2, int end1, int end2, @NotNull Color color) { - this(start1, start2, end1, end2, color, false); - } - public DividerPolygon(int start1, int start2, int end1, int end2, @NotNull Color color, boolean resolved) { myStart1 = start1; myStart2 = start2; @@ -241,7 +220,7 @@ public class DiffDividerDrawUtil { myResolved = resolved; } - public void paint(Graphics2D g, int width, boolean paintBorder, boolean curve) { + public void paint(Graphics2D g, int width, boolean curve) { int startY1; int endY1; int startY2; @@ -295,10 +274,6 @@ public class DiffDividerDrawUtil { private final int myEnd2; @Nullable private final EditorColorsScheme myScheme; - public DividerSeparator(int start1, int start2, int end1, int end2) { - this(start1, start2, end1, end2, null); - } - public DividerSeparator(int start1, int start2, int end1, int end2, @Nullable EditorColorsScheme scheme) { myStart1 = start1; myStart2 = start2; diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java index 0d448a8560eb..f44f49c35d9e 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java @@ -83,13 +83,6 @@ public class DiffDrawUtil { return gutterBackground; } - public static void drawConnectorLineSeparator(@NotNull Graphics2D g, - int x1, int x2, - int start1, int end1, - int start2, int end2) { - drawConnectorLineSeparator(g, x1, x2, start1, end1, start2, end2, null); - } - public static void drawConnectorLineSeparator(@NotNull Graphics2D g, int x1, int x2, int start1, int end1, diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java b/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java index e6d677df7588..b9c1b08b7a6d 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java @@ -40,22 +40,11 @@ public class DiffLineSeparatorRenderer implements LineMarkerRendererEx, LineSepa @NotNull private final Editor myEditor; @NotNull private final BooleanGetter myCondition; - public DiffLineSeparatorRenderer(@NotNull Editor editor) { - this(editor, BooleanGetter.TRUE); - } - public DiffLineSeparatorRenderer(@NotNull Editor editor, @NotNull BooleanGetter condition) { myEditor = editor; myCondition = condition; } - public static void drawConnectorLine(@NotNull Graphics2D g, - int x1, int x2, - int start1, int end1, - int start2, int end2) { - drawConnectorLine(g, x1, x2, start1, start2, end1 - end2, null); - } - /* * Divider */ diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java index 164d92a9053e..2c075edd6115 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java @@ -218,7 +218,7 @@ public class SvnPropertiesDiffViewer extends TwosideTextDiffViewer { int shift2 = editor2.getScrollingModel().getVerticalScrollOffset() - headerOffset2; double rotate = shift1 == shift2 ? 0 : Math.atan2(shift2 - shift1, clip.width); - DiffDividerDrawUtil.paintPolygons(gg, divider.getWidth(), false, rotate == 0, editor1, editor2, this); + DiffDividerDrawUtil.paintPolygons(gg, divider.getWidth(), rotate == 0, editor1, editor2, this); for (DiffChange change : myDiffChanges) { int y1 = editor1.logicalPositionToXY(new LogicalPosition(change.getStartLine(Side.LEFT), 0)).y - shift1;