org.gvsig.raster.patch - Application: gvSIG desktop - gvSIG

+    	}
     	/**
     	 * Gets the last buffer which was rendered
     	 */
     	public Buffer getLastRenderBuffer() {
     		return getRender().getLastRenderBuffer();
+    	}
     	/**
+    	 *
     	 * @return ROIs asociadas a la capa raster.
     	 */

     import org.gvsig.raster.cache.tile.exception.TileGettingException;
     import org.gvsig.raster.cache.tile.provider.TileListener;
     import org.gvsig.raster.impl.DefaultRasterManager;
     import org.gvsig.raster.impl.buffer.DefaultRasterQuery;
     import org.gvsig.raster.impl.datastruct.DefaultViewPortData;
     import org.gvsig.raster.impl.datastruct.ExtentImpl;
     import org.gvsig.raster.impl.grid.GridImpl;
-...
     	 */
     	private int[]            renderBands              = { 0, 1, 2 };
     	private ImageDrawerImpl      drawer                   = null;
     	private ImageDrawerImpl  drawer                   = null;
     	/**
     	 * Ultima transparencia aplicada en la visualizaci�n que es obtenida desde el
     	 * grid
-...
     	 */
     	private RasterFilterList filterList               = null;
     	private Buffer           lastRenderBuffer         = null;
     	/**
     	 * Ancho y alto del objeto Image en una petici�n de dibujado a un raster
     	 * raster
-...
+    		}
     		if (dataStore != null) {
     			if (lastTransparency == null) {
     				lastTransparency = dataStore.getTransparency().cloneTransparency();
     				lastTransparency.addPropertyListener(this);
     				lastTransparency.setTransparencyBand(dataStore.getTransparency().getAlphaBandNumber());
+    			}
     			if(getLastTransparency().getAlphaBandNumber() == -1)
     				getLastTransparency().setTransparencyBand(dataStore.getTransparency().getAlphaBandNumber());
     			lastAlphaBand = lastTransparency.getAlphaBandNumber();
     			lastAlphaBand = getLastTransparency().getAlphaBandNumber();
     			// Asignamos la banda de transparencia si existe esta
     			RasterQuery query = DefaultRasterManager.getInstance().createQuery();
-...
     			query.setSupersamplingLoadingBuffer(false); // Desactivamos el supersampleo en la carga del buffer.
     			query.setDrawableBands(getRenderBands());
     			query.setFrameWidth(0);
     			query.setAlphaBand(lastTransparency.getAlphaBandNumber());
     			query.setAlphaBand(getLastTransparency().getAlphaBandNumber());
     			query.setAreaOfInterest(vp.getExtent(),
     					(int)Math.round(vp.getWidth()),
     					(int)Math.round(vp.getHeight()), this);
-...
     		if (dataStore == null)
     			return;
     		//If the transparency hasn't been defined yet then we'll take that from the store
     		if (lastTransparency == null) {
     			lastTransparency = dataStore.getTransparency().cloneTransparency();
     			lastTransparency.addPropertyListener(this);
+    		}
     		Buffer buf = null;
     		double[] step = null;
-...
     					(int)Math.round(heightImage),
     					vp.getTime(),
     					renderBands,
     					lastTransparency);
     					getLastTransparency());
     		} else {
     			// Asignamos la banda de transparencia si existe esta
     			RasterQuery query = DefaultRasterManager.getInstance().createQuery();
-...
     			query.setSupersamplingLoadingBuffer(false); // Desactivamos el supersampleo en la carga del buffer.
     			query.setAreaOfInterest(adjustedRotedRequest, (int)Math.round(widthImage), (int)Math.round(heightImage));
     			if (lastTransparency.getAlphaBandNumber() != -1) {
     				query.setDrawableBands(new int[] { lastTransparency.getAlphaBandNumber()});
     				lastTransparency.setAlphaBand(dataStore.query(query));
     			if (getLastTransparency().getAlphaBandNumber() != -1) {
     				query.setDrawableBands(new int[] { getLastTransparency().getAlphaBandNumber()});
     				getLastTransparency().setAlphaBand(dataStore.query(query));
+    			}
     			lastAlphaBand = lastTransparency.getAlphaBandNumber();
     			lastAlphaBand = getLastTransparency().getAlphaBandNumber();
     			query.setAreaOfInterest(adjustedRotedRequest, (int)Math.round(widthImage), (int)Math.round(heightImage));
     			query.setDrawableBands(getRenderBands());
     			buf = dataStore.query(query);
     			((DefaultRasterQuery)query).setBuffer(null);
     			query.setSupersamplingLoadingBuffer(true);
     			step = dataStore.getStep();
+    		}
-...
     		grid = bufferPreprocessing(buf, lastTransparency);
     		if(lastRenderBuffer != null)
     			lastRenderBuffer.dispose();
     		//Buffer filtrado para renderizar
     		lastRenderBuffer = grid.getRasterBuf();
     		drawer.setBuffer(lastRenderBuffer); // Buffer de datos a renderizar
     		buf = grid.getRasterBuf();
     		drawer.setBuffer(buf); // Buffer de datos a renderizar
     		drawer.setSupersamplingOn(step); // Desplazamiento para supersampleo
     		drawer.setOutputSize((int)Math.round(widthImage), (int)Math.round(heightImage)); // Ancho y alto del buffer
     		drawer.setLastTransparency(getLastTransparency());
     		Image geoImage = drawer.drawBufferOverImageObject(); // Acci�n de renderizado
     		drawer.dispose();
     		// Borramos el buffer de transparencia para que siempre se tenga que regenerar.
     		lastTransparency.setAlphaBand(null);
     		getLastTransparency().setAlphaBand(null);
     		//En el caso de no tenga rotaci�n y el tama�o de pixel sea positivo en X y negativo en Y no aplicamos ninguna
     		//transformaci�n. Esto no es necesario hacerlo, sin ello se visualiza igual. Unicamente se hace porque de esta
-...
     			} catch (ProcessInterruptedException e2) {
     				return;
+    			}
     			d.dispose();
     			lastTransparency.setAlphaBand(null);
     			AffineTransform at = new AffineTransform();
-...
     		return out;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.fmap.dal.coverage.grid.Render#getLastTransparency()
     	 */
     	public Transparency getLastTransparency() {
     		//If the transparency hasn't been defined yet then we'll take that from the store
     		if (lastTransparency == null) {
     			lastTransparency = dataStore.getTransparency().cloneTransparency();
     			lastTransparency.addPropertyListener(this);
+    		}
     		return lastTransparency;
+    	}
-...
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.fmap.dal.coverage.grid.render.Render#getLastRenderBuffer()
     	 */
     	public Buffer getLastRenderBuffer() {
     		return this.lastRenderBuffer;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.fmap.dal.coverage.grid.render.Render#setLastRenderBuffer(org.gvsig.fmap.dal.coverage.dataset.Buffer)
     	 */
     	public void setLastRenderBuffer(Buffer buf) {
     		this.lastRenderBuffer = buf;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.fmap.dal.coverage.grid.render.Render#setFilterList(org.gvsig.fmap.dal.coverage.grid.RasterFilterList)
     	 */
     	public void setFilterList(RasterFilterList filterList) {
-...
     			grid.dispose();
     		if (getFilterList() != null)
     			getFilterList().dispose();
     		if (lastRenderBuffer != null)
     			lastRenderBuffer.dispose();
     		try {
     			finalize();
     		} catch (Throwable e) {
-...
             drawer                   = null;
     		lastTransparency         = null;
     		filterList               = null;
             lastRenderBuffer         = null;
             ulPxRequest              = null;
             lrPxRequest              = null;
     		lastGraphics             = null;

     	public void dispose() {
     		if(rasterBuf != null)
     			rasterBuf.dispose();
     		if(transparency != null)
     			transparency.dispose();
     		try {
     			finalize();
     		} catch (Throwable e) {
-...
     	protected void finalize() throws Throwable {
     		step        = null;
     		rasterBuf   = null;
     		transparency = null;
     		super.finalize();
+    	}

     		//TODO: FUNCIONALIDAD: Falta asignar lo necesario para la transparencia por selecci� 		this.transparencyRanges = (ArrayList<TransparencyRange>) t.getTransparencyRange().clone();
     		this.mask = t.getAlphaBand();
     		if(this.mask != null)
     			this.mask = t.getAlphaBand();
     		this.opacity = t.getOpacity();
     		this.alphaBandNumber = t.alphaBandNumber;
     		this.noData = (NoData)t.getNoData().clone();
     		this.originalData = t.originalData;
     		if(this.originalData != null)
     			this.originalData = t.originalData;
     		this.transparencyActive = t.transparencyActive;
+    	}
-...
     	 * @see org.gvsig.fmap.dal.coverage.store.props.Transparency#activeTransparency()
     	 */
     	public void activeTransparency() {
     		if(	existAlphaBand() || (getNoData().isDefined() && getNoData().isNoDataTransparent()) ||
     		if(	existAlphaBand() ||
     			(getNoData() != null && getNoData().isDefined() && getNoData().isNoDataTransparent()) ||
     			(transparencyRanges.size() > 0) ||
     			(opacity != 0xff))
     			transparencyActive = true;
-...
     			mask.dispose();
     		if (originalData != null)
     			originalData.dispose();
     		try {
     			finalize();
     		} catch (Throwable e) {
+    		}
     		mask = null;
     		originalData = null;
+    	}
     	/*

+    		}
+    	}
     	public void finalize() {
     		if(colorItems != null) {
     			colorItems.clear();
     			colorItems = null;
+    		}
     		range             = null;
     		paletteByBand     = null;
     		if(nameClass != null) {
     			for (int i = 0; i < nameClass.length; i++) {
     				nameClass[i] = null;
+    			}
     			nameClass = null;
+    		}
     		name              = null;
     		filePath          = null;
+    	}
+    }

     	public int getLastAlphaBandNumber();
     	/**
     	 * Obtiene el �ltimo buffer renderizado.
     	 * @return Buffer
     	 */
     	public Buffer getLastRenderBuffer();
     	/**
     	 * Asigna el �ltimo renderizado.
     	 * @param buf
     	 */
     	public void setLastRenderBuffer(Buffer buf);
     	/**
     	 * Informa de si el raster tiene tabla de color asociada o no.
     	 * @return true si tiene tabla de color y false si no la tiene.
     	 */