Revision 953

View differences:

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
128 128
	public String getURI();
129 129
	
130 130
	/**
131
	 * Gets the number of subdatasets
132
	 * @return
133
	 */
134
	public int getSubdatasetCount();
135
	
136
	/**
131 137
	 * Adds a new file. The behavior of this function depends on 
132 138
	 * the kind of provider and its implementation.
133 139
	 * @param file
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
1296 1296
	
1297 1297
	/*
1298 1298
	 * (non-Javadoc)
1299
	 * @see org.gvsig.raster.impl.provider.RasterProvider#getSubdatasetCount()
1300
	 */
1301
	public int getSubdatasetCount() {
1302
		return 0;
1303
	}
1304
	
1305
	/*
1306
	 * (non-Javadoc)
1299 1307
	 * @see org.gvsig.raster.impl.provider.RasterProvider#addFile(java.lang.String)
1300 1308
	 */
1301 1309
	public void addFile(String file) throws InvalidSourceException {
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/DefaultRasterStore.java
76 76
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
77 77
import org.gvsig.fmap.dal.raster.spi.CoverageStoreProvider;
78 78
import org.gvsig.fmap.dal.spi.DataManagerProviderServices;
79
import org.gvsig.fmap.dal.spi.DataStoreProvider;
79 80
import org.gvsig.raster.cache.tile.Tile;
80 81
import org.gvsig.raster.cache.tile.TileCacheLocator;
81 82
import org.gvsig.raster.cache.tile.TileCacheManager;
......
147 148
	
148 149
	/*
149 150
	 * (non-Javadoc)
151
	 * @see org.gvsig.fmap.dal.impl.DataStoreImplementation#intializePhase2(org.gvsig.fmap.dal.spi.DataStoreProvider)
152
	 */
153
	public void intializePhase2(DataStoreProvider provider)
154
			throws InitializeException {
155
		setProvider((RasterProvider)provider);
156
	}
157
	
158
	/*
159
	 * (non-Javadoc)
150 160
	 * @see org.gvsig.fmap.dal.coverage.store.RasterDataStore#setParameters(org.gvsig.fmap.dal.DataStoreParameters)
151 161
	 */
152 162
	public void setParameters(DataStoreParameters p) {
......
187 197
	 * @see org.gvsig.fmap.dal.coverage.store.RasterDataStore#close()
188 198
	 */
189 199
	public void close() {
190
		provider.close();
191
		bandList.clear();
200
		if(provider != null)
201
			provider.close();
202
		if(bandList != null)
203
			bandList.clear();
192 204
	}
193 205

  
194 206
	/**
......
881 893
	 * @see org.gvsig.fmap.dal.coverage.store.RasterDataStore#getWktProjection()
882 894
	 */
883 895
	public String getWktProjection() throws RasterDriverException {
884
		return provider.getWktProjection();
896
		if(provider != null)
897
			return provider.getWktProjection();
898
		return null;
885 899
	}
886 900

  
887 901
	/*
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/store/DefaultStoreFactory.java
21 21
 */
22 22
package org.gvsig.raster.impl.store;
23 23

  
24
import org.gvsig.fmap.dal.DALLocator;
25 24
import org.gvsig.fmap.dal.DataParameters;
26 25
import org.gvsig.fmap.dal.DataStore;
27 26
import org.gvsig.fmap.dal.DataStoreFactory;
28
import org.gvsig.fmap.dal.DataStoreParameters;
29
import org.gvsig.fmap.dal.coverage.RasterLocator;
30
import org.gvsig.fmap.dal.coverage.RasterManager;
31
import org.gvsig.fmap.dal.coverage.exception.NotSupportedExtensionException;
32
import org.gvsig.fmap.dal.coverage.exception.RasterDriverException;
33 27
import org.gvsig.fmap.dal.coverage.store.parameter.RemoteStoreParameters;
34 28
import org.gvsig.fmap.dal.exception.InitializeException;
35
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
36
import org.gvsig.fmap.dal.spi.DataManagerProviderServices;
37
import org.gvsig.raster.impl.DefaultRasterManager;
38
import org.gvsig.raster.impl.provider.DefaultRasterProvider;
39
import org.gvsig.raster.impl.provider.RemoteRasterProvider;
40 29

  
41 30
/**
42 31
 * Default implementation for building a raster store.
......
54 43
		if(parameters == null)
55 44
			return null;
56 45
		
57
		DataManagerProviderServices dataManager = (DataManagerProviderServices)DALLocator.getDataManager();
46
		//DataManagerProviderServices dataManager = (DataManagerProviderServices)DALLocator.getDataManager();
58 47
		
59 48
		//Servicio remoto
60 49
		if(	parameters instanceof RemoteStoreParameters) {
61
			//String name = param.getExplorerName();
62
			DefaultRemoteRasterStore store = new DefaultRemoteRasterStore();
50
			/*DefaultRemoteRasterStore store = new DefaultRemoteRasterStore();
63 51
			
64 52
			DefaultRasterProvider provider = null;
65 53
			try {
......
68 56
				throw new InitializeException("Provider not register error", e);
69 57
			}
70 58
			store.setProvider((RemoteRasterProvider)provider);
71
			return store;
59
			return store;*/
60
			return new DefaultRemoteRasterStore();
72 61
		} 
73 62
		
74 63
		//Fichero
75
 		RasterManager manager = (DefaultRasterManager)RasterLocator.getManager();
64
 		/*RasterManager manager = (DefaultRasterManager)RasterLocator.getManager();
76 65
		try {
77 66
			return manager.open((DataStoreParameters)parameters);
78 67
		} catch (NotSupportedExtensionException e) {
79 68
			throw new InitializeException(e);
80 69
		} catch (RasterDriverException e) {
81 70
			throw new InitializeException(e);
82
		}
71
		}*/
72
		return new DefaultRasterStore();
83 73
	}
84 74

  
85 75
	/*

Also available in: Unified diff