[Geom4j-developer] SF.net SVN: geom4j:[21] trunk/src/net/sourceforge/geom4j

[<skh...@us...>]

Revision: 21
          http://geom4j.svn.sourceforge.net/geom4j/?rev=21&view=rev
Author:   skhenkin
Date:     2009-12-18 15:30:14 +0000 (Fri, 18 Dec 2009)

Log Message:
-----------
Equality performance check improved

Modified Paths:
--------------
    trunk/src/net/sourceforge/geom4j/CompoundFigure.java
    trunk/src/net/sourceforge/geom4j/EmptyFigure.java
    trunk/src/net/sourceforge/geom4j/Line.java
    trunk/src/net/sourceforge/geom4j/Point.java
    trunk/src/net/sourceforge/geom4j/PointPair.java
    trunk/src/net/sourceforge/geom4j/PointSet.java
    trunk/src/net/sourceforge/geom4j/Polygon.java
    trunk/src/net/sourceforge/geom4j/Segment.java

Modified: trunk/src/net/sourceforge/geom4j/CompoundFigure.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/CompoundFigure.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/CompoundFigure.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -79,11 +79,14 @@
 
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
         if (obj instanceof CompoundFigure) {
             CompoundFigure<?> cf = (CompoundFigure<?>) obj;
             return contains(cf) && cf.contains(this);
         }
-        return super.equals(obj);
+        return false;
     }
 
 

Modified: trunk/src/net/sourceforge/geom4j/EmptyFigure.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/EmptyFigure.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/EmptyFigure.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -34,10 +34,7 @@
     
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof EmptyFigure) {
-            return true;
-        }
-        return false;
+        return obj instanceof EmptyFigure;
     }
 
     @Override

Modified: trunk/src/net/sourceforge/geom4j/Line.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/Line.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/Line.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -53,7 +53,7 @@
             Line line = (Line) obj;
             return contains(line.getP1()) && contains(line.getP2());
         }
-        return super.equals(obj);
+        return false;
     }
 
     @Override

Modified: trunk/src/net/sourceforge/geom4j/Point.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/Point.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/Point.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -46,7 +46,7 @@
             Point p = (Point) obj;
             return Config.equal(x, p.x) && Config.equal(y, p.y);
         }
-        return super.equals(obj);
+        return false;
     }
 
     @Override

Modified: trunk/src/net/sourceforge/geom4j/PointPair.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/PointPair.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/PointPair.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -53,7 +53,7 @@
             return firstPoint.equals(pp.firstPoint) && secondPoint.equals(pp.secondPoint)
                 || firstPoint.equals(pp.secondPoint) && secondPoint.equals(pp.firstPoint);
         }
-        return super.equals(obj);
+        return false;
     }
 
     public double distance() {

Modified: trunk/src/net/sourceforge/geom4j/PointSet.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/PointSet.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/PointSet.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -33,6 +33,9 @@
      */
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
         if (obj instanceof PointSet) {
             return figures.equals(((PointSet) obj).figures);
         }

Modified: trunk/src/net/sourceforge/geom4j/Polygon.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/Polygon.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/Polygon.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -65,11 +65,14 @@
 
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
         if (obj instanceof Polygon) {
             Polygon p = (Polygon) obj;
             return getSegmentSet().equals(p.getSegmentSet());
         }
-        return super.equals(obj);
+        return false;
     }
 
     @Override

Modified: trunk/src/net/sourceforge/geom4j/Segment.java
===================================================================
--- trunk/src/net/sourceforge/geom4j/Segment.java	2009-12-14 23:44:34 UTC (rev 20)
+++ trunk/src/net/sourceforge/geom4j/Segment.java	2009-12-18 15:30:14 UTC (rev 21)
@@ -40,12 +40,15 @@
 
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
         if (obj instanceof Segment) {
             Segment s = (Segment) obj;
             return startPoint.equals(s.startPoint) && endPoint.equals(s.endPoint)
                 || startPoint.equals(s.endPoint) && endPoint.equals(s.startPoint);
         }
-        return super.equals(obj);
+        return false;
     }
     
     @Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.