Revision 23020 trunk/libraries/libGeocoding/src-test/org/gvsig/geocoding/geomatches/TestPolygonMatcher.java

View differences:

TestPolygonMatcher.java
36 36
import org.apache.log4j.ConsoleAppender;
37 37
import org.apache.log4j.Logger;
38 38
import org.apache.log4j.PatternLayout;
39
import org.gvsig.data.DataManager;
40
import org.gvsig.data.DataStoreParameters;
41
import org.gvsig.data.datastores.vectorial.file.shp.SHPStore;
42
import org.gvsig.data.datastores.vectorial.file.shp.SHPStoreParameters;
43
import org.gvsig.data.vectorial.FeatureCollection;
39
import org.gvsig.fmap.data.DataManager;
40
import org.gvsig.fmap.data.DataStoreParameters;
41
import org.gvsig.fmap.data.feature.FeatureCollection;
42
import org.gvsig.fmap.data.feature.file.shp.Register;
43
import org.gvsig.fmap.data.feature.file.shp.SHPStore;
44
import org.gvsig.fmap.data.feature.file.shp.SHPStoreParameters;
44 45
import org.gvsig.fmap.geom.Geometry;
45 46
import org.gvsig.fmap.geom.primitive.Point2D;
46 47
import org.gvsig.geocoding.geommatches.GeomMatcher;
......
73 74

  
74 75
	public void testPolygonMatcher() {
75 76

  
76
		org.gvsig.data.datastores.vectorial.file.shp.Register.selfRegister();
77
		Register.selfRegister();
77 78

  
78 79
		File filePolys = new File("./test-data/matches/poly.shp");
79 80

  
80 81
		assertTrue(filePolys.exists());
81 82

  
82 83
		DataManager manager = DataManager.getManager();
83
		SHPStoreParameters shpParameters = null;
84
		shpParameters = (SHPStoreParameters) manager
85
				.createDataStoreParameters(SHPStore.DATASTORE_NAME);
86
		shpParameters.setFile(filePolys);
87
		geomatcher = new PolygonMatcher();
88 84

  
85

  
89 86
		try {
87
			SHPStoreParameters shpParameters = null;
88
			shpParameters = (SHPStoreParameters) manager
89
					.createDataStoreParameters(SHPStore.DATASTORE_NAME);
90
			shpParameters.setFile(filePolys);
91
			geomatcher = new PolygonMatcher();
92
			
90 93
			SHPStore store = (SHPStore) manager
91 94
					.createDataStore((DataStoreParameters) shpParameters);
92 95
			store.open();
......
129 132

  
130 133
	 public void testMultiPolygonMatcher() {
131 134

  
132
		org.gvsig.data.datastores.vectorial.file.shp.Register.selfRegister();
135
		Register.selfRegister();
133 136

  
134 137
		File filePolys = new File("./test-data/matches/poly_Dissolve.shp");
135 138

  
136 139
		assertTrue(filePolys.exists());
137 140

  
138 141
		DataManager manager = DataManager.getManager();
139
		SHPStoreParameters shpParameters = null;
140
		shpParameters = (SHPStoreParameters) manager
141
				.createDataStoreParameters(SHPStore.DATASTORE_NAME);
142
		shpParameters.setFile(filePolys);
143
		geomatcher = new PolygonMatcher();
144 142

  
143

  
145 144
		try {
145
			SHPStoreParameters shpParameters = null;
146
			shpParameters = (SHPStoreParameters) manager
147
					.createDataStoreParameters(SHPStore.DATASTORE_NAME);
148
			shpParameters.setFile(filePolys);
149
			geomatcher = new PolygonMatcher();
150
			
146 151
			SHPStore store = (SHPStore) manager
147 152
					.createDataStore((DataStoreParameters) shpParameters);
148 153
			store.open();

Also available in: Unified diff