Revision 1419

View differences:

org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/raster/process/StatisticsProcess.java
78 78
		if(lyr == null || lyr.getDataStore() == null)
79 79
			return;
80 80
		stats = lyr.getDataStore().getStatistics();
81
		lyr.setReadingData(Thread.currentThread().toString());
81
		lyr.setReadingData(Thread.currentThread().getId() + "");
82 82
		if (force)
83 83
			stats.forceToRecalc();
84 84
		try {
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/raster/process/FilterProcess.java
122 122
	public void process() throws ProcessInterruptedException, ProcessException {
123 123
		DataServerWriter writerBufferServer = null;
124 124
		if(lyr != null)
125
			lyr.setReadingData(Thread.currentThread().toString());
125
			lyr.setReadingData(Thread.currentThread().getId() + "");
126 126

  
127 127
		RasterDataStore dstoreCopy = null;
128 128
		RasterQuery query          = null;
......
130 130
		Buffer buff                = null;
131 131
		Grid grid                  = null;
132 132
		Buffer alpha               = null;
133
		
134 133
		try {
135 134
			insertLineLog(RasterToolsUtil.getText(this, "leyendo_raster"));
136 135
			
......
218 217
				colorInterpretation.addColorInterpretation(alphaI);
219 218
				nbands ++;
220 219
			}
221
			
222 220
			geoRasterWriter = rManager.createWriter(writerBufferServer, 
223 221
					filename,
224 222
					nbands, 
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/raster/gui/wizard/proj/RasterProjectionActionsPanel.java
186 186
	private JRadioButton getOnTheFlyButton() {
187 187
		if(onTheFly == null) {
188 188
			onTheFly = new JRadioButton(Messages.getText("reproject_on_the_fly") + " (Not implemented yet)");
189
			onTheFly.setEnabled(false);
189
			onTheFly.setEnabled(true);
190 190
		}
191 191
		return onTheFly;
192 192
	}
org.gvsig.raster.tools/trunk/org.gvsig.raster.tools/org.gvsig.raster.tools.app/org.gvsig.raster.tools.app.basic/src/main/java/org/gvsig/raster/tools/app/basic/tool/saveraster/operation/SaveRasterProcess.java
95 95
		TaskEventManager task = rManager.getRasterTask();
96 96
		if(layers != null) {
97 97
			for (int i = 0; i < layers.size(); i++) 
98
				layers.get(i).setReadingData(Thread.currentThread().toString());
98
				layers.get(i).setReadingData(Thread.currentThread().getId() + "");
99 99
		}
100 100
		
101 101
		jp2Copy = null;
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/grid/render/ImageDrawerImpl.java
149 149
	 * @throws ProcessInterruptedException
150 150
	 */
151 151
	private void drawByte(BufferedImage image, byte[] data, boolean supersampling) throws ProcessInterruptedException {
152
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
152
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
153 153

  
154 154
		if (supersampling) {
155 155
			int[] r = new int[height];
......
214 214
			byte[] data, 
215 215
			boolean supersampling,
216 216
			Transparency t) throws ProcessInterruptedException {
217
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
217
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
218 218
		int value = 0;
219 219
//		try {
220 220
		if (supersampling) {
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/buffer/BufferHistogramComputer.java
58 58
	public BufferHistogram getBufferHistogram()
59 59
	throws ProcessInterruptedException, HistogramException {
60 60
		if(histogram == null || refresh) {
61
			RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
61
			RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
62 62
			progressHistogram = 0;
63 63
			double[][] limits = buffer.getAllBandsLimits();
64 64

  
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/buffer/RasterBuffer.java
389 389
	 * @see org.gvsig.raster.dataset.Buffer#getLimits()
390 390
	 */
391 391
	public double[] getLimits() throws ProcessInterruptedException {
392
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
392
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
393 393
		double max = Double.NEGATIVE_INFINITY;
394 394
		double secondMax = max;
395 395
		double min = Double.MAX_VALUE;
......
508 508
	 * @see org.gvsig.raster.dataset.Buffer#getLimits()
509 509
	 */
510 510
	public double[][] getAllBandsLimits() throws ProcessInterruptedException {
511
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
511
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
512 512
		double max[] = new double[getBandCount()];
513 513
		double min[] = new double[getBandCount()];
514 514
		double value = 0;
......
671 671
	 * @see org.gvsig.tools.visitor.Visitable#accept(org.gvsig.tools.visitor.Visitor)
672 672
	 */
673 673
	public void accept(Visitor visitor) throws BaseException {
674
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
674
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
675 675

  
676 676
		switch (getDataType()) {
677 677
		case Buffer.TYPE_BYTE:
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/buffer/BufferInterpolation.java
56 56
	 * @param h Nuevo alto
57 57
	 */
58 58
	public Buffer adjustRasterNearestNeighbourInterpolation(int w, int h) throws ProcessInterruptedException {
59
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
59
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
60 60
		
61 61
		double stepX = (double) w / (double) buffer.getWidth();
62 62
		double stepY = (double) h / (double) buffer.getHeight();
......
208 208
	 * @param h Nuevo alto del buffer de salida
209 209
	 */
210 210
	public Buffer adjustRasterBilinearInterpolation(int w, int h) throws ProcessInterruptedException {
211
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
211
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
212 212
		
213 213
		double pxSize = (double) buffer.getWidth() / (double) w;
214 214
		Buffer rasterBuf = DefaultRasterManager.getInstance().createBuffer(buffer.getDataType(), w, h, buffer.getBandCount(), true);
......
359 359
	 * @param h Nuevo alto del buffer de salida
360 360
	 */
361 361
	public Buffer adjustRasterInverseDistanceInterpolation(int w, int h) throws ProcessInterruptedException {
362
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
362
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
363 363
		
364 364
		double pxSize = (double) buffer.getWidth() / (double) w;
365 365
		Buffer rasterBuf = DefaultRasterManager.getInstance().createBuffer(buffer.getDataType(), w, h, buffer.getBandCount(), true);
......
486 486
	 * @param h Nuevo alto
487 487
	 */
488 488
	public Buffer adjustRasterBSplineInterpolation(int w, int h) throws ProcessInterruptedException {
489
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
489
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
490 490
		
491 491
		double pxSize = (double) buffer.getWidth() / (double) w;
492 492
		Buffer rasterBuf = DefaultRasterManager.getInstance().createBuffer(buffer.getDataType(), w, h, buffer.getBandCount(), true);
......
632 632
	 * @param h Nuevo alto
633 633
	 */
634 634
	public Buffer adjustRasterBicubicSplineInterpolation(int w, int h) throws ProcessInterruptedException {
635
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
635
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
636 636
		
637 637
		double pxSize = (double) buffer.getWidth() / (double) w;
638 638
		Buffer rasterBuf = DefaultRasterManager.getInstance().createBuffer(buffer.getDataType(), w, h, buffer.getBandCount(), true);
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/buffer/cache/PageBuffer.java
480 480
	 * @see org.gvsig.fmap.dal.coverage.dataset.Buffer#getLimits()
481 481
	 */
482 482
	public double[] getLimits() throws ProcessInterruptedException {
483
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
483
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
484 484
		double max = Double.NEGATIVE_INFINITY;
485 485
		double secondMax = max;
486 486
		double min = Double.MAX_VALUE;
......
614 614
	 * @see org.gvsig.fmap.dal.coverage.dataset.Buffer#getAllBandsLimits()
615 615
	 */
616 616
	public double[][] getAllBandsLimits() throws ProcessInterruptedException {
617
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
617
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
618 618
		double max[] = new double[getBandCount()];
619 619
		double min[] = new double[getBandCount()];
620 620
		double value = 0;
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/properties/SimpleProviderStatistics.java
289 289
		if (provider == null)
290 290
			return;
291 291
		
292
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
292
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
293 293
		percent = 0;
294 294
		provider.selectSubdataset();
295 295
		
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/properties/SimpleProviderHistogramComputer.java
91 91
	 * @return histograma 
92 92
	 */
93 93
	public BufferHistogram getBufferHistogram() throws HistogramException, ProcessInterruptedException {
94
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
94
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
95 95
		if (provider != null) {
96 96
			if(histogram == null || refresh) {
97 97
				try {
......
187 187
	 */
188 188
	private BufferHistogram getHistogramByDataType() 
189 189
		throws InvalidSetViewException, FileNotOpenException, RasterDriverException, ProcessInterruptedException {
190
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
190
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
191 191
		percent = 0;
192 192
		int type = provider.getDataType()[0];
193 193
		int h = RasterLibrary.blockHeight;
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/properties/RemoteDataStoreStatistics.java
54 54
		
55 55
		RemoteRasterProvider prov = (RemoteRasterProvider)provider;
56 56
		
57
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
57
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
58 58
		percent = 0;
59 59
		
60 60
		bandCount = provider.getBandCount();
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/process/RasterTaskQueue.java
63 63
	}
64 64
	
65 65
	/**
66
	 * Obtiene un proceso a partir de su identificador
67
	 * @param id Identificador del proceso
68
	 * @return Proceso
66
	 * Gets a process from its identifier. If the object is null, this method will create a new RasterTask
67
	 * @param id Process identifier
68
	 * @return Process
69 69
	 */
70 70
	public static RasterTask get(String id) {
71 71
		return ((RasterTask)processPool.get(id) == null) ? new RasterTask(null) : (RasterTask)processPool.get(id);
72 72
	}
73 73
	
74 74
	/**
75
	 * Gets a process from its identifier
76
	 * @param id Process identifier
77
	 * @return Process
78
	 */
79
	public static RasterTask getRasterTask(String id) {
80
		return (RasterTask)processPool.get(id);
81
	}
82
	
83
	/**
75 84
	 * Envia un evento al proceso cuyo id coincide con el par?metro
76 85
	 * @param id Identificador del proceso
77 86
	 * @param ev Evento
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/process/RasterTask.java
43 43
	 * @param process
44 44
	 */
45 45
	public RasterTask(Object process) {
46
		idThread = Thread.currentThread().toString();
46
		idThread = Thread.currentThread().getId() + "";
47 47
		this.process = process;
48 48
	}
49 49
	/**
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/process/DefaultTaskEventManager.java
74 74
		this.task = task;
75 75
	}
76 76
	
77
	public RasterTask getTask() {
78
		return task;
79
	}
80
	
77 81
	/*
78 82
	 * (non-Javadoc)
79 83
	 * @see org.gvsig.fmap.dal.coverage.process.TaskEventManager#getEvent()
......
99 103
	 * @return Proceso
100 104
	 */
101 105
	public static TaskEventManager get() {
102
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
106
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
103 107
		DefaultTaskEventManager taskEventManager = new DefaultTaskEventManager();
104 108
		taskEventManager.setTask(task);
105 109
		return taskEventManager;
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/DefaultRasterManager.java
88 88
import org.gvsig.raster.impl.grid.render.ImageDrawerImpl;
89 89
import org.gvsig.raster.impl.grid.roi.ROIStatistic;
90 90
import org.gvsig.raster.impl.process.DefaultTaskEventManager;
91
import org.gvsig.raster.impl.process.RasterTask;
92
import org.gvsig.raster.impl.process.RasterTaskQueue;
91 93
import org.gvsig.raster.impl.process.overview.GdalOverviewBuilder;
92 94
import org.gvsig.raster.impl.process.vector.PotraceVectorization;
93 95
import org.gvsig.raster.impl.process.warp.GdalWarpImpl;
......
637 639
	 * @see org.gvsig.fmap.dal.coverage.RasterManager#createRasterTask(java.lang.Object)
638 640
	 */
639 641
	public TaskEventManager createRasterTask(Object process) {
640
		return new DefaultTaskEventManager(process);
642
		RasterTask task = RasterTaskQueue.getRasterTask(Thread.currentThread().getId() + "");
643
		if(task != null) {
644
			DefaultTaskEventManager man = new DefaultTaskEventManager();
645
			man.setTask(task);
646
			return man;
647
		}
648
		DefaultTaskEventManager man = new DefaultTaskEventManager(process);
649
		return man;
641 650
	}
642 651
	
643 652
	/**
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.lib.impl/src/main/java/org/gvsig/raster/cache/buffer/impl/histogram/BufferHistogramComputer.java
54 54
	 */
55 55
	public BufferHistogram getBufferHistogram(int numberOfClasses) throws ProcessInterruptedException, HistogramException {
56 56
		if(histogram == null || refresh) {
57
			//RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
57
			//RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
58 58
			progressHistogram = 0;
59 59
			double[][] limits = buffer.getStatistics().getAllBandsLimits();
60 60

  
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.lib.impl/src/main/java/org/gvsig/raster/cache/buffer/impl/task/DefaultTaskEventManager.java
78 78
	 * @return Proceso
79 79
	 */
80 80
	public static TaskEventManager get() {
81
		DefaultTask task = DefaultRasterTaskQueue.get(Thread.currentThread().toString());
81
		DefaultTask task = DefaultRasterTaskQueue.get(Thread.currentThread().getId() + "");
82 82
		DefaultTaskEventManager taskEventManager = new DefaultTaskEventManager();
83 83
		taskEventManager.setTask(task);
84 84
		return taskEventManager;
org.gvsig.raster.cache/trunk/org.gvsig.raster.cache/org.gvsig.raster.cache.lib.impl/src/main/java/org/gvsig/raster/cache/buffer/impl/task/DefaultTask.java
21 21
	 * @param process
22 22
	 */
23 23
	public DefaultTask(Object process) {
24
		idThread = Thread.currentThread().toString();
24
		idThread = Thread.currentThread().getId() + "";
25 25
		this.process = process;
26 26
	}
27 27
	/**
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/raster/gdal/io/GdalNative.java
603 603
		int widthBuffer = (int)(getRasterXSize() * scale);
604 604
		int heightBuffer = (int)(blockHeight * scale);
605 605

  
606
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
606
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
607 607
				
608 608
		GdalRasterBand[] gdalBand = new GdalRasterBand[bBandNr];
609 609
		for (int iBand = 0; iBand < gdalBand.length; iBand++) 
......
1126 1126
			int stpY, 
1127 1127
			int[] stepBuffer) throws GdalException, ProcessInterruptedException {
1128 1128
		
1129
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString()); 
1129
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + ""); 
1130 1130
		FileUtils fUtil = RasterLocator.getManager().getFileUtils(); 
1131 1131
			
1132 1132
		GdalBuffer gdalBuf = null;
......
1228 1228
	private void readDataByLine(Buffer buf, BandList bandList, int x, int y, int w, int yMax) throws GdalException, ProcessInterruptedException {
1229 1229
		GdalBuffer gdalBuf = null;
1230 1230
		int rasterBufLine;
1231
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
1231
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
1232 1232
		FileUtils fUtil = RasterLocator.getManager().getFileUtils(); 
1233 1233
		
1234 1234
		for(int iBand = 0; iBand < gdalBands.length; iBand++) {
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/src/main/java/org/gvsig/raster/gdal/io/GdalWriter.java
573 573
	 */
574 574
	private void write(int mode) throws IOException, ProcessInterruptedException,
575 575
			OutOfMemoryError {
576
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
577

  
576
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
577
		System.out.println("Write GdalWriter" + Thread.currentThread().getId());
578 578
		bufBands = new GdalBuffer[nBands];
579 579
		for(int iBand = 0; iBand < nBands; iBand ++)
580 580
			bufBands[iBand] = new GdalBuffer();
org.gvsig.raster.ermapper/trunk/org.gvsig.raster.ermapper/org.gvsig.raster.ermapper.io/src/main/java/org/gvsig/raster/ermapper/io/ErmapperProvider.java
428 428
	 */
429 429
	private void loadBuffer(Extent selectedExtent, int bufWidth, int bufHeight, Buffer rasterBuf, BandList bandList, int[] stpBuffer) throws ProcessInterruptedException, RasterDriverException {
430 430
		try{
431
			RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
431
			RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
432 432
			
433 433
			int[] readBandsFromECW = new int[Math.max(file.numBands, 3)];
434 434
			
......
694 694
	 * @see org.gvsig.raster.impl.provider.DefaultRasterProvider#readBlock(int, int)
695 695
	 */
696 696
	public Object readBlock(int pos, int blockHeight, double scale) throws InvalidSetViewException, FileNotOpenException, RasterDriverException, ProcessInterruptedException {
697
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
697
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
698 698
		if(pos < 0)
699 699
			throw new InvalidSetViewException("Request out of grid");
700 700

  
org.gvsig.raster.lizardtech/trunk/org.gvsig.raster.lizardtech/org.gvsig.raster.lizardtech.io/src/main/java/org/gvsig/raster/lizardtech/io/LizardTechNative.java
577 577
	
578 578

  
579 579
	private void readWindowInMemory(Buffer buf, BandList bandList, double[] srcPxPos, int[] stepDst, int sizeSrcX, int sizeSrcY) throws MrSIDException, ProcessInterruptedException {
580
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
580
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
581 581
		
582 582
		isSupersampling = false;
583 583
	
......
624 624
	 * @param h Alto en pixeles
625 625
	 */
626 626
	private void readWindowInMemory(Buffer buf, BandList bandList, int x, int y, int w, int h) throws MrSIDException, ProcessInterruptedException {
627
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
627
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
628 628
		
629 629
		isSupersampling = false;
630 630
	
org.gvsig.raster.lizardtech/trunk/org.gvsig.raster.lizardtech/org.gvsig.raster.lizardtech.io/src/main/java/org/gvsig/raster/lizardtech/io/LizardTechProvider.java
313 313
	 */
314 314
	public Buffer getWindow(Extent ex, BandList bandList, Buffer rasterBuf, TaskStatus status) 
315 315
		throws ProcessInterruptedException, RasterDriverException {
316
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
316
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
317 317

  
318 318
		// TODO: FUNCIONALIDAD: Hacer caso del bandList
319 319
		int width = rasterBuf.getWidth();
......
346 346
	 */
347 347
	public Buffer getWindow(double ulx, double uly, double w, double h, 
348 348
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent, TaskStatus status) throws ProcessInterruptedException, RasterDriverException {
349
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
349
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
350 350

  
351 351
		// El incremento o decremento de las X e Y depende de los signos de rotaci?n
352 352
		// y escala en la matriz de transformaci?n. Por esto
......
391 391
	 */
392 392
	public Buffer getWindow(Extent extent, int bufWidth, int bufHeight, 
393 393
			BandList bandList, Buffer rasterBuf, boolean adjustToExtent, TaskStatus status) throws ProcessInterruptedException, RasterDriverException {
394
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
394
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
395 395

  
396 396
		// Impedimos que los valores de ancho y alto de la im?gen sean menores que 1
397 397
		if (bufWidth <= 0)
......
470 470
//			Buffer rasterBuf, 
471 471
//			int[] pRGBArray, 
472 472
//			int bufWidth) throws ProcessInterruptedException {
473
//		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
473
//		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
474 474
//		int[] drawableBandsR = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 0);
475 475
//		int[] drawableBandsG = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 1);
476 476
//		int[] drawableBandsB = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 2);
......
508 508
//	}
509 509
	
510 510
	private void loadBuffer(int h, int w, BandList bandList, Buffer rasterBuf, int[] pRGBArray) throws ProcessInterruptedException {
511
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
511
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
512 512
		int[] drawableBandsR = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 0);
513 513
		int[] drawableBandsG = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 1);
514 514
		int[] drawableBandsB = bandList.getBufferBandToDraw(getURIOfFirstProvider(), 2);
......
560 560
	 * @see org.gvsig.raster.impl.provider.RasterProvider#readBlock(int, int, double)
561 561
	 */
562 562
	public Object readBlock(int pos, int blockHeight, double scale) throws InvalidSetViewException, FileNotOpenException, RasterDriverException, ProcessInterruptedException {
563
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
563
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
564 564

  
565 565
		if (pos < 0)
566 566
			throw new InvalidSetViewException("Request out of grid");
......
607 607
	 */
608 608
	public Object readCompleteLine(int line, int band)
609 609
					throws InvalidSetViewException, FileNotOpenException, RasterDriverException {
610
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().toString());
610
		RasterTask task = RasterTaskQueue.get(Thread.currentThread().getId() + "");
611 611

  
612 612
		if (line > this.getHeight() || band > this.getBandCount())
613 613
			throw new InvalidSetViewException("Request out of grid");

Also available in: Unified diff