From 2753a9523dc1ed726c06af1f8f90b2f9526ecec1 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 9 Sep 2011 10:07:34 -0700 Subject: [PATCH] Small tidying. --- src/main/java/pythagoras/f/AbstractCircle.java | 6 ++++-- src/main/java/pythagoras/f/ICircle.java | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/pythagoras/f/AbstractCircle.java b/src/main/java/pythagoras/f/AbstractCircle.java index 74bacc7..ad15a95 100644 --- a/src/main/java/pythagoras/f/AbstractCircle.java +++ b/src/main/java/pythagoras/f/AbstractCircle.java @@ -20,12 +20,14 @@ public abstract class AbstractCircle implements ICircle @Override // from ICircle public boolean contains (IPoint p) { - return Points.distanceSq(x(), y(), p.x(), p.y()) < radius() * radius(); + float r = radius(); + return Points.distanceSq(x(), y(), p.x(), p.y()) < r * r; } @Override // from ICircle public boolean contains (float x, float y) { - return Points.distanceSq(x(), y(), x, y) < radius() * radius(); + float r = radius(); + return Points.distanceSq(x(), y(), x, y) < r * r; } @Override // from ICircle diff --git a/src/main/java/pythagoras/f/ICircle.java b/src/main/java/pythagoras/f/ICircle.java index a1a9b92..7441d27 100644 --- a/src/main/java/pythagoras/f/ICircle.java +++ b/src/main/java/pythagoras/f/ICircle.java @@ -28,13 +28,11 @@ public interface ICircle boolean contains (float x, float y); /** Translates the circle by the specified offset. - * @return a new Circle containing the result. - */ + * @return a new Circle containing the result. */ Circle offset (float x, float y); /** Translates the circle by the specified offset and stores the result in the supplied object. - * @return a reference to the result, for chaining. - */ + * @return a reference to the result, for chaining. */ Circle offset (float x, float y, Circle result); /** Returns a mutable copy of this circle. */