Revision 24193

View differences:

branches/v2_0_0_prep/libraries/libFMap_dataFile/.classpath
13 13
	<classpathentry kind="lib" path="/_fwAndami/lib/castor-0.9.5.3-xml.jar"/>
14 14
	<classpathentry kind="lib" path="/_fwAndami/lib/xerces_2_5_0.jar"/>
15 15
	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
16
	<classpathentry kind="lib" path="/libFMap_data/lib/org.gvsig.tools.jar" sourcepath="/libTools"/>
17
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_data_eval_SQLJEP"/>
18 16
	<classpathentry kind="lib" path="lib/slf4j-api-1.5.0.jar"/>
19 17
	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.0.jar"/>
18
	<classpathentry combineaccessrules="false" kind="src" path="/libTools"/>
20 19
	<classpathentry kind="output" path="bin"/>
21 20
</classpath>
branches/v2_0_0_prep/libraries/libFMap_dataFile/src-test/org/gvsig/fmap/data/store/dbf/TestDBF.java
32 32

  
33 33
import junit.framework.TestCase;
34 34

  
35
import org.gvsig.fmap.data.DALFileLibrary;
35 36
import org.gvsig.fmap.data.DALLibrary;
36 37
import org.gvsig.fmap.data.DALLocator;
37 38
import org.gvsig.fmap.data.DataManager;
......
53 54
		lib.initialize();
54 55
		lib.postInitialize();
55 56

  
57
		DALFileLibrary libFile = new DALFileLibrary();
58
		libFile.initialize();
59
		libFile.postInitialize();
60

  
56 61
		Register.selfRegister();
57 62
		dataManager = DALLocator.getDataManager();
58 63
	}
......
63 68

  
64 69
		try {
65 70
			dbfParameters = (DBFStoreParameters) dataManager
66
					.createStoreParameters(DBFStoreProvider.STORE_NAME);
71
					.createStoreParameters(DBFStoreProvider.NAME);
67 72

  
68 73
			dbfParameters.setFile(file);
69 74

  
branches/v2_0_0_prep/libraries/libFMap_dataFile/src/org/gvsig/fmap/data/store/dbf/DBFStoreParameters.java
25 25
	}
26 26

  
27 27
	public String getDataStoreName() {
28
		return DBFStoreProvider.STORE_NAME;
28
		return DBFStoreProvider.NAME;
29 29
	}
30 30

  
31 31
	public boolean isValid() {
......
57 57
	}
58 58

  
59 59
	public String getDescription() {
60
		return DBFStoreProvider.STORE_DESCRIPTION;
60
		return DBFStoreProvider.DESCRIPTION;
61 61
	}
62 62

  
63 63
	public void getState(PersistentState arg0) throws PersistenceException {
branches/v2_0_0_prep/libraries/libFMap_dataFile/src/org/gvsig/fmap/data/store/dbf/DBFFileFilter.java
7 7
public class DBFFileFilter implements FilesystemFileFilter {
8 8

  
9 9
	public String getDataStoreProviderName() {
10
		return DBFStoreProvider.STORE_NAME;
10
		return DBFStoreProvider.NAME;
11 11
	}
12 12

  
13 13
	public boolean accept(File pathname) {
......
15 15
	}
16 16

  
17 17
	public String getDescription() {
18
		return DBFStoreProvider.STORE_DESCRIPTION;
18
		return DBFStoreProvider.DESCRIPTION;
19 19
	}
20 20

  
21 21
}
branches/v2_0_0_prep/libraries/libFMap_dataFile/src/org/gvsig/fmap/data/store/dbf/DBFStoreProvider.java
50 50

  
51 51
public class DBFStoreProvider extends AbstractFeatureStoreProvider implements
52 52
		ResourceConsumer {
53
	public static String STORE_NAME = "DBFStore";
54
	public static String STORE_DESCRIPTION = "DBF file";
53
	public static String NAME = "DBFStore";
54
	public static String DESCRIPTION = "DBF file";
55 55
	//	private DBFResource dbf = null;
56 56
	private DbaseFile dbfFile = null;
57 57
	private ResourceProvider resource;
......
59 59
	private static final Locale ukLocale = new Locale("en", "UK");
60 60

  
61 61
	public String getName() {
62
		return STORE_NAME;
62
		return NAME;
63 63
	}
64 64

  
65 65
	protected DBFStoreParameters getParameters() {
branches/v2_0_0_prep/libraries/libFMap_dataFile/src/org/gvsig/fmap/data/store/dbf/Register.java
8 8
public class Register {
9 9
	public static void selfRegister() {
10 10
		DataManagerProviderServices dsm = (DataManagerProviderServices) DALLocator.getDataManager();
11
		org.gvsig.fmap.data.feature.expressionevaluator.sqljep.Register
12
				.selfRegister();
11
		//		org.gvsig.fmap.data.feature.expressionevaluator.sqljep.Register
12
		//				.selfRegister();
13 13

  
14
		dsm.registerStoreProvider(DBFStoreProvider.STORE_NAME,
14
		dsm.registerStoreProvider(DBFStoreProvider.NAME,
15 15
				DBFStoreProvider.class,
16 16
				DBFStoreParameters.class
17 17
		);
branches/v2_0_0_prep/libraries/libFMap_dataFile/src/org/gvsig/fmap/data/DALFileLibrary.java
34 34
import org.gvsig.fmap.data.resource.file.FileResourceParameters;
35 35
import org.gvsig.fmap.data.resource.spi.ResourceManagerProviderServices;
36 36
import org.gvsig.fmap.data.spi.DataManagerProviderServices;
37
import org.gvsig.fmap.data.store.dbf.DBFStoreProvider;
37 38
import org.gvsig.fmap.data.store.dxf.DXFStoreParameters;
38 39
import org.gvsig.fmap.data.store.dxf.DXFStoreProvider;
39 40
import org.gvsig.tools.locator.BaseLibrary;
......
65 66
			dataman.registerStoreProvider(DXFStoreProvider.NAME, DXFStoreProvider.class, DXFStoreParameters.class);
66 67
    	}
67 68

  
69
    	if (!dataman.getStoreProviders().contains(DBFStoreProvider.NAME)) {
70
			dataman.registerStoreProvider(DBFStoreProvider.NAME,
71
					DBFStoreProvider.class, DBFStoreProvider.class);
72
		}
73

  
68 74
    }
69 75

  
70 76
    public void postInitialize() throws ReferenceNotRegisteredException {

Also available in: Unified diff