Revision 5628 trunk/extensions/extGeoProcessing/src/com/iver/cit/gvsig/geoprocess/dissolve/fmap/FeatureDissolver.java

View differences:

FeatureDissolver.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.1  2006-05-24 21:11:14  azabala
48
 * Revision 1.2  2006-06-02 18:21:28  azabala
49
 * *** empty log message ***
50
 *
51
 * Revision 1.1  2006/05/24 21:11:14  azabala
49 52
 * primera version en cvs despues de refactoring orientado a crear un framework extensible de geoprocessing
50 53
 *
51 54
 *
......
287 290
		}
288 291

  
289 292
		public void visit(IGeometry g, int index2) throws VisitException {
293
			if(g == null)
294
				return;
290 295
			if (verifyCancelation(cancel, va)) {
291 296
				// TODO Revisar si hay problemas por llamar a finish
292 297
				// varias veces
......
368 373
		ArrayList geometries = new ArrayList();
369 374
		//we add the 'seed' feature geometry
370 375
		IGeometry g1 = va.getShape(index1);
376
		if(g1 == null)
377
			return;
371 378
		if(ct != null)
372 379
			g1.reProject(ct);
373 380
		geometries.add(g1.toJTSGeometry());
......
436 443
		
437 444

  
438 445
		public void visit(IGeometry g, int index2) throws VisitException {
446
			if(g == null)
447
				return;
439 448
			if (verifyCancelation(cancel, va)) {
440 449
				// TODO Revisar si hay problemas por llamar a finish
441 450
				// varias veces
......
521 530
			return;
522 531
		Strategy strategy = StrategyManager.getStrategy(dissolvedLayer);	
523 532
		IGeometry g1 = va.getShape(index1);
533
		if(g1 == null)
534
			return;
524 535
		if(ct != null)
525 536
			g1.reProject(ct);
526 537
		StackEntry entry = new StackEntry();
......
597 608
	}
598 609

  
599 610
	private void dumpStack(Stack stack) {
600
		Enumeration enum = stack.elements();
611
		Enumeration e = stack.elements();
601 612
		System.out.println("#####Elementos por procesar");
602
		while(enum.hasMoreElements()){
603
			System.out.println("#######-     "+((StackEntry)enum.nextElement()).index);
613
		while(e.hasMoreElements()){
614
			System.out.println("#######-     "+((StackEntry)e.nextElement()).index);
604 615
		}
605 616
	}
606 617

  
......
610 621
	 * @param geometries
611 622
	 * @return
612 623
	 */
613
	protected Geometry union(List geometries) {
614
long t0 = System.currentTimeMillis();		
624
	protected Geometry union(List geometries) {	
615 625
		Geometry union = null;
616 626
		GeometryFactory fact = ((Geometry)geometries.
617 627
									get(0)).getFactory();
......
634 644
	protected Geometry union3(List geometries) {
635 645
		long t0 = System.currentTimeMillis();		
636 646
				Geometry union = null;
637
				GeometryFactory fact = ((Geometry)geometries.
638
											get(0)).getFactory();
639 647
				Iterator geomIt = geometries.iterator();
640 648
				while(geomIt.hasNext()){
641 649
					Geometry g = (Geometry) geomIt.next();

Also available in: Unified diff