Revision 39393 branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/impl/AbstractPrimitive.java

View differences:

AbstractPrimitive.java
5 5
import java.awt.geom.PathIterator;
6 6
import java.io.Serializable;
7 7

  
8
import com.vividsolutions.jts.geom.Coordinate;
9
import com.vividsolutions.jts.geom.GeometryFactory;
10
import com.vividsolutions.jts.operation.distance.DistanceOp;
11
import com.vividsolutions.jts.operation.overlay.snap.GeometrySnapper;
12

  
8 13
import org.cresques.cts.ICoordTrans;
9 14
import org.cresques.cts.IProjection;
10 15
import org.slf4j.Logger;
......
23 28
import org.gvsig.fmap.geom.primitive.Envelope;
24 29
import org.gvsig.fmap.geom.primitive.FShape;
25 30
import org.gvsig.fmap.geom.primitive.GeneralPathX;
31
import org.gvsig.fmap.geom.primitive.NullGeometry;
26 32
import org.gvsig.fmap.geom.primitive.Point;
27 33
import org.gvsig.fmap.geom.primitive.Primitive;
28 34
import org.gvsig.fmap.geom.type.GeometryType;
29 35
import org.gvsig.fmap.geom.util.Converter;
30
import org.gvsig.fmap.geom.util.UtilFunctions;
31 36

  
32
import com.vividsolutions.jts.geom.Coordinate;
33
import com.vividsolutions.jts.geom.GeometryFactory;
34
import com.vividsolutions.jts.operation.distance.DistanceOp;
35
import com.vividsolutions.jts.operation.overlay.snap.GeometrySnapper;
36 37

  
37

  
38 38
/**
39 39
 * @author Jorge Piera Llodr? (jorge.piera@iver.es)
40 40
 */
......
226 226
			return false;
227 227

  
228 228
		}
229
		
229 230
		if (this.getGeometryType().getSubType() != other.getGeometryType()
230 231
				.getSubType()) {
231 232
			return false;
232 233

  
233 234
		}
235
		
236
		if (this instanceof NullGeometry || obj instanceof NullGeometry) {
237
		    /*
238
		     * If any of them is null geometry, they both have to be
239
		     * null geometry, or else, they are not equal.
240
		     * This prevents null pointer exception in the rest of the
241
		     * method
242
		     */
243
	        if (this instanceof NullGeometry && obj instanceof NullGeometry) {
244
	            return true;
245
	        } else {
246
	            return false;
247
	        }
248
		}
249
		
234 250
		if (this.projection != other.projection) {
235 251
			if (this.projection == null) {
236 252
				return false;

Also available in: Unified diff