Revision 24876

View differences:

branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/dbf/TestDBF.java
35 35
import org.gvsig.fmap.dal.DALFileLibrary;
36 36
import org.gvsig.fmap.dal.DALLibrary;
37 37
import org.gvsig.fmap.dal.DALLocator;
38
import org.gvsig.fmap.dal.DataExplorer;
38
import org.gvsig.fmap.dal.DataServerExplorer;
39 39
import org.gvsig.fmap.dal.DataManager;
40 40
import org.gvsig.fmap.dal.exception.DataException;
41 41
import org.gvsig.fmap.dal.feature.Feature;
......
255 255

  
256 256
			store = (FeatureStore) dataManager.createStore(dbfParameters);
257 257

  
258
			DataExplorer explorer = store.getExplorer();
258
			DataServerExplorer explorer = store.getExplorer();
259 259

  
260 260
			assertEquals(2, explorer.list().size());
261 261

  
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/store/dxf/TestDXF.java
36 36
import org.gvsig.fmap.dal.DALFileLibrary;
37 37
import org.gvsig.fmap.dal.DALLibrary;
38 38
import org.gvsig.fmap.dal.DALLocator;
39
import org.gvsig.fmap.dal.DataExplorer;
39
import org.gvsig.fmap.dal.DataServerExplorer;
40 40
import org.gvsig.fmap.dal.DataManager;
41 41
import org.gvsig.fmap.dal.DataStoreParameters;
42 42
import org.gvsig.fmap.dal.exception.DataException;
......
135 135

  
136 136
			store = (FeatureStore) dataManager.createStore(dxfParameters);
137 137

  
138
			DataExplorer explorer = store
138
			DataServerExplorer explorer = store
139 139
					.getExplorer();
140 140

  
141 141
			List list = explorer.list();
