MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: remove dead code

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-05-11 15:55:34 +03:00
committed by Aleksey Pivovarov
parent 2ee000bbf4
commit f517480f33
6 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
-1
View File
@@ -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);
platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java
-1
View File
@@ -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);
platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java
+3 -28
View File
@@ -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;
platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java
-7
View File
@@ -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,
platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java
-11
View File
@@ -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
*/
plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java
+1 -1
View File
@@ -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;