Revision 159

View differences:

org.gvsig.raster.app/trunk/org.gvsig.raster.app/org.gvsig.raster.app.tools/src/main/java/org/gvsig/raster/app/extension/tool/GenericToolBarModule.java
33 33
import org.gvsig.app.project.documents.view.ViewDocument;
34 34
import org.gvsig.app.project.documents.view.gui.AbstractViewPanel;
35 35
import org.gvsig.fmap.mapcontext.MapContext;
36
import org.gvsig.raster.app.extension.tool.clip.ClippingTocMenuEntry;
36 37
import org.gvsig.raster.app.extension.tool.filter.FilterTocMenuEntry;
37 38
import org.gvsig.raster.app.extension.tool.generictoolbar.GenericToolBarMenuItem;
38 39
import org.gvsig.raster.app.extension.tool.generictoolbar.GenericToolBarPanel;
39 40
import org.gvsig.raster.app.extension.tool.geolocation.GeoLocationTocMenuEntry;
41
import org.gvsig.raster.app.extension.tool.overview.OverviewsTocMenuEntry;
40 42
import org.gvsig.raster.app.extension.tool.properties.RasterPropertiesTocMenuEntry;
41 43
import org.gvsig.raster.app.extension.tool.reproject.ReprojectTocMenuEntry;
42 44
import org.gvsig.raster.app.extension.tool.roi.ROIManagerTocMenuEntry;
......
128 130
		point.append("SelectLayer", "", SelectLayerTocMenuEntry.getSingleton());
129 131
		//point.append("HistogramPanel", "", HistogramTocMenuEntry.getSingleton());
130 132
		//point.append("ViewColorTable", "",ColorTableTocMenuEntry.getSingleton());
131
		//point.append("Overviews", "", OverviewsTocMenuEntry.getSingleton());
133
		point.append("Overviews", "", OverviewsTocMenuEntry.getSingleton());
132 134
		point.append("RoisManager", "", ROIManagerTocMenuEntry.getSingleton());
133 135
		//point.append("ViewRasterAnalysis", "", ViewRasterAnalysisTocMenuEntry.getSingleton());
134 136

  
135 137
		point.append("SaveAs", "", SaveAsTocMenuEntry.getSingleton());
136
		//point.append("ClippingPanel", "", ClippingTocMenuEntry.getSingleton());
138
		point.append("ClippingPanel", "", ClippingTocMenuEntry.getSingleton());
137 139
		point.append("SaveRaster", "", SaveRasterTocMenuEntry.getSingleton());
138 140

  
139 141
		point.append("FilterPanel", "", FilterTocMenuEntry.getSingleton());
org.gvsig.raster.app/trunk/org.gvsig.raster.app/org.gvsig.raster.app.tools/src/main/java/org/gvsig/raster/app/extension/raster/process/ClippingProcess.java
49 49
import org.gvsig.fmap.dal.coverage.store.props.ColorInterpretation;
50 50
import org.gvsig.fmap.dal.coverage.store.props.ColorTable;
51 51
import org.gvsig.fmap.dal.coverage.util.RasterUtils;
52
import org.gvsig.fmap.dal.exception.CloseException;
52 53
import org.gvsig.fmap.mapcontext.layers.FLayer;
53 54
import org.gvsig.fmap.mapcontext.layers.FLayers;
54 55
import org.gvsig.raster.fmap.config.Configuration;
......
345 346
			RasterToolsUtil.messageBoxError("error_georasterwriter", this, e);
346 347
		} finally {
347 348
			if (dstoreCopy != null)
348
				dstoreCopy.close();
349
				try {
350
					dstoreCopy.close();
351
				} catch (CloseException e) {
352
					RasterToolsUtil.debug("error_writer", this, e);
353
				}
349 354
			buffer = null;
350 355
		}
351 356
	}
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.api/src/main/java/org/gvsig/fmap/dal/coverage/RasterManager.java
153 153
	 */
154 154
	public RasterDataStore open(DataStoreParameters param) throws NotSupportedExtensionException, RasterDriverException;
155 155
	
156
	public RasterDataStore open(CoverageStoreProvider prov, int type) throws NotSupportedExtensionException, RasterDriverException;