branches/v2_0_0_prep/libraries/libFMap_dalfile/src-test/org/gvsig/fmap/dal/explorer/filesystem/FileSystemExplorerTest.java
36 36
import org.gvsig.fmap.dal.DALFileLibrary;
37 37
import org.gvsig.fmap.dal.DALLibrary;
38 38
import org.gvsig.fmap.dal.DALLocator;
39
import org.gvsig.fmap.dal.DataExplorer;
39
import org.gvsig.fmap.dal.DataServerExplorer;
40 40
import org.gvsig.fmap.dal.DataManager;
41 41
import org.gvsig.fmap.dal.DataStoreParameters;
42 42
import org.gvsig.fmap.dal.DataTypes;
......
81 81
	public void testList() {
82 82
		try {
83 83
			FilesystemExplorerParameters exParam = (FilesystemExplorerParameters) dataManager
84
					.createExplorerParameters(FilesystemExplorer.NAME);
84
					.createServerExplorerParameters(FilesystemExplorer.NAME);
85 85

  
86 86
			exParam.setRoot(dbf_data.getPath());
87 87

  
88
			DataExplorer ex = dataManager.createExplorer(exParam);
88
			DataServerExplorer ex = dataManager.createServerExplorer(exParam);
89 89

  
90 90
			List list = ex.list();
91 91

  
......
148 148
			tmpDir.mkdir();
149 149

  
150 150
			FilesystemExplorerParameters exParam = (FilesystemExplorerParameters) dataManager
151
					.createExplorerParameters(FilesystemExplorer.NAME);
151
					.createServerExplorerParameters(FilesystemExplorer.NAME);
152 152

  
153 153
			exParam.setRoot(tmpDir.getAbsolutePath());
154 154

  
155
			DataExplorer ex = dataManager.createExplorer(exParam);
155
			DataServerExplorer ex = dataManager.createServerExplorer(exParam);
156 156

  
157 157
			assertTrue(ex.canAdd());
158 158

  
branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/store/dxf/DXFStoreProvider.java
26 26
import org.cresques.px.gml.Polygon;
27 27
import org.cresques.px.gml.Polygon3D;
28 28
import org.gvsig.fmap.dal.DALLocator;
29
import org.gvsig.fmap.dal.DataExplorer;
29
import org.gvsig.fmap.dal.DataServerExplorer;
30 30
import org.gvsig.fmap.dal.DataManager;
31 31
import org.gvsig.fmap.dal.DataStoreParameters;
32 32
import org.gvsig.fmap.dal.DataTypes;
......
203 203
	}
204 204

  
205 205

  
206
	public DataExplorer getExplorer() throws ReadException {
206
	public DataServerExplorer getExplorer() throws ReadException {
207 207
		DataManager manager = DALLocator.getDataManager();
208 208
		FilesystemExplorerParameters params;
209 209
		try {
210 210
			params = (FilesystemExplorerParameters) manager
211
				.createExplorerParameters(FilesystemExplorer.NAME);
211
				.createServerExplorerParameters(FilesystemExplorer.NAME);
212 212
			params.setRoot(this.getParameters().getFile().getParent());
213
			return manager.createExplorer(params);
213
			return manager.createServerExplorer(params);
214 214
		} catch (DataException e) {
215 215
			throw new ReadException(this.getName(), e);
216 216
		}
branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/store/dbf/DBFStoreProvider.java
11 11
import java.util.Locale;
12 12

  
13 13
import org.gvsig.fmap.dal.DALLocator;
14
import org.gvsig.fmap.dal.DataExplorer;
14
import org.gvsig.fmap.dal.DataServerExplorer;
15 15
import org.gvsig.fmap.dal.DataManager;
16 16
import org.gvsig.fmap.dal.DataStoreParameters;
17 17
import org.gvsig.fmap.dal.DataTypes;
......
111 111
	}
112 112

  
113 113

  
114
	public DataExplorer getExplorer() throws ReadException {
114
	public DataServerExplorer getExplorer() throws ReadException {
115 115
		DataManager manager = DALLocator.getDataManager();
116 116
		FilesystemExplorerParameters params;
117 117
		try {
118 118
			params = (FilesystemExplorerParameters) manager
119
					.createExplorerParameters(FilesystemExplorer.NAME);
119
					.createServerExplorerParameters(FilesystemExplorer.NAME);
120 120
			params.setRoot(this.getDBFParameters().getDBFFile().getParent());
121
			return manager.createExplorer(params);
121
			return manager.createServerExplorer(params);
122 122
		} catch (DataException e) {
123 123
			throw new ReadException(this.getName(), e);
124 124
		}
branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/explorer/filesystem/FilesystemExplorer.java
8 8
import java.util.Map;
9 9

  
10 10
import org.gvsig.fmap.dal.DALLocator;
11
import org.gvsig.fmap.dal.DataExplorerParameters;
11
import org.gvsig.fmap.dal.DataServerExplorerParameters;
12 12
import org.gvsig.fmap.dal.DataStoreParameters;
13 13
import org.gvsig.fmap.dal.NewDataStoreParameters;
14 14
import org.gvsig.fmap.dal.exception.DataException;
......
16 16
import org.gvsig.fmap.dal.exception.InitializeException;
17 17
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
18 18
import org.gvsig.fmap.dal.exception.RemoveException;
19
import org.gvsig.fmap.dal.spi.DataExplorerProvider;
19
import org.gvsig.fmap.dal.spi.DataServerExplorerProvider;
20 20
import org.gvsig.fmap.dal.spi.DataManagerProviderServices;
21 21
import org.gvsig.fmap.dal.spi.DataStoreProvider;
22 22
import org.gvsig.tools.ToolsLocator;
......
24 24
import org.gvsig.tools.extensionpoint.ExtensionPoint.Extension;
25 25

  
26 26

  
27
public class FilesystemExplorer implements DataExplorerProvider {
27
public class FilesystemExplorer implements DataServerExplorerProvider {
28 28
	// FIXME: , IPersistence{
29 29

  
30 30
	public static final String NAME = "FilesystemExplorer";
......
111 111
		return NAME;
112 112
	}
113 113

  
114
	public DataExplorerParameters getParameters() {
114
	public DataServerExplorerParameters getParameters() {
115 115
		return parameters;
116 116
	}
117 117

  
branches/v2_0_0_prep/libraries/libFMap_dalfile/src/org/gvsig/fmap/dal/explorer/filesystem/FilesystemExplorerParameters.java
1 1
package org.gvsig.fmap.dal.explorer.filesystem;
2 2

  
3
import org.gvsig.fmap.dal.DataExplorerParameters;
3
import org.gvsig.fmap.dal.DataServerExplorerParameters;
4 4
import org.gvsig.fmap.dal.DataTypes;
5 5
import org.gvsig.fmap.dal.spi.AbstractDataParameters;
6 6

  
7 7
public class FilesystemExplorerParameters extends AbstractDataParameters
8
		implements DataExplorerParameters {
8
		implements DataServerExplorerParameters {
9 9

  
10 10
	public FilesystemExplorerParameters() {
11 11
		this.addParameter("root", DataTypes.STRING, "Ruta base a usar", null);

Also available in: Unified diff