X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FPoint.java;h=d53a2e8079a989c86e855d0464b0eb052c4e975f;hb=8cb2aceb7c2b140b70b9955f1a0a6f2524f2314e;hp=0194ef3bf6d9bee5d741631b7b2e18e414f7413a;hpb=64c6939d78acfa06e7bc380cb713e3800bf16be5;p=anneal.git

diff --git a/src/edu/berkeley/qfat/geom/Point.java b/src/edu/berkeley/qfat/geom/Point.java
index 0194ef3..d53a2e8 100644
--- a/src/edu/berkeley/qfat/geom/Point.java
+++ b/src/edu/berkeley/qfat/geom/Point.java
@@ -3,7 +3,7 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 
 /** point in 3-space; immutable */
-public final class Point extends HasPoint implements HasBoundingBox, AffineConstraint {
+public final class Point implements HasBoundingBox, AffineConstraint, HasPoint {
 
     public static final Point ZERO = new Point(0,0,0);
 
@@ -37,8 +37,9 @@ public final class Point extends HasPoint implements HasBoundingBox, AffineConst
     public Point getProjection(Point p) { return this; }
     public AffineConstraint intersect(AffineConstraint c, float epsilon) {
         if (c.getProjection(this).distance(this) <= epsilon) return this;
-        return null;
+        return AffineConstraint.NONE;
     }
     public AffineConstraint multiply(Matrix m) { return m.times(this); }
+
 }