Revision 3772 trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLayers.java

View differences:

FLayers.java
83 83
public class FLayers extends FLyrDefault implements VectorialData,
84 84
	LayerCollection {
85 85
	//ArrayList de Listener registrados.
86
	private ArrayList layerListeners = new ArrayList();
86
	private ArrayList layerCollectionListeners = new ArrayList();
87
	
88
	
87 89
	private List layers = Collections.synchronizedList(new ArrayList());
88 90
	private FMap fmap;
89 91
	private static Logger logger = Logger.getLogger(FLayers.class.getName());
......
104 106
	 * @param listener
105 107
	 */
106 108
	public void addLayerCollectionListener(LayerCollectionListener listener) {
107
		layerListeners.add(listener);
109
		layerCollectionListeners.add(listener);
108 110
	}
109 111

  
112

  
110 113
	/**
111 114
	 * @see com.iver.cit.gvsig.fmap.layers.layerOperations.LayerCollection#setAllVisibles(boolean)
112 115
	 */
......
129 132
	 * @param listener
130 133
	 */
131 134
	public void removeLayerCollectionListener(LayerCollectionListener listener) {
132
		layerListeners.remove(listener);
135
		layerCollectionListeners.remove(listener);
133 136
	}
134 137

  
135 138
	/**
......
345 348
    				continue;
346 349
    			}
347 350
    		*/
351
    			LayerDrawEvent beforeEvent = new LayerDrawEvent(lyr, g, viewPort, LayerDrawEvent.LAYER_BEFORE_DRAW);
352
    			fmap.fireLayerDrawingEvent(beforeEvent);
348 353
    			if (lyr.isVisible()) {
349 354
    			   		        
350 355
    			        long t1 = System.currentTimeMillis();
......
363 368
    			        		
364 369
    			        	}
365 370
    			        	else */
366
    			        		lyr.draw(image, g, viewPort, cancel,scale);
371
    			        	
372
    			        	lyr.draw(image, g, viewPort, cancel,scale);
367 373
    			        } catch (DriverException e){
368 374
    			        	fmap.callNewErrorEvent(new ErrorEvent(lyr.getName(), e));
369 375
    			        	this.removeLayer(lyr);
......
373 379
    					System.out.println("Layer " + lyr.getName() + " "
374 380
    					        + (t2-t1) + " milisecs.");	
375 381
    			}
382
    			LayerDrawEvent afterEvent = new LayerDrawEvent(lyr, g, viewPort, LayerDrawEvent.LAYER_AFTER_DRAW);
383
    			fmap.fireLayerDrawingEvent(afterEvent);
384

  
376 385
    		}
377 386
    		if (getVirtualLayers() != null) {
378 387
    			getVirtualLayers().draw(image, g, viewPort, cancel,scale);
......
440 449
	 */
441 450
	private void callLayerAdding(LayerCollectionEvent event)
442 451
		throws CancelationException {
443
	    ArrayList aux = (ArrayList) layerListeners.clone();
452
	    ArrayList aux = (ArrayList) layerCollectionListeners.clone();
444 453
		for (Iterator iter = aux.iterator(); iter.hasNext();) {
445 454
			((LayerCollectionListener) iter.next()).layerAdding(event);
446 455
		}
......
455 464
	 */
456 465
	private void callLayerRemoving(LayerCollectionEvent event)
457 466
		throws CancelationException {
458
	    ArrayList aux = (ArrayList) layerListeners.clone();
467
	    ArrayList aux = (ArrayList) layerCollectionListeners.clone();
459 468
		for (Iterator iter = aux.iterator(); iter.hasNext();) {
460 469
			((LayerCollectionListener) iter.next()).layerRemoving(event);
461 470
		}
462 471
	}
463 472

  
473
	
464 474
	/**
465 475
	 * Llama al m?todo layerMoving de los listeners dados de alta.
466 476
	 *
......
470 480
	 */
471 481
	private void callLayerMoving(LayerPositionEvent event)
472 482
		throws CancelationException {
473
	    ArrayList aux = (ArrayList) layerListeners.clone();
483
	    ArrayList aux = (ArrayList) layerCollectionListeners.clone();
474 484
		for (Iterator iter = aux.iterator(); iter.hasNext();) {
475 485
			((LayerCollectionListener) iter.next()).layerMoving(event);
476 486
		}
......
482 492
	 * @param event
483 493
	 */
484 494
	private void callLayerAdded(LayerCollectionEvent event) {
485
	    ArrayList aux = (ArrayList) layerListeners.clone();
495
	    ArrayList aux = (ArrayList) layerCollectionListeners.clone();
486 496
		for (Iterator iter = aux.iterator(); iter.hasNext();) {
487 497
			((LayerCollectionListener) iter.next()).layerAdded(event);
488 498
		}
......
494 504
	 * @param event
495 505
	 */
496 506
	private void callLayerRemoved(LayerCollectionEvent event) {
497
	    ArrayList aux = (ArrayList) layerListeners.clone();
507
	    ArrayList aux = (ArrayList) layerCollectionListeners.clone();
498 508
		for (Iterator iter = aux.iterator(); iter.hasNext();) {
499 509
			((LayerCollectionListener) iter.next()).layerRemoved(event);
500 510
		}
......
506 516
	 * @param event
507 517
	 */
508 518
	private void callLayerMoved(LayerPositionEvent event) {
509
	    ArrayList aux = (ArrayList) layerListeners.clone();
519
	    ArrayList aux = (ArrayList) layerCollectionListeners.clone();
510 520
		for (Iterator iter = aux.iterator(); iter.hasNext();) {
511 521
			((LayerCollectionListener) iter.next()).layerMoved(event);
512 522
		}

Also available in: Unified diff