Revision 6495

View differences:

org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.tilecache/org.gvsig.raster.tilecache.provider/src/main/java/org/gvsig/raster/tilecache/provider/TileStructImage.java
353 353
                (int) (clippedBuffer.getPixelSizeX() * clippedBuffer.getColumns() / pixelSize),
354 354
                Buffer.INTERPOLATION_NearestNeighbour, null);
355 355

  
356
        DisposeUtils.dispose(clippedBuffer);
356 357
        DisposeUtils.dispose(buffer);
357
        DisposeUtils.dispose(clippedBuffer);
358 358

  
359 359
        String providerName = "GTiff";
360 360
        String extension = "tif";
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.buffer/org.gvsig.raster.lib.buffer.impl/src/main/java/org/gvsig/raster/lib/buffer/impl/AbstractClippedBand.java
4 4
import org.gvsig.raster.lib.buffer.api.BandInfo;
5 5
import org.gvsig.raster.lib.buffer.api.Buffer;
6 6
import org.gvsig.raster.lib.buffer.impl.exceptions.CopyFromBandException;
7
import org.gvsig.tools.dispose.DisposeUtils;
8
import org.gvsig.tools.exception.BaseException;
9 7

  
10 8

  
11 9
/**
......
71 69
        return true;
72 70
    }
73 71

  
74
    // ?es necesario? ?es conveniente
72
    // ?es necesario? ?es conveniente?
75 73
//    @Override
76 74
//    public void doDispose() throws BaseException {
77 75
//        super.doDispose();
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.buffer/org.gvsig.raster.lib.buffer.impl/src/main/java/org/gvsig/raster/lib/buffer/impl/AbstractBuffer.java
35 35
import org.gvsig.raster.lib.buffer.api.statistics.Statistics;
36 36
import org.gvsig.raster.lib.buffer.impl.statistics.DefaultStatistics;
37 37
import org.gvsig.tools.ToolsLocator;
38
import org.gvsig.tools.dispose.DisposeUtils;
38 39
import org.gvsig.tools.exception.BaseException;
39 40
import org.gvsig.tools.locator.LocatorException;
40 41
import org.gvsig.tools.observer.Notification;
......
288 289
        }
289 290

  
290 291
        try {
291
            if (rows == getRows() && columns == getColumns()) {
292
                return (Buffer) this.clone();
293
            }
292
//            if (rows == getRows() && columns == getColumns()) {
293
//                return (Buffer) this.clone();
294
//            }
294 295

  
295 296
            Buffer target =
296 297
                BufferLocator.getBufferManager().createBuffer(rows, columns, this.getBandTypes(),
......
314 315
                break;
315 316
            }
316 317
            return target;
317
        } catch (CloneNotSupportedException | LocatorException e) {
318
//        } catch (CloneNotSupportedException | LocatorException e) {
319
        } catch (LocatorException e) {
318 320
            throw new BufferException(e);
319 321
        }
320 322
    }
......
544 546
    public void doDispose() throws BaseException {
545 547
        for (Iterator iterator = bands.iterator(); iterator.hasNext();) {
546 548
            Band band = (Band) iterator.next();
547
            band.dispose();
549
            DisposeUtils.dispose(band);
548 550
        }
549 551
        envelope = null;
550 552
        projection = null;
org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.buffer/org.gvsig.raster.lib.buffer.impl/src/main/java/org/gvsig/raster/lib/buffer/impl/AbstractPaginatedBand.java
55 55
        if (rowsPerPage < 1) {
56 56
            rowsPerPage = 1;
57 57
        }
58
        if (rowsPerPage > rows) {
59
            rowsPerPage = rows;
60
        }
61

  
58 62
    }
59 63

  
60 64
    @Override
......
97 101
    }
98 102

  
99 103
    protected void saveCurrentPage() {
104
        logger.info("AbstractPaginatedBand - saveCurrentPage: firstRowOfPage = "+firstRowOfPage + " rowsPerPage = "+rowsPerPage+" rows = "+rows);
100 105
        try {
101 106
            int rowsInPage = rowsPerPage;
102 107
            if (firstRowOfPage + rowsPerPage > this.rows) {
......
138 143
     * @return
139 144
     */
140 145
    protected int calculateBufferSizeToAllocate(int rows, int columns) {
146
        //FIXME: This is already fixed in calculateRowsPerPage method. Remove the lines below
147

  
141 148
        // If the number of requested cells is less than the default number of
142 149
        // cells, it is unnecessary to reserve the maximum possible size.
143 150

  
144
        if (rows < rowsPerPage) {
145
            logger.info("ALLOCATE rows = " + rows + " columns = " + columns + " bytes = " + (rows * columns));
146
            return rows * columns;
147
        }
151
//        if (rows < rowsPerPage) {
152
//            logger.info("ALLOCATE rows = " + rows + " columns = " + columns + " bytes = " + (rows * columns));
153
//            return rows * columns;
154
//        }
155

  
148 156
        logger.info("ALLOCATE rowsPerPage = " + rowsPerPage + " columns = " + columns + " bytes = "
149 157
            + (rowsPerPage * columns));
150 158
        return rowsPerPage * columns;
......
153 161
    @Override
154 162
    public void doDispose() throws BaseException {
155 163
        super.doDispose();
164
        logger.info("AbstractPaginatedBand - doDispose : firstRowOfPage = "+firstRowOfPage + " rowsPerPage = "+rowsPerPage+" rows = "+rows);
156 165
        data = null;
157 166
        //FIXME: ?hacer disposables los pageManagers?
158 167
        pageManager = null;
159 168
    }
160 169

  
170
    @Override
171
    protected void finalize() throws Throwable {
172
        super.finalize();
173
        logger.info("AbstractPaginatedBand with rowsPerPage = "+rowsPerPage+" columns = "+columns+" CLEANED");
174

  
175
    }
176

  
177

  
161 178
}

Also available in: Unified diff