From d06c4c632881f4bcf37ea3a21df5085ad36e9be1 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 6 Dec 2016 15:30:10 +0300 Subject: [PATCH] cleanup: Math.hypot() --- platform/util/src/com/intellij/util/ui/GeometryUtil.java | 2 +- .../impl/src/com/intellij/vcs/log/paint/PositionUtil.java | 2 +- .../com/intellij/vcs/log/paint/SimpleGraphCellPainter.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/util/src/com/intellij/util/ui/GeometryUtil.java b/platform/util/src/com/intellij/util/ui/GeometryUtil.java index 2f7e79536151..94af78ad8e98 100644 --- a/platform/util/src/com/intellij/util/ui/GeometryUtil.java +++ b/platform/util/src/com/intellij/util/ui/GeometryUtil.java @@ -270,7 +270,7 @@ public class GeometryUtil implements SwingConstants { double deltaX = aX2 - aX1; double deltaY = aY2 - aY1; - return Math.sqrt(deltaX * deltaX + deltaY * deltaY); + return Math.hypot(deltaX, deltaY); } public static double cos(Line2D aLine) { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/PositionUtil.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/PositionUtil.java index f37f05d322b9..e67a8d906677 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/PositionUtil.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/PositionUtil.java @@ -21,7 +21,7 @@ import java.awt.*; public class PositionUtil { private static float distance(int x1, int y1, int x2, int y2) { - return (float)Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2)); + return (float)Math.hypot(x1 - x2, y1 - y2); } public static boolean overUpEdge(int upPosition, int downPosition, int x, int y, int rowHeight, int nodeWidth, float lineThickness) { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/SimpleGraphCellPainter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/SimpleGraphCellPainter.java index 0b72bf6843fb..d9ca76676145 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/SimpleGraphCellPainter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/paint/SimpleGraphCellPainter.java @@ -146,7 +146,7 @@ public class SimpleGraphCellPainter implements GraphCellPainter { boolean isSelected) { g2.setColor(color); - int length = (x1 == x2) ? getRowHeight() : (int)Math.ceil(Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2))); + int length = (x1 == x2) ? getRowHeight() : (int)Math.ceil(Math.hypot(x1 - x2, y1 - y2)); setStroke(g2, isUsual || hasArrow, isSelected, length); g2.drawLine(x1, y1, x2, y2); @@ -173,7 +173,7 @@ public class SimpleGraphCellPainter implements GraphCellPainter { double translateX = (x - centerX); double translateY = (y - centerY); - double d = Math.sqrt(translateX * translateX + translateY * translateY); + double d = Math.hypot(translateX, translateY); double scaleX = arrowLength * translateX / d; double scaleY = arrowLength * translateY / d;