156
	public RasterDataStore open(CoverageStoreProvider prov, int type, DataStoreParameters params) throws NotSupportedExtensionException, RasterDriverException;
157 157
	
158 158
	/**
159 159
	 * Builds a new empty RasterQuery object
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.api/src/main/java/org/gvsig/fmap/dal/coverage/store/RasterDataStore.java
42 42
import org.gvsig.fmap.dal.coverage.store.props.Metadata;
43 43
import org.gvsig.fmap.dal.coverage.store.props.Statistics;
44 44
import org.gvsig.fmap.dal.coverage.store.props.Transparency;
45
import org.gvsig.fmap.dal.exception.CloseException;
45 46

  
46 47
/**
47 48
 * Interfaz que deben implementar los almacenes de datos raster.
......
155 156
	public RasterDataStore newDataStore();
156 157
	
157 158
	/**
158
	 * Cierra los raster asociados.
159
	 */
160
	public void close();
161
	
162
	/**
163 159
	 * Obtiene el Tama?o de cada fichero de que consta el raster en bytes. 
164 160
	 * @return long que representa el tama?o
165 161
	 */
......
336 332
	 */
337 333
	public RasterDataStore cloneDataStore();
338 334
	
335
	/**
336
	 * Closes this data store
337
	 * @throws CloseException
338
	 */
339
	public void close() throws CloseException;
340
	
339 341
	//******************************************
340 342
	//***********Dataset Properties*************
341 343
	
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/provider/RasterProvider.java
25 25
import java.awt.geom.Point2D;
26 26

  
27 27
import org.cresques.cts.IProjection;
28
import org.gvsig.fmap.dal.DataParameters;
28 29
import org.gvsig.fmap.dal.coverage.datastruct.Extent;
29 30
import org.gvsig.fmap.dal.coverage.exception.BandAccessException;
30 31
import org.gvsig.fmap.dal.coverage.exception.FileNotOpenException;
......
354 355
	public RasterProvider cloneProvider();
355 356
	
356 357
	/**
358
	 * Returs the DataParameters
359
	 * @return
360
	 */
361
	public DataParameters getDataParameters();
362
	
363
	/**
357 364
	 * Lee un bloque completo de datos del raster y devuelve un array tridimensional del tipo correcto. Esta funci?n es util
358 365
	 * para una lectura rapida de todo el fichero sin necesidad de asignar vista.
359 366
	 * @param pos Posici?n donde se empieza  a leer
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/provider/DefaultRasterProvider.java
32 32
import org.cresques.cts.IProjection;
33 33
import org.gvsig.fmap.dal.DALLocator;
34 34
import org.gvsig.fmap.dal.DataManager;
35
import org.gvsig.fmap.dal.DataParameters;
35 36
import org.gvsig.fmap.dal.DataServerExplorer;
36 37
import org.gvsig.fmap.dal.coverage.RasterLibrary;
37 38
import org.gvsig.fmap.dal.coverage.RasterLocator;
......
967 968
		try {
968 969
			params = (FilesystemServerExplorerParameters) manager
969 970
					.createServerExplorerParameters(FilesystemServerExplorer.NAME);
970
			params.setRoot(this.getRasterParameters().getFile().getParent());
971
			params.setRoot(((AbstractRasterStoreParameters)this.getDataParameters()).getFile().getParent());
971 972
			return manager.createServerExplorer(params);
972 973
		} catch (DataException e) {
973 974
			throw new ReadException(this.getName(), e);
974 975
		}
975 976
	}
976
    
977
	public AbstractRasterStoreParameters getRasterParameters() {
978
    	return (AbstractRasterStoreParameters)getDataStoreParameters();
977
  
978
	
979
	/**
980
	 * Returs the DataParameters
981
	 * @return
982
	 */
983
	public DataParameters getDataParameters() {
984
		return getDataStoreParameters();
979 985
	}
980 986

  
981 987
	/*
......
1000 1006
	 * @see org.gvsig.fmap.dal.spi.DataStoreProvider#getSourceId()
1001 1007
	 */
1002 1008
	public Object getSourceId() {
1003
		return this.getRasterParameters().getFile();
1009
		return ((AbstractRasterStoreParameters)this.getDataParameters()).getFile();
1004 1010
	}
1005 1011

  
1006 1012
	/*
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/AbstractRasterDataStore.java
557 557

  
558 558
	/*
559 559
	 * (non-Javadoc)
560
	 * @see org.gvsig.fmap.dal.DataStore#getParameters()
561
	 */
562
	public DataStoreParameters getParameters() {
563
		return null;
564
	}
565

  
566
	/*
567
	 * (non-Javadoc)
568 560
	 * @see org.gvsig.fmap.dal.DataStore#getProviderName()
569 561
	 */
570 562
	public String getProviderName() {
......
693 685
     * (non-Javadoc)
694 686
     * @see org.gvsig.metadata.Metadata#getMetadataID()
695 687
     */
696
    public Object getMetadataID() throws MetadataException {
688
    public Object getMetadataID() {
697 689
    	if(parameters != null && parameters instanceof AbstractRasterStoreParameters)
698 690
    		return ((AbstractRasterStoreParameters)parameters).getFile();
699 691
    	return null;
......
704 696
    * @see org.gvsig.metadata.Metadata#getMetadataChildren()
705 697
    */
706 698
    @SuppressWarnings("unchecked")
707
	public Set getMetadataChildren() throws MetadataException {
699
	public Set getMetadataChildren() {
708 700
    	return null;
709 701
    }
710 702
    
......
873 865
			metadata.clear();
874 866
		}
875 867
    }
868
	
869
	/*
870
	 * (non-Javadoc)
871
	 * @see org.gvsig.fmap.dal.DataStore#getParameters()
872
	 */
873
	public DataStoreParameters getParameters() {
874
		return parameters;
875
	}
876 876
}
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/DefaultMultiRasterStore.java
27 27
import java.util.ArrayList;
28 28

  
29 29
import org.cresques.cts.IProjection;
30
import org.gvsig.fmap.dal.DataStoreParameters;
30 31
import org.gvsig.fmap.dal.coverage.RasterLibrary;
31 32
import org.gvsig.fmap.dal.coverage.dataset.Buffer;
32 33
import org.gvsig.fmap.dal.coverage.datastruct.BandList;
......
52 53
import org.gvsig.fmap.dal.coverage.store.props.Metadata;
53 54
import org.gvsig.fmap.dal.coverage.store.props.Statistics;
54 55
import org.gvsig.fmap.dal.coverage.store.props.Transparency;
55
import org.gvsig.metadata.exceptions.MetadataException;
56
import org.gvsig.fmap.dal.exception.InitializeException;
56 57
import org.gvsig.raster.impl.DefaultRasterManager;
57 58
import org.gvsig.raster.impl.buffer.cache.RasterReadOnlyBuffer;
58 59
import org.gvsig.raster.impl.datastruct.BandListImpl;
......
294 295

  
295 296
	/*
296 297
	 * (non-Javadoc)
297
	 * @see org.gvsig.fmap.dal.coverage.buffer.RasterDataStore#close()
298
	 * @see org.gvsig.fmap.dal.raster.impl.DefaultCoverageStore#close()
298 299
	 */
299 300
	public void close() {
300 301
		for(int i = 0; i < providers.size(); i++)
......
897 898
		try {
898 899
			DefaultMultiRasterStore store = new DefaultMultiRasterStore();
899 900
			store.addDataStore(providers.get(i));
901
			store.intializePhase1(null, (DataStoreParameters)providers.get(i).getDataParameters());
900 902
			return store;
901 903
		} catch (ArrayIndexOutOfBoundsException e) {
902 904
			return null;
905
		} catch (InitializeException e) {
906
			return null;
903 907
		}
904 908
	}
905 909

  
......
1566 1570
	 * (non-Javadoc)
1567 1571
	 * @see org.gvsig.metadata.Metadata#getMetadataName()
1568 1572
	 */
1569
	public String getMetadataName() throws MetadataException {
1573
	public String getMetadataName() {
1570 1574
		if(providers.size() != 0)
1571 1575
			return providers.get(0).getName();
1572 1576
		return null;
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/DefaultMosaicRasterStore.java
55 55
import org.gvsig.fmap.dal.coverage.store.props.Transparency;
56 56
import org.gvsig.fmap.dal.coverage.util.MathUtils;
57 57
import org.gvsig.fmap.dal.coverage.util.RasterUtils;
58
import org.gvsig.fmap.dal.exception.CloseException;
58 59
import org.gvsig.metadata.exceptions.MetadataException;
59 60
import org.gvsig.raster.impl.DefaultRasterManager;
60 61
import org.gvsig.raster.impl.datastruct.BandListImpl;
......
348 349

  
349 350
	/*
350 351
	 * (non-Javadoc)
351
	 * @see org.gvsig.raster.dataset.IRasterDataSource#close()
352
	 * @see org.gvsig.fmap.dal.raster.impl.DefaultCoverageStore#close()
352 353
	 */
353
	public void close() {
354
	public void close() throws CloseException {
354 355
		int n = mosaic.length;
355 356
		int m = mosaic[0].length;
356 357
		for (int row = 0; row < n; row++)
......
1500 1501
	 * (non-Javadoc)
1501 1502
	 * @see org.gvsig.metadata.Metadata#getMetadataName()
1502 1503
	 */
1503
	public String getMetadataName() throws MetadataException {
1504
	public String getMetadataName() {
1504 1505
		if(mosaic != null)
1505
			return mosaic[0][0].getMetadataName();
1506
			try {
1507
				return mosaic[0][0].getMetadataName();
1508
			} catch (MetadataException e) {
1509
				return null;
1510
			}
1506 1511
		return null;
1507 1512
	}
1508 1513

  
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
23 23

  
24 24
import java.awt.geom.AffineTransform;
25 25
import java.awt.geom.Dimension2D;
26
import java.awt.geom.Point2D;
27
import java.awt.geom.Rectangle2D;
28 26
import java.lang.reflect.Constructor;
29 27
import java.lang.reflect.InvocationTargetException;
30 28

  
......
37 35
import org.gvsig.fmap.dal.coverage.datastruct.DataStructFactory;
38 36
import org.gvsig.fmap.dal.coverage.datastruct.Extent;
39 37
import org.gvsig.fmap.dal.coverage.datastruct.GridExtent;
40
import org.gvsig.fmap.dal.coverage.datastruct.NoData;
41 38
import org.gvsig.fmap.dal.coverage.datastruct.Params;
42 39
import org.gvsig.fmap.dal.coverage.datastruct.RasterLegend;
43 40
import org.gvsig.fmap.dal.coverage.datastruct.ViewPortData;
......
67 64
import org.gvsig.fmap.dal.coverage.util.MathUtils;
68 65
import org.gvsig.fmap.dal.coverage.util.ProviderServices;
69 66
import org.gvsig.fmap.dal.coverage.util.RasterUtils;
67
import org.gvsig.fmap.dal.exception.InitializeException;
70 68
import org.gvsig.fmap.dal.raster.spi.CoverageStoreProvider;
71 69
import org.gvsig.raster.impl.buffer.DefaultDataServerWriter;
72 70
import org.gvsig.raster.impl.buffer.DefaultRasterQuery;
......
75 73
import org.gvsig.raster.impl.buffer.cache.RasterCache;
76 74
import org.gvsig.raster.impl.buffer.cache.RasterReadOnlyBuffer;
77 75
import org.gvsig.raster.impl.datastruct.DefaultDataStructFactory;
78
import org.gvsig.raster.impl.datastruct.DefaultNoData;
79 76
import org.gvsig.raster.impl.datastruct.DefaultViewPortData;
80
import org.gvsig.raster.impl.datastruct.ExtentImpl;
81 77
import org.gvsig.raster.impl.datastruct.legend.GimpGradients;
82 78
import org.gvsig.raster.impl.datastruct.legend.GimpPalettes;
83 79
import org.gvsig.raster.impl.datastruct.legend.LegendgvSIG;
......
239 235
	 * (non-Javadoc)
240 236
	 * @see org.gvsig.fmap.dal.coverage.RasterManager#open(org.gvsig.fmap.dal.raster.spi.CoverageStoreProvider, int)
241 237
	 */
242
	public RasterDataStore open(CoverageStoreProvider prov, int type) throws NotSupportedExtensionException, RasterDriverException {
238
	public RasterDataStore open(CoverageStoreProvider prov, int type, DataStoreParameters params) throws NotSupportedExtensionException, RasterDriverException {
243 239
		if(type == TYPE_MULTIDATA) {
244 240
			if(prov instanceof RasterProvider) {
245 241
				DefaultMultiRasterStore store = new DefaultMultiRasterStore();
246 242
				store.getProviders().add((RasterProvider)prov);
247 243
				store.addBands((RasterProvider)prov);
244
				try {
245
					store.intializePhase1(null, params);
246
				} catch (InitializeException e) {
247
					throw new RasterDriverException(e.getMessage());
248
				}
248 249
				return store;
249 250
			}
250 251
		}
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.io/org.gvsig.raster.io.base/src/main/java/org/gvsig/fmap/dal/coverage/dataset/io/MemoryRasterDriver.java
707 707
	public boolean overviewsSupport() {
708 708
		return false;
709 709
	}
710

  
711
	@Override
712
	public AbstractRasterStoreParameters getRasterParameters() {
713
		// TODO Auto-generated method stub
714
		return null;
715
	}
716 710
	
717 711
	/*
718 712
	 * (non-Javadoc)
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.fmap/.classpath
4 4
  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
5 5
  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
6 6
  <classpathentry kind="output" path="target/classes"/>
7
  <classpathentry kind="var" path="M2_REPO/javax/media/jai_codec/1.1.3/jai_codec-1.1.3.jar"/>
8
  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.3/jai_core-1.1.3.jar">
9
    <attributes>
10
      <attribute value="jar:file:/home/nacho/.m2/repository/javax/media/jai_core/1.1.3/jai_core-1.1.3-javadoc.jar!/" name="javadoc_location"/>
11
    </attributes>
12
  </classpathentry>
13 7
  <classpathentry kind="var" path="M2_REPO/javax/help/javahelp/2.0.05/javahelp-2.0.05.jar" sourcepath="M2_REPO/javax/help/javahelp/2.0.05/javahelp-2.0.05-sources.jar">
14 8
    <attributes>
15 9
      <attribute value="jar:file:/home/nacho/.m2/repository/javax/help/javahelp/2.0.05/javahelp-2.0.05-javadoc.jar!/" name="javadoc_location"/>
16 10
    </attributes>
17 11
  </classpathentry>
18
  <classpathentry kind="var" path="M2_REPO/javax/units/jsr108/0.01/jsr108-0.01.jar"/>
19
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-anim/1.7/batik-anim-1.7.jar"/>
20 12
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-awt-util/1.7/batik-awt-util-1.7.jar"/>
21
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-bridge/1.7/batik-bridge-1.7.jar"/>
22
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-css/1.7/batik-css-1.7.jar"/>
23
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-dom/1.7/batik-dom-1.7.jar"/>
24
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-ext/1.7/batik-ext-1.7.jar"/>
25
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-gvt/1.7/batik-gvt-1.7.jar"/>
26
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-js/1.7/batik-js-1.7.jar"/>
27
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-parser/1.7/batik-parser-1.7.jar"/>
28
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-script/1.7/batik-script-1.7.jar"/>
29
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-svg-dom/1.7/batik-svg-dom-1.7.jar"/>
30 13
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-util/1.7/batik-util-1.7.jar"/>
31
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-xml/1.7/batik-xml-1.7.jar"/>
32
  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar"/>
33
  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar"/>
34 14
  <classpathentry kind="var" path="M2_REPO/castor/castor/0.9.5.3/castor-0.9.5.3.jar"/>
35 15
  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1/cglib-nodep-2.1.jar"/>
36 16
  <classpathentry kind="var" path="M2_REPO/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3.jar" sourcepath="M2_REPO/easymock/easymock/1.2_Java1.3/easymock-1.2_Java1.3-sources.jar"/>
37 17
  <classpathentry kind="var" path="M2_REPO/easymock/easymockclassextension/1.2/easymockclassextension-1.2.jar" sourcepath="M2_REPO/easymock/easymockclassextension/1.2/easymockclassextension-1.2-sources.jar"/>
38 18
  <classpathentry kind="var" path="M2_REPO/net/sf/flib-jcalendar/unknown/flib-jcalendar-unknown.jar"/>
39
  <classpathentry kind="var" path="M2_REPO/org/opengis/geoapi/2.0/geoapi-2.0.jar"/>
40
  <classpathentry kind="var" path="M2_REPO/geojava/geojava/unknown/geojava-unknown.jar"/>
41 19
  <classpathentry kind="var" path="M2_REPO/org/geotools/gt2-legacy/unknown/gt2-legacy-unknown.jar"/>
42
  <classpathentry kind="var" path="M2_REPO/org/geotools/gt2-main/unknown/gt2-main-unknown.jar"/>
43
  <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/2.1.4/itext-2.1.4.jar" sourcepath="M2_REPO/com/lowagie/itext/2.1.4/itext-2.1.4-sources.jar">
44
    <attributes>
45
      <attribute value="jar:file:/home/nacho/.m2/repository/com/lowagie/itext/2.1.4/itext-2.1.4-javadoc.jar!/" name="javadoc_location"/>
46
    </attributes>
47
  </classpathentry>
48 20
  <classpathentry kind="lib" path="/home/nacho/software/jdk1.6.0_18/jre/lib/javaws.jar"/>
49 21
  <classpathentry kind="var" path="M2_REPO/jfree/jcommon/1.0.12/jcommon-1.0.12.jar" sourcepath="M2_REPO/jfree/jcommon/1.0.12/jcommon-1.0.12-sources.jar">
50 22
    <attributes>
......
56 28
      <attribute value="jar:file:/home/nacho/.m2/repository/jfree/jfreechart/1.0.7/jfreechart-1.0.7-javadoc.jar!/" name="javadoc_location"/>
57 29
    </attributes>
58 30
  </classpathentry>
59
  <classpathentry kind="var" path="M2_REPO/com/sun/jimi/1.1/jimi-1.1.jar"/>
60
  <classpathentry kind="var" path="M2_REPO/org/jpedal/jpedal/3.47b25/jpedal-3.47b25.jar"/>
61
  <classpathentry kind="var" path="M2_REPO/net/sf/jsi/unknown/jsi-unknown.jar"/>
62 31
  <classpathentry kind="var" path="M2_REPO/com/vividsolutions/jts/1.9/jts-1.9.jar" sourcepath="M2_REPO/com/vividsolutions/jts/1.9/jts-1.9-sources.jar"/>
63 32
  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
64 33
  <classpathentry kind="var" path="M2_REPO/jwizardcomponent/jwizardcomponent/1.2.2/jwizardcomponent-1.2.2.jar"/>
......
72 41
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.andami/2.0-SNAPSHOT/org.gvsig.andami-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.andami/2.0-SNAPSHOT/org.gvsig.andami-2.0-SNAPSHOT-sources.jar"/>
73 42
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.app/2.0-SNAPSHOT/org.gvsig.app-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.app/2.0-SNAPSHOT/org.gvsig.app-2.0-SNAPSHOT-sources.jar"/>
74 43
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.compat/2.0-SNAPSHOT/org.gvsig.compat-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.compat/2.0-SNAPSHOT/org.gvsig.compat-2.0-SNAPSHOT-sources.jar"/>
75
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.compat/2.0-SNAPSHOT/org.gvsig.compat-2.0-SNAPSHOT-se.jar"/>
76
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.coreplugin/2.0-SNAPSHOT/org.gvsig.coreplugin-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.coreplugin/2.0-SNAPSHOT/org.gvsig.coreplugin-2.0-SNAPSHOT-sources.jar"/>
77 44
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.dxf/2.0-SNAPSHOT/org.gvsig.dxf-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.dxf/2.0-SNAPSHOT/org.gvsig.dxf-2.0-SNAPSHOT-sources.jar"/>
78 45
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.control/2.0-SNAPSHOT/org.gvsig.fmap.control-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.fmap.control/2.0-SNAPSHOT/org.gvsig.fmap.control-2.0-SNAPSHOT-sources.jar"/>
79 46
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-sources.jar"/>
80 47
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-impl.jar"/>
81 48
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-spi.jar"/>
82
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-sources.jar"/>
83 49
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-store.dbf.jar"/>
84
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-store.dgn.jar"/>
85
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-store.dgn.legend.jar"/>
86
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-store.dxf.jar"/>
87
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-store.dxf.legend.jar"/>
88 50
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-store.shp.jar"/>
89
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.index.spatial/2.0-SNAPSHOT/org.gvsig.fmap.dal.index.spatial-2.0-SNAPSHOT-gt2.jar"/>
90
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.index.spatial/2.0-SNAPSHOT/org.gvsig.fmap.dal.index.spatial-2.0-SNAPSHOT-jsi.jar"/>
91
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.index.spatial/2.0-SNAPSHOT/org.gvsig.fmap.dal.index.spatial-2.0-SNAPSHOT-jts.jar"/>
92
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.store.raster/2.0-SNAPSHOT/org.gvsig.fmap.dal.store.raster-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.fmap.dal.store.raster/2.0-SNAPSHOT/org.gvsig.fmap.dal.store.raster-2.0-SNAPSHOT-sources.jar"/>
51
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-sources.jar"/>
93 52
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT-sources.jar"/>
94
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT-impl.jar"/>
95 53
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT-operation.jar"/>
96 54
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.mapcontext/2.0-SNAPSHOT/org.gvsig.fmap.mapcontext-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.fmap.mapcontext/2.0-SNAPSHOT/org.gvsig.fmap.mapcontext-2.0-SNAPSHOT-sources.jar"/>
97
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.mapcontext/2.0-SNAPSHOT/org.gvsig.fmap.mapcontext-2.0-SNAPSHOT-impl.jar"/>
98 55
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.mapcontext/2.0-SNAPSHOT/org.gvsig.fmap.mapcontext-2.0-SNAPSHOT-operation.jar"/>
99 56
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.i18n/2.0-SNAPSHOT/org.gvsig.i18n-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.i18n/2.0-SNAPSHOT/org.gvsig.i18n-2.0-SNAPSHOT-sources.jar"/>
100 57
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.jdk.v1_6/1.0.0-SNAPSHOT/org.gvsig.jdk.v1_6-1.0.0-SNAPSHOT.jar"/>
101 58
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.jgdal/2.0.1-SNAPSHOT/org.gvsig.jgdal-2.0.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.jgdal/2.0.1-SNAPSHOT/org.gvsig.jgdal-2.0.1-SNAPSHOT-sources.jar"/>
102
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.jpotrace/2.0.0-SNAPSHOT/org.gvsig.jpotrace-2.0.0-SNAPSHOT.jar"/>
103 59
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.maven.base.tools/1.0.6-SNAPSHOT/org.gvsig.maven.base.tools-1.0.6-SNAPSHOT.jar"/>
104 60
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.metadata/2.0-SNAPSHOT/org.gvsig.metadata-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.metadata/2.0-SNAPSHOT/org.gvsig.metadata-2.0-SNAPSHOT-sources.jar"/>
105
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.metadata/2.0-SNAPSHOT/org.gvsig.metadata-2.0-SNAPSHOT-simple.jar"/>
106 61
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.projection/2.0-SNAPSHOT/org.gvsig.projection-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.projection/2.0-SNAPSHOT/org.gvsig.projection-2.0-SNAPSHOT-sources.jar"/>
107 62
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.projection/2.0-SNAPSHOT/org.gvsig.projection-2.0-SNAPSHOT-cresques-impl.jar"/>
108
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.projection/2.0-SNAPSHOT/org.gvsig.projection-2.0-SNAPSHOT-cresques-ui.jar"/>
109
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.raster/2.0-SNAPSHOT/org.gvsig.raster-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.raster/2.0-SNAPSHOT/org.gvsig.raster-2.0-SNAPSHOT-sources.jar"/>
110 63
  <classpathentry kind="src" path="/org.gvsig.raster.lib.api"/>
111
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.remoteclient/2.0-SNAPSHOT/org.gvsig.remoteclient-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.remoteclient/2.0-SNAPSHOT/org.gvsig.remoteclient-2.0-SNAPSHOT-sources.jar"/>
112 64
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.symbology/2.0-SNAPSHOT/org.gvsig.symbology-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.symbology/2.0-SNAPSHOT/org.gvsig.symbology-2.0-SNAPSHOT-sources.jar"/>
113 65
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.symbology/2.0-SNAPSHOT/org.gvsig.symbology-2.0-SNAPSHOT-impl.jar"/>
114 66
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.tools.evaluator.sqljep/2.0-SNAPSHOT/org.gvsig.tools.evaluator.sqljep-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.tools.evaluator.sqljep/2.0-SNAPSHOT/org.gvsig.tools.evaluator.sqljep-2.0-SNAPSHOT-sources.jar"/>
115 67
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.tools.lib/2.1.0-SNAPSHOT/org.gvsig.tools.lib-2.1.0-SNAPSHOT.jar"/>
116 68
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.ui/2.0-SNAPSHOT/org.gvsig.ui-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.ui/2.0-SNAPSHOT/org.gvsig.ui-2.0-SNAPSHOT-sources.jar"/>
117 69
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.utils/2.0-SNAPSHOT/org.gvsig.utils-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.utils/2.0-SNAPSHOT/org.gvsig.utils-2.0-SNAPSHOT-sources.jar"/>
118
  <classpathentry kind="var" path="M2_REPO/sil/sil/0.43b-am1/sil-0.43b-am1.jar"/>
119 70
  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.5/slf4j-api-1.5.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.5/slf4j-api-1.5.5-sources.jar"/>
120 71
  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.5/slf4j-log4j12-1.5.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.5/slf4j-log4j12-1.5.5-sources.jar"/>
121
  <classpathentry kind="var" path="M2_REPO/spatialindex/spatialindex/unknown/spatialindex-unknown.jar"/>
122 72
  <classpathentry kind="var" path="M2_REPO/net/sf/sqljep/0.2/sqljep-0.2.jar"/>
123
  <classpathentry kind="var" path="M2_REPO/gnu/trove/trove/0.1.8/trove-0.1.8.jar"/>
124
  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
125 73
  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0.jar"/>
126
  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar"/>
127
  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar"/>
128 74
  <classpathentry kind="var" path="M2_REPO/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar"/>
129
  <classpathentry kind="var" path="M2_REPO/zql/zql/unknown/zql-unknown.jar"/>
130 75
  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
131 76
</classpath>
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.fmap/src/main/java/org/gvsig/raster/fmap/layers/DefaultFLyrRaster.java
89 89
import org.gvsig.fmap.dal.coverage.util.MathUtils;
90 90
import org.gvsig.fmap.dal.coverage.util.ProviderServices;
91 91
import org.gvsig.fmap.dal.coverage.util.RasterUtils;
92
import org.gvsig.fmap.dal.exception.CloseException;
92 93
import org.gvsig.fmap.dal.exception.DataException;
93 94
import org.gvsig.fmap.dal.exception.InitializeException;
94 95
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
......
1133 1134
			image = null;
1134 1135
			String[] files = getFileName().clone();
1135 1136
			if (dataStore != null)
1136
				dataStore.close();
1137
				try {
1138
					dataStore.close();
1139
				} catch (CloseException e) {
1140
				}
1137 1141
			dataStore = null;
1138 1142
			render = null;
1139 1143
			// System.gc();
......
2026 2030
	public void setOpenRasterStore(DataStore dataStore, int type) throws LoadLayerException {
2027 2031
		if(dataStore instanceof DefaultCoverageStore) {
2028 2032
			try {
2029
				this.dataStore = rManager.open(((DefaultCoverageStore) dataStore).getProvider(), type);
2033
				this.dataStore = rManager.open(((DefaultCoverageStore) dataStore).getProvider(), type, dataStore.getParameters());
2030 2034
			} catch (NotSupportedExtensionException e) {
2031 2035
				throw new LoadLayerException("Extension not supported", e);
2032 2036
			} catch (RasterDriverException e) {
......
2035 2039
		} else
2036 2040
			this.dataStore = (RasterDataStore) dataStore;
2037 2041
		params = (RasterStoreParameters)dataStore.getParameters();
2038
		
2039 2042
		try {
2040 2043
			enableAwake();
2041 2044
		} catch (NotAvailableStateException e) {
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.fmap/pom.xml
56 56
		</dependency>
57 57
		<dependency>
58 58
			<groupId>org.gvsig</groupId>
59
			<artifactId>org.gvsig.symbology</artifactId>
60
			<version>2.0-SNAPSHOT</version>
61
			<classifier>impl</classifier>
62
		</dependency>
63
		<dependency>
64
			<groupId>org.gvsig</groupId>
59 65
			<artifactId>org.gvsig.fmap.dal</artifactId>
60 66
			<version>2.0-SNAPSHOT</version>
61 67
			<classifier>spi</classifier>

Also available in: Unified diff