Revision 28296

View differences:

branches/v2_0_0_prep/extensions/extGeocoding/build.xml
1
<project name="extGeocoding" default="generate-without-source" basedir=".">
2
	<description>
3
        Install the Geocoding plugin
4
    </description>
5

  
6
	<!-- set global properties for this build -->
7
	<property name="src" location="src" />
8
	<property name="build" location="bin" />
9
	<property name="dist" location="dist" />
10
	<property name="plugin" value="org.gvsig.geocoding" />
11
	<property name="extension-dir" location="../_fwAndami/gvSIG/extensiones" />
12
	<import file="../binaries/ant/utilities.xml" />
13

  
14
	<target name="init">
15
		<!-- Create the time stamp -->
16
		<tstamp />
17
		<echo>
18
			Compiling ${ant.project.name}...</echo>
19
	</target>
20

  
21
	<target name="generate-without-source" description="generate the distribution without the source file">
22

  
23
		<!-- Create the distribution directory -->
24
		<mkdir dir="${dist}" />
25
		<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
26
		<jar jarfile="${dist}/${plugin}.jar" basedir="${build}" />
27
		<copy file="config/config.xml" todir="${dist}" />
28
		<copy file="about/extGeocoding-about.html" todir="${dist}" />
29
		<copy todir="${dist}">
30
			<fileset dir="config" includes="text*.properties" />
31
			<fileset dir="lib" includes="**/**" />
32
		</copy>
33
		<copy todir="${dist}/about">
34
			<fileset dir="about/" includes="*" />
35
		</copy>
36
		<copy todir="${dist}/images">
37
			<fileset dir="images/" includes="**/**" />
38
		</copy>
39
		<copy todir="${dist}/templates">
40
			<fileset dir="templates" includes="*" />
41
		</copy>
42
		<move todir="${extension-dir}/${plugin}/">
43
			<fileset dir="${dist}" includes="**/**" />
44
		</move>
45
	</target>
46
</project>
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/utils/PatternLoaderThread.java
31 31

  
32 32
import javax.swing.JOptionPane;
33 33

  
34
import org.apache.log4j.Logger;
35 34
import org.gvsig.fmap.dal.feature.FeatureStore;
36 35
import org.gvsig.geocoding.pattern.Patterngeocoding;
37 36
import org.gvsig.geocoding.pattern.impl.DefaultPatterngeocoding;
37
import org.slf4j.Logger;
38
import org.slf4j.LoggerFactory;
38 39

  
39 40
import com.iver.andami.PluginServices;
40 41

  
......
48 49

  
49 50
public class PatternLoaderThread extends Thread {
50 51

  
51
	private Logger log = Logger.getLogger(PatternLoaderThread.class);
52
	private static final Logger log = LoggerFactory
53
			.getLogger(PatternLoaderThread.class);
52 54
	private File file = null;
53 55
	private boolean ok = true;
54 56
	private Patterngeocoding pattern = null;
......
62 64

  
63 65
	/**
64 66
	 * Constructor with file
67
	 * 
65 68
	 * @param file
66 69
	 */
67 70
	public PatternLoaderThread(File file) {
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/export/MasiveExportThread.java
58 58
import org.gvsig.fmap.dal.store.dbf.DBFStoreProvider;
59 59
import org.gvsig.fmap.dal.store.shp.SHPNewStoreParameters;
60 60
import org.gvsig.fmap.dal.store.shp.SHPStoreProvider;
61
import org.gvsig.fmap.geom.GeometryFactory;
61
import org.gvsig.fmap.geom.Geometry;
62
import org.gvsig.fmap.geom.GeometryManager;
62 63
import org.gvsig.fmap.geom.GeometryLocator;
64
import org.gvsig.fmap.geom.exception.CreateGeometryException;
63 65
import org.gvsig.fmap.geom.primitive.Point;
64
import org.gvsig.fmap.geom.primitive.Point2D;
65 66
import org.gvsig.fmap.mapcontext.layers.FLayers;
66 67
import org.gvsig.fmap.mapcontext.layers.LayerFactory;
67 68
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
......
232 233
					idres++;
233 234
				}
234 235
				store.finishEditing();
235
				store.dispose();
236 236

  
237 237
			} catch (Exception e) {
238 238
				log.error("Creating dbf store", e);
......
271 271
		if (address instanceof ComposedAddress) {
272 272
			compose = true;
273 273
			ComposedAddress caddress = (ComposedAddress) address;
274
			List<Literal> inter = caddress.getIntersectionLiteral();
274
			List<Literal> inter = caddress.getIntersectionLiterals();
275 275
			if (inter.size() == 2) {
276 276
				cross = false;
277 277
			}
......
326 326
		}
327 327
		if (address instanceof ComposedAddress) {
328 328
			ComposedAddress caddress = (ComposedAddress) address;
329
			List<Literal> inter = caddress.getIntersectionLiteral();
329
			List<Literal> inter = caddress.getIntersectionLiterals();
330 330
			if (inter.size() == 1) {
331 331
				Literal seclit = inter.get(0);
332 332
				for (Object obj : seclit) {
......
405 405
	 * 
406 406
	 * @param newstore
407 407
	 * @throws DataException
408
	 * @throws CreateGeometryException 
408 409
	 */
409 410
	private void fillSelectedResultsStore(FeatureStore newstore)
410
			throws DataException {
411
			throws DataException, CreateGeometryException {
411 412

  
412 413
		Integer[] sels = control.getGmodel().getExportElements();
413 414
		List<Set<GeocodingResult>> results = control.getGmodel()
......
451 452
				Point pto = (Point) resu.getGeometry();
452 453
				feature.setDouble(GeocodingTags.gX, pto.getX());
453 454
				feature.setDouble(GeocodingTags.gY, pto.getY());
454
				GeometryFactory geomFactory = GeometryLocator
455
						.getGeometryManager().getGeometryFactory();
456
				Point2D geom = (Point2D) geomFactory.createPoint2D(pto.getX(),
457
						pto.getY());
455
				GeometryManager geomManager = GeometryLocator
456
						.getGeometryManager();
457
				Point geom = (Point) geomManager.createPoint(pto.getX(),
458
						pto.getY(),Geometry.SUBTYPES.GEOM2D);
458 459

  
459 460
				feature.setGeometry(GeocodingTags.gGEOMETRY, geom);
460 461
			}
......
502 503

  
503 504
		} catch (Exception e) {
504 505
			log.error("ERROR building FLayer");
505
		}
506
		}		
506 507

  
507 508
		return lyr;
508 509
	}
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/TableResultsModel.java
38 38
import org.gvsig.fmap.dal.feature.Feature;
39 39
import org.gvsig.fmap.dal.feature.FeatureSet;
40 40
import org.gvsig.fmap.dal.feature.FeatureType;
41
import org.gvsig.fmap.geom.primitive.Point2D;
41
import org.gvsig.fmap.geom.primitive.Point;
42
import org.gvsig.fmap.geom.primitive.impl.Point2D;
42 43
import org.gvsig.fmap.mapcontext.MapContext;
43 44
import org.gvsig.fmap.mapcontrol.MapControl;
44 45
import org.gvsig.geocoding.address.Address;
......
117 118
		// Composed address
118 119
		else if (address instanceof ComposedAddress) {
119 120
			ComposedAddress adr = (ComposedAddress) address;
120
			int intersize = adr.getIntersectionLiteral().size();
121
			int intersize = adr.getIntersectionLiterals().size();
121 122
			Literal mainLit = adr.getMainLiteral();
122 123
			int litsize = mainLit.size();
123 124
			// cross
......
136 137
						.getKeyElement()
137 138
						+ "_1";
138 139
			}
139
			Literal secLit = adr.getIntersectionLiteral().get(0);
140
			Literal secLit = adr.getIntersectionLiterals().get(0);
140 141
			for (int i = 0; i < litsize; i++) {
141 142
				columnNames[4 + litsize + i] = ((AddressComponent) secLit
142 143
						.get(i)).getKeyElement()
143 144
						+ "_2";
144 145
			}
145 146
			if (intersize == 2) {
146
				Literal thiLit = adr.getIntersectionLiteral().get(1);
147
				Literal thiLit = adr.getIntersectionLiterals().get(1);
147 148
				for (int i = 0; i < litsize; i++) {
148 149
					columnNames[4 + litsize + litsize + i] = ((AddressComponent) thiLit
149 150
							.get(i)).getKeyElement()
......
164 165
			}
165 166
		}
166 167
	}
167
	
168
	public TableResultsModel(FeatureType type, FeatureSet set){
169
		
168

  
169
	public TableResultsModel(FeatureType type, FeatureSet set) {
170

  
170 171
		int siz = 0;
171 172
		try {
172
			siz = (int)set.getSize();
173
		
174
		columnsNumber = type.size();		
175
		columnNames = new String[columnsNumber];
176
		for (int i = 0; i < columnsNumber; i++) {
177
			columnNames[i]= type.getAttributeDescriptor(i).getName();
178
		}
179
		data = new Object[siz][columnsNumber];
180
		Iterator<Feature> it = set.iterator();
181
		int i = 0;
182
		while(it.hasNext()){
183
			Feature feat = it.next();
184
			for (int j = 0; j < columnsNumber; j++) {
185
				String fieldname = type.getAttributeDescriptor(j).getName();
186
				data[i][j]= feat.get(fieldname);
187
			}				
188
			i++;
189
		}
190
		
191
		
192
		
193
		
173
			siz = (int) set.getSize();
174

  
175
			columnsNumber = type.size();
176
			columnNames = new String[columnsNumber];
177
			for (int i = 0; i < columnsNumber; i++) {
178
				columnNames[i] = type.getAttributeDescriptor(i).getName();
179
			}
180
			data = new Object[siz][columnsNumber];
181
			Iterator<Feature> it = set.iterator();
182
			int i = 0;
183
			while (it.hasNext()) {
184
				Feature feat = it.next();
185
				for (int j = 0; j < columnsNumber; j++) {
186
					String fieldname = type.getAttributeDescriptor(j).getName();
187
					data[i][j] = feat.get(fieldname);
188
				}
189
				i++;
190
			}
191

  
194 192
		} catch (DataException e) {
195 193
			// TODO Auto-generated catch block
196 194
			e.printStackTrace();
197 195
		}
198
		
199
		
196

  
200 197
	}
201
	
202 198

  
203 199
	/**
204 200
	 * Get number of column in the table model
201
	 * 
205 202
	 * @return
206 203
	 */
207 204
	public int getColumnCount() {
......
210 207

  
211 208
	/**
212 209
	 * Get rows number
210
	 * 
213 211
	 * @return
214 212
	 */
215 213
	public int getRowCount() {
......
218 216

  
219 217
	/**
220 218
	 * Get selected column name
219
	 * 
221 220
	 * @param col
222 221
	 * @return
223 222
	 */
......
227 226

  
228 227
	/**
229 228
	 * Get registry value
229
	 * 
230 230
	 * @param row
231 231
	 * @param col
232 232
	 * @return
......
245 245
	 * JTable uses this method to determine the default renderer/ editor for
246 246
	 * each cell. If we didn't implement this method, then the last column would
247 247
	 * contain text ("true"/"false"), rather than a check box.
248
	 * @param c 
248
	 * 
249
	 * @param c
249 250
	 * @return
250 251
	 */
251 252
	public Class getColumnClass(int c) {
......
258 259

  
259 260
	/**
260 261
	 * Are cells editables
262
	 * 
261 263
	 * @param row
262 264
	 * @param col
263 265
	 * @return
264 266
	 */
265
	public boolean isCellEditable(int row, int col) {		
267
	public boolean isCellEditable(int row, int col) {
266 268
		return false;
267 269
	}
268 270

  
269 271
	/**
270 272
	 * Set value in selected cell
273
	 * 
271 274
	 * @param row
272 275
	 * @param col
273 276
	 * @return
......
279 282

  
280 283
	/**
281 284
	 * fill the model with results set
285
	 * 
282 286
	 * @param result
283 287
	 * @param maxResults
284 288
	 * @param score
......
331 335
				data[i][0] = id;
332 336
				data[i][1] = score1.intValue();
333 337
				if (res.getGeometry() != null) {
334
					Double x = new Double(((Point2D) res.getGeometry()).getX());
335
					Double y = new Double(((Point2D) res.getGeometry()).getY());
338
					Double x = new Double(((Point) res.getGeometry()).getX());
339
					Double y = new Double(((Point) res.getGeometry()).getY());
336 340
					data[i][2] = x;
337 341
					data[i][3] = y;
338 342
				} else {
......
361 365
				// Composed address
362 366
				else if (res.getAddress() instanceof ComposedAddress) {
363 367
					// get compose address
364
					ComposedAddress address = (ComposedAddress) res.getAddress();
368
					ComposedAddress address = (ComposedAddress) res
369
							.getAddress();
365 370
					// main literal
366 371
					Literal mainLit = address.getMainLiteral();
367 372
					int litsize = mainLit.size();
......
374 379
						data[i][cont] = value;
375 380
					}
376 381
					// fill second literal address values
377
					List<Literal> inter = address.getIntersectionLiteral();
382
					List<Literal> inter = address.getIntersectionLiterals();
378 383
					Literal secLit = inter.get(0);
379 384
					for (int j = 0; j < litsize; j++) {
380 385
						int cont = 4 + litsize + j;
......
384 389
						data[i][cont] = value;
385 390
					}
386 391
					// third literal (between)
387
					int intersize = address.getIntersectionLiteral().size();
392
					int intersize = address.getIntersectionLiterals().size();
388 393
					if (intersize == 2) {
389 394
						Literal thiLit = inter.get(1);
390 395
						for (int j = 0; j < litsize; j++) {
......
451 456
	 * @param row
452 457
	 * @return
453 458
	 */
454
	public Point2D getGeometry(int row, int xColumn, int yColumn) {
459
	public Point getGeometry(int row, int xColumn, int yColumn) {
455 460
		Double x = (Double) getValueAt(row, xColumn);
456 461
		Double y = (Double) getValueAt(row, yColumn);
457
		return new Point2D(x, y);
462
		Point pto = new Point2D();
463
		pto.setX(x);
464
		pto.setY(y);
465
		return pto;
458 466
	}
459 467

  
460 468
}
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/GeocodingPanel.java
52 52
import org.gvsig.fmap.dal.exception.DataException;
53 53
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
54 54
import org.gvsig.fmap.dal.feature.FeatureStore;
55
import org.gvsig.fmap.geom.primitive.Point2D;
55
import org.gvsig.fmap.geom.primitive.Point;
56 56
import org.gvsig.geocoding.export.MasiveExportThread;
57 57
import org.gvsig.geocoding.extension.GeocodingController;
58 58
import org.gvsig.geocoding.gui.address.AbstractAddressPanel;
59 59
import org.gvsig.geocoding.gui.settings.SettingsPanel;
60 60
import org.gvsig.geocoding.pattern.Patterngeocoding;
61
import org.gvsig.geocoding.pattern.impl.DefaultPatterngeocoding;
61 62
import org.gvsig.geocoding.result.GeocodingResult;
62 63
import org.gvsig.geocoding.utils.GeocodingUtils;
63 64
import org.gvsig.project.document.table.FeatureTableDocument;
65
import org.gvsig.tools.ToolsLocator;
66
import org.gvsig.tools.persistence.PersistenceException;
67
import org.gvsig.tools.persistence.PersistenceManager;
68
import org.gvsig.tools.persistence.PersistentState;
64 69
import org.slf4j.Logger;
65 70
import org.slf4j.LoggerFactory;
66 71

  
......
621 626
	 * edit current pattern event
622 627
	 * 
623 628
	 * @param evt
629
	 * @throws PersistenceException
624 630
	 */
625 631
	private void evEditPattern(java.awt.event.ActionEvent evt) {
632

  
626 633
		Patterngeocoding pat = control.getPattern();
627
		// TODO hacer una copiar del patr?n (Clonar)
628
		control.launchNewPatternPanel(pat);
634
		Patterngeocoding copypat = null;
635
		// Copiar del patr?n (Clonar)
636
		PersistenceManager manager = ToolsLocator.getPersistenceManager();
637
		PersistentState state = null;
638
		try {
639
			state = manager.getState(pat);
640
			copypat = new DefaultPatterngeocoding();
641
			copypat.setState(state);
642
		} catch (PersistenceException e) {
643
			log.error("Error cloning the pattern",e);
644
		}
645
		if(copypat != null){
646
			control.launchNewPatternPanel(copypat);
647
		}
648
		
629 649
	}
630 650

  
631 651
	/**
......
817 837
			this.setSize(this.getWidth() + 1, this.getHeight());
818 838
			jPanType.validate();
819 839
			jPanResults.validate();
820
			jPanPattern.validate();		
840
			jPanPattern.validate();
821 841
			this.validate();
822 842
		}
823 843

  
824 844
		this.setSize(this.getWidth() + 1, this.getHeight());
825 845
		jPanType.validate();
826 846
		jPanResults.validate();
827
		jPanPattern.validate();		
847
		jPanPattern.validate();
828 848
		this.validate();
829 849

  
830 850
	}
......
1058 1078

  
1059 1079
		TableResultsModel model = (TableResultsModel) jTableResults.getModel();
1060 1080
		// zoom to geom
1061
		Point2D pto = model.getGeometry(row,2,3);
1062
		try {			
1081
		Point pto = model.getGeometry(row, 2, 3);
1082
		try {
1063 1083
			control.zoomToPoint(pto.getX(), pto.getY());
1064 1084
		} catch (Exception e1) {
1065 1085
			log.error("Doing zoom to point", e1);
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/results/ResultsPanel.java
24 24

  
25 25
import org.gvsig.fmap.dal.DALLocator;
26 26
import org.gvsig.fmap.dal.DataManager;
27
import org.gvsig.fmap.dal.DataStoreParameters;
27 28
import org.gvsig.fmap.dal.exception.DataException;
28 29
import org.gvsig.fmap.dal.feature.EditableFeature;
29 30
import org.gvsig.fmap.dal.feature.Feature;
......
32 33
import org.gvsig.fmap.dal.feature.FeatureStore;
33 34
import org.gvsig.fmap.dal.feature.FeatureStoreNotification;
34 35
import org.gvsig.fmap.dal.feature.FeatureType;
36
import org.gvsig.fmap.dal.feature.impl.DefaultEditableFeature;
35 37
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureStore;
36
import org.gvsig.fmap.dal.feature.testediting.UpdateFeature;
37
import org.gvsig.fmap.geom.primitive.Point2D;
38
import org.gvsig.fmap.dal.feature.spi.AbstractFeatureStoreProvider;
39
import org.gvsig.fmap.dal.feature.spi.DefaultFeatureData;
40
import org.gvsig.fmap.dal.feature.spi.FeatureData;
41
import org.gvsig.fmap.dal.store.shp.SHPFeatureData;
42
import org.gvsig.fmap.dal.store.shp.SHPStoreParameters;
43
import org.gvsig.fmap.dal.store.shp.SHPStoreProvider;
44
import org.gvsig.fmap.geom.primitive.Point;
38 45
import org.gvsig.geocoding.extension.GeocodingController;
39 46
import org.gvsig.geocoding.gui.TableResultsModel;
40 47
import org.gvsig.geocoding.utils.GeocodingTags;
......
315 322

  
316 323
			// draw and zoom to geom
317 324

  
318
			Point2D pto = model.getGeometry(row, 4, 5);
325
			Point pto = model.getGeometry(row, 4, 5);
319 326
			try {
320 327
				control.drawPositionsOnView(pto);
321 328
				control.zoomToPoint(pto.getX(), pto.getY());
......
347 354
			double y =  (Double)model.getValueAt(rowsel, 5);
348 355

  
349 356
			try {
350
				shpstore.dispose();
357
				//shpstore.dispose();
351 358
				//shpstore.finishEditing();
352
				shpstore.edit(FeatureStore.MODE_FULLEDIT);
359
				//shpstore.edit();
353 360
				FeatureSet selfeats = (FeatureSet) shpstore.getSelection();
354 361
				if (selfeats.getSize() > 0) {
355
					Iterator<EditableFeature> it = selfeats.iterator(0);
356
					EditableFeature shpfeat = it.next();
362
					Iterator<Feature> it = selfeats.iterator(0);
363
					FeatureType ftype = shpstore.getDefaultFeatureType();
364
					SHPStoreParameters params = (SHPStoreParameters)shpstore.getParameters();
365
					AbstractFeatureStoreProvider pro = new SHPStoreProvider(params);
366
					FeatureData fdata = new DefaultFeatureData(ftype);
367
					EditableFeature shpfeat = new DefaultEditableFeature((DefaultFeatureStore) shpstore,fdata);
368
					//EditableFeature shpfeat = (EditableFeature)it.next();
357 369
					shpfeat.set(GeocodingTags.gSCORE, score);
358 370
					shpfeat.set(GeocodingTags.gX, x);
359 371
					shpfeat.set(GeocodingTags.gY, y);
360
				}
361
				selfeats.dispose();
362
				shpstore.dispose();
363
				shpstore.finishEditing();
372
					selfeats.update(shpfeat);
373
					selfeats.dispose();
374
				}				
375
				//shpstore.finishEditing();
376
				
364 377
			} catch (DataException e) {
365 378
				log.error("", e);
366 379
			}
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/address/AddressComposedPanel.java
546 546
			intersectionLiterals.add(literal3);
547 547
		}
548 548

  
549
		address.setIntersectionLiteral(intersectionLiterals);
549
		address.setIntersectionLiterals(intersectionLiterals);
550 550

  
551 551
		return address;
552 552
	}
......
632 632
			}
633 633
			intersectionLiterals.add(literal3);
634 634
		}
635
		address.setIntersectionLiteral(intersectionLiterals);
635
		address.setIntersectionLiterals(intersectionLiterals);
636 636

  
637 637
		return address;
638 638
	}
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/extension/GeocodingExtension.java
30 30
import org.gvsig.geocoding.GeocodingLibrary;
31 31
import org.gvsig.geocoding.preferences.GeocodingPreferences;
32 32
import org.gvsig.geocoding.utils.GeocodingTags;
33
import org.gvsig.metadata.MDLibrary;
34
import org.gvsig.metadata.simple.SimpleMDLibrary;
35 33
import org.gvsig.tools.locator.Library;
36 34
import org.slf4j.Logger;
37 35
import org.slf4j.LoggerFactory;
38 36

  
39
import sun.security.jca.GetInstance;
40

  
41 37
import com.iver.andami.PluginServices;
42 38
import com.iver.andami.plugins.Extension;
43 39
import com.iver.andami.preferences.IPreference;
......
57 53
public class GeocodingExtension extends Extension implements
58 54
		IPreferenceExtension {
59 55

  
56
	@SuppressWarnings("unused")
60 57
	private static final Logger log = LoggerFactory
61 58
			.getLogger(GeocodingExtension.class);
62 59

  
......
142 139
	/**
143 140
	 * 
144 141
	 */
145
	public void postInitialize() {		
142
	public void postInitialize() {
146 143
		Library api = new GeocodingLibrary();
147 144
		api.postInitialize();
148 145
	}
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/extension/GeocodingTask.java
33 33

  
34 34
import javax.swing.JTable;
35 35

  
36
import org.gvsig.fmap.geom.primitive.Point2D;
36

  
37
import org.gvsig.fmap.geom.primitive.Point;
38
import org.gvsig.geocoding.Geocoder;
39
import org.gvsig.geocoding.GeocodingLocator;
37 40
import org.gvsig.geocoding.address.Address;
38 41
import org.gvsig.geocoding.gui.TableResultsModel;
39 42
import org.gvsig.geocoding.impl.DataGeocoderImpl;
......
57 60
			.getLogger(GeocodingTask.class);
58 61
	private GeocodingController control;
59 62
	private long finalStep;
63
	private Geocoder geoco = null;
60 64

  
61 65
	/**
62 66
	 * Constructor task
......
72 76
		setDeterminatedProcess(true);
73 77
		finalStep = control.getGeocodingProcessCount();
74 78
		setFinalStep((int) finalStep);
79
		//
80
		GeocodingLocator loc = GeocodingLocator.getInstance();
81
		geoco = loc.getGeocoder();
75 82
	}
76 83

  
77 84
	/**
......
148 155
			jTableResults.setRowSelectionInterval(0, 0);
149 156

  
150 157
			// zoom position to first result in the view
151
			Point2D pto = model.getGeometry(0,2,3);
158
			Point pto = model.getGeometry(0,2,3);
152 159
			control.zoomToPoint(pto.getX(), pto.getY());
153 160

  
154 161
			if (results.size() > 1) {
......
189 196

  
190 197
		Set<GeocodingResult> results = new TreeSet<GeocodingResult>();
191 198
		try {
192
			results = new DataGeocoderImpl(pat).geocode(address);
199
			((DataGeocoderImpl)geoco).setPattern(pat);
200
			results = geoco.geocode(address);
193 201
		} catch (Exception e) {
194 202
			log.error("ERROR in geocoding process", e);
195 203
		}
branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/extension/GeocodingController.java
44 44
import javax.swing.JTable;
45 45

  
46 46
import org.gvsig.fmap.geom.Geometry;
47
import org.gvsig.fmap.geom.primitive.DefaultEnvelope;
48 47
import org.gvsig.fmap.geom.primitive.Envelope;
48
import org.gvsig.fmap.geom.primitive.Point;
49
import org.gvsig.fmap.geom.primitive.impl.Envelope2D;
50
import org.gvsig.fmap.geom.primitive.impl.Point2D;
49 51
import org.gvsig.fmap.mapcontext.MapContext;
50 52
import org.gvsig.fmap.mapcontext.layers.FLayer;
51 53
import org.gvsig.fmap.mapcontext.layers.FLayers;
......
72 74
import org.gvsig.geocoding.pattern.Patterngeocoding;
73 75
import org.gvsig.geocoding.result.GeocodingResult;
74 76
import org.gvsig.geocoding.styles.AbstractGeocodingStyle;
75
import org.gvsig.geocoding.styles.AbstractRange;
77
import org.gvsig.geocoding.styles.impl.AbstractRange;
76 78
import org.gvsig.geocoding.styles.impl.Composed;
77 79
import org.gvsig.geocoding.styles.impl.SimpleCentroid;
78 80
import org.gvsig.geocoding.utils.GeocodingTags;
......
505 507
			double minY = oldExtent.getMinimum(1) + movY;
506 508
			double width = oldExtent.getLength(0);
507 509
			double height = oldExtent.getLength(1);
508
			Envelope enve = new DefaultEnvelope(minX, minY, minX + width, minY
510
			Point pto1 = new Point2D(minX, minY);
511
			Point pto2 = new Point2D(minX + width, minY
509 512
					+ height);
513
			Envelope enve = new Envelope2D(pto1, pto2);
510 514
			mapControl.getViewPort().setEnvelope(enve);
511 515
		}
512 516

  
branches/v2_0_0_prep/extensions/extGeocoding/pom.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2

  
3
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5
                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
6
                      
7
	<modelVersion>4.0.0</modelVersion>
8
	<groupId>org.gvsig</groupId>
9
	<artifactId>org.gvsig.geocoding.extension</artifactId>
10
	<packaging>jar</packaging>
11
	<version>2.0-SNAPSHOT</version>
12
	<name>extGeocoding</name>
13
	<url>http://gvsig.org</url>
14
	<description> TODO</description>
15
	<parent>
16
		<groupId>org.gvsig</groupId>
17
		<artifactId>gvsig-extension-base-pom
18
		</artifactId>
19
		<version>2.0-SNAPSHOT</version>
20
	</parent>
21
	<dependencies>
22
		<dependency>
23
			<groupId>org.gvsig</groupId>
24
			<artifactId>org.gvsig.geocoding</artifactId>
25
			<version>2.0-SNAPSHOT</version>
26
		</dependency>
27
		<dependency>
28
			<groupId>org.gvsig</groupId>
29
			<artifactId>org.gvsig.andami</artifactId>
30
			<version>2.0-SNAPSHOT</version>
31
		</dependency>
32
		<dependency>
33
			<groupId>org.gvsig</groupId>
34
			<artifactId>org.gvsig.projection</artifactId>
35
			<version>2.0-SNAPSHOT</version>
36
		</dependency>
37
		<dependency>
38
			<groupId>org.gvsig</groupId>
39
			<artifactId>com.iver.cit.gvsig</artifactId>
40
			<version>2.0-SNAPSHOT</version>
41
		</dependency>
42
		<dependency>
43
			<groupId>org.apache.lucene</groupId>
44
			<artifactId>lucene-core</artifactId>
45
			<version>2.3.2</version>
46
		</dependency>	
47
		<dependency>
48
			<groupId>org.apache.lucene</groupId>
49
			<artifactId>lucene-snowball</artifactId>
50
			<version>2.3.2</version>
51
		</dependency>			
52
	</dependencies>
53
	<properties>
54
		<extension-appgvsig-lib-dir> ${extension-dir}/com.iver.cit.gvsig/lib/
55
		</extension-appgvsig-lib-dir>
56
		<build-dir>${basedir}/../build</build-dir>
57
		<extension-distribution> gvSIG/extensiones/org.gvsig.geocoding.extension/
58
		</extension-distribution>
59

  
60
		<!-- Path to the file descriptor to generate the extension-->
61
		<extension-distribution-file>distribution/extension-distribution.xml
62
		</extension-distribution-file>
63
		<!-- Final name of the output directory for the distribution -->
64
		<distribution-final-name>extGeocoding</distribution-final-name>
65
		<application-name>extGeocoding</application-name>
66
		<output-dir_installers>target/intallers/
67
		</output-dir_installers>
68
	</properties>
69
	<build>
70
		<sourceDirectory>src</sourceDirectory>
71
		<testSourceDirectory>test</testSourceDirectory>
72
		<plugins>
73
            <plugin>
74
                <artifactId>maven-clean-plugin</artifactId>
75
                <configuration>
76
                    <filesets>
77
                        <fileset>
78
                            <directory>${gvsig-path}/${extension-distribution}</directory>
79
                            <includes>
80
                                <include>**</include>
81
                            </includes>
82
                        </fileset>
83
                    </filesets>
84
                </configuration>
85
            </plugin>
86
		</plugins>
87
	</build>
88
</project>
branches/v2_0_0_prep/extensions/extGeocoding/.settings/org.eclipse.jdt.core.prefs
1
#Wed Apr 29 13:18:23 CEST 2009
2
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
3
eclipse.preferences.version=1
4
org.eclipse.jdt.core.compiler.source=1.5
5
org.eclipse.jdt.core.compiler.compliance=1.5
branches/v2_0_0_prep/extensions/extGeocoding/distribution/extension-distribution.xml
1
<assembly>
2
	<id>distribution</id>
3
	<formats>
4
		<format>dir</format>
5
	</formats>
6
	<fileSets>
7
	<!-- Extructure for the extension -->
8
		<fileSet>
9
			<directory>config</directory>
10
			<outputDirectory>${extension-distribution}
11
			</outputDirectory>
12
		</fileSet>
13
		<fileSet>
14
			<directory>images</directory>
15
			<outputDirectory>/${extension-distribution}/images
16
			</outputDirectory>
17
		</fileSet>	
18
		<fileSet>
19
			<directory>templates</directory>
20
			<outputDirectory>/${extension-distribution}/templates
21
			</outputDirectory>
22
		</fileSet>	
23
		<fileSet>
24
			<directory>about</directory>
25
			<outputDirectory>/${extension-distribution}/about
26
			</outputDirectory>
27
		</fileSet>	
28
	</fileSets>
29
	<files>
30
		<!--  <file>
31
			<source>build.number</source>
32
			<outputDirectory>${extension-distribution}
33
			</outputDirectory>
34
		</file> -->
35
	</files>
36
	<!--
37
		***********************************************************************
38
	-->
39
  <!-- *													   *-->
40
	<!--
41
		***********************************************************************
42
	-->
43
	<dependencySets>
44
		<dependencySet>
45
			<outputDirectory>${extension-distribution}/${library-dir}
46
			</outputDirectory>
47
			<includes>			
48
				<include>org.gvsig:org.gvsig.geocoding.extension</include>
49
				<include>org.gvsig:org.gvsig.geocoding</include>
50
				<include>org.apache.lucene:lucene-core</include>
51
				<include>org.apache.lucene:lucene-snowball</include>
52
			</includes>
53
		</dependencySet>
54
	</dependencySets>
55
</assembly>
branches/v2_0_0_prep/extensions/extGeocoding/.classpath
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3 3
	<classpathentry kind="src" path="src"/>
4
	<classpathentry kind="src" path="src-test"/>
5 4
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6
	<classpathentry kind="lib" path="/_fwAndami/lib/org.gvsig.ui.jar" sourcepath="/libUIComponent/src"/>
7
	<classpathentry kind="lib" path="/_fwAndami/lib/xml-apis.jar"/>
8
	<classpathentry kind="lib" path="/_fwAndami/andami.jar" sourcepath="/_fwAndami"/>
9
	<classpathentry kind="lib" path="lib/lucene-core-2.3.2.jar"/>
10
	<classpathentry kind="lib" path="lib/lucene-snowball-2.3.2.jar"/>
11
	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
12
	<classpathentry kind="lib" path="lib/org.gvsig.tools.storage.jar"/>
13
	<classpathentry combineaccessrules="false" kind="src" path="/appgvSIG"/>
14
	<classpathentry kind="lib" path="/_fwAndami/lib/castor-0.9.5.3-xml.jar"/>
15
	<classpathentry kind="lib" path="/_fwAndami/lib/log4j-1.2.15.jar"/>
16
	<classpathentry kind="lib" path="/_fwAndami/gvSIG/extensiones/com.iver.cit.gvsig/lib/org.cresques.cts.jar"/>
17
	<classpathentry kind="lib" path="/libFMap_dal/dist/org.gvsig.fmap.dal-impl.jar" sourcepath="/libFMap_dal"/>
18
	<classpathentry kind="lib" path="/libFMap_dal/dist/org.gvsig.fmap.dal.jar" sourcepath="/libFMap_dal"/>
19
	<classpathentry kind="lib" path="/libFMap_geometries/dist/org.gvsig.fmap.geometry.jar" sourcepath="/libFMap_geometries"/>
20
	<classpathentry kind="lib" path="/libMetadata/dist/org.gvsig.metadata.jar"/>
21
	<classpathentry kind="lib" path="/libFMap_mapcontext/dist/org.gvsig.fmap.mapcontext.jar" sourcepath="/libFMap_mapcontext"/>
22
	<classpathentry kind="lib" path="/libFMap_mapcontext/dist/org.gvsig.fmap.mapcontext.operation.jar"/>
23
	<classpathentry kind="lib" path="/libFMap_controls/dist/org.gvsig.fmap.control.jar" sourcepath="/libFMap_controls/src"/>
24
	<classpathentry kind="lib" path="/_fwAndami/lib/iver-utiles.jar" sourcepath="/libIverUtiles"/>
25
	<classpathentry kind="lib" path="/libFMap_geometries/dist/org.gvsig.fmap.geometry.operation.jar"/>
26
	<classpathentry kind="lib" path="/_fwAndami/gvSIG/extensiones/com.iver.cit.gvsig/lib/org.cresques.dxf.jar"/>
27
	<classpathentry kind="lib" path="/_fwAndami/lib/org.gvsig.tools.jar" sourcepath="/libTools"/>
28
	<classpathentry kind="lib" path="/_fwAndami/lib/gvsig-i18n.jar"/>
29
	<classpathentry kind="lib" path="lib/org.gvsig.geocoding.geocoding.jar" sourcepath="/libGeocoding"/>
30
	<classpathentry kind="lib" path="/_fwAndami/lib/slf4j-api-1.5.0.jar"/>
31
	<classpathentry kind="lib" path="/_fwAndami/lib/slf4j-log4j12-1.5.0.jar"/>
32
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_dal"/>
33
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_dalfile"/>
34
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_controls"/>
35
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_mapcontext"/>
36
	<classpathentry kind="output" path="bin"/>
5
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-anim/gvsig/batik-anim-gvsig.jar"/>
6
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-awt-util/gvsig/batik-awt-util-gvsig.jar"/>
7
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-bridge/gvsig/batik-bridge-gvsig.jar"/>
8
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-codec/gvsig/batik-codec-gvsig.jar"/>
9
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-css/gvsig/batik-css-gvsig.jar"/>
10
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-dom/gvsig/batik-dom-gvsig.jar"/>
11
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-ext/gvsig/batik-ext-gvsig.jar"/>
12
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-extension/gvsig/batik-extension-gvsig.jar"/>
13
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-gui-util/gvsig/batik-gui-util-gvsig.jar"/>
14
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-gvt/gvsig/batik-gvt-gvsig.jar"/>
15
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-parser/gvsig/batik-parser-gvsig.jar"/>
16
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-script/gvsig/batik-script-gvsig.jar"/>
17
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-svg-dom/gvsig/batik-svg-dom-gvsig.jar"/>
18
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-svggen/gvsig/batik-svggen-gvsig.jar"/>
19
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-swing/gvsig/batik-swing-gvsig.jar"/>
20
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-transcoder/gvsig/batik-transcoder-gvsig.jar"/>
21
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-util/gvsig/batik-util-gvsig.jar"/>
22
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-xml/gvsig/batik-xml-gvsig.jar"/>
23
	<classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar"/>
24
	<classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar"/>
25
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/castor/gvsig/castor-gvsig.jar"/>
26
	<classpathentry kind="var" path="M2_REPO/org/gvsig/com.iver.cit.gvsig/2.0-SNAPSHOT/com.iver.cit.gvsig-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/com.iver.cit.gvsig/2.0-SNAPSHOT/com.iver.cit.gvsig-2.0-SNAPSHOT-sources.jar"/>
27
	<classpathentry kind="var" path="M2_REPO/org/gvsig/com.iver.core/2.0-SNAPSHOT/com.iver.core-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/com.iver.core/2.0-SNAPSHOT/com.iver.core-2.0-SNAPSHOT-sources.jar"/>
28
	<classpathentry kind="var" path="M2_REPO/org/gvsig/com.iver.utiles/2.0-SNAPSHOT/com.iver.utiles-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/com.iver.utiles/2.0-SNAPSHOT/com.iver.utiles-2.0-SNAPSHOT-sources.jar">
29
		<attributes>
30
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/com.iver.utiles/2.0-SNAPSHOT/com.iver.utiles-2.0-SNAPSHOT-javadoc.jar!/"/>
31
		</attributes>
32
	</classpathentry>
33
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/geoapi/gvsig/geoapi-gvsig.jar"/>
34
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/geojava/gvsig/geojava-gvsig.jar"/>
35
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-legacy/gvsig/gt2-legacy-gvsig.jar"/>
36
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-main/gvsig/gt2-main-gvsig.jar"/>
37
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-postgis/gvsig/gt2-postgis-gvsig.jar"/>
38
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2sidx/gvsig/gt2sidx-gvsig.jar"/>
39
	<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">
40
		<attributes>
41
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/com/lowagie/itext/2.1.4/itext-2.1.4-javadoc.jar!/"/>
42
		</attributes>
43
	</classpathentry>
44
	<classpathentry kind="var" path="M2_REPO/javax/media/jai_codec/1.1.3/jai_codec-1.1.3.jar"/>
45
	<classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.3/jai_core-1.1.3.jar"/>
46
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/javaws/gvsig/javaws-gvsig.jar"/>
47
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jcalendar/gvsig/jcalendar-gvsig.jar"/>
48
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jcommon/gvsig/jcommon-gvsig.jar"/>
49
	<classpathentry kind="var" path="M2_REPO/jecw/jecw/0.0.5/jecw-0.0.5.jar"/>
50
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jfreechart/gvsig/jfreechart-gvsig.jar"/>
51
	<classpathentry kind="var" path="M2_REPO/jgdal/jgdal/0.9.1/jgdal-0.9.1.jar"/>
52
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jh/gvsig/jh-gvsig.jar"/>
53
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/JimiProClasses/gvsig/JimiProClasses-gvsig.jar"/>
54
	<classpathentry kind="var" path="M2_REPO/jmrsid/jmrsid/0.0.6/jmrsid-0.0.6.jar"/>
55
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jpedalSTD/gvsig/jpedalSTD-gvsig.jar"/>
56
	<classpathentry kind="var" path="M2_REPO/org/gvsig/jpotrace/0.0.1/jpotrace-0.0.1.jar"/>
57
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jts/gvsig/jts-gvsig.jar"/>
58
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/JUF/gvsig/JUF-gvsig.jar"/>
59
	<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"/>
60
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/JWizardComponent/gvsig/JWizardComponent-gvsig.jar"/>
61
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/kxml2/gvsig/kxml2-gvsig.jar"/>
62
	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
63
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/looks/gvsig/looks-gvsig.jar"/>
64
	<classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.3.2/lucene-core-2.3.2.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.3.2/lucene-core-2.3.2-sources.jar">
65
		<attributes>
66
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/apache/lucene/lucene-core/2.3.2/lucene-core-2.3.2-javadoc.jar!/"/>
67
		</attributes>
68
	</classpathentry>
69
	<classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-snowball/2.3.2/lucene-snowball-2.3.2.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-snowball/2.3.2/lucene-snowball-2.3.2-sources.jar">
70
		<attributes>
71
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/apache/lucene/lucene-snowball/2.3.2/lucene-snowball-2.3.2-javadoc.jar!/"/>
72
		</attributes>
73
	</classpathentry>
74
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.cresques.dxf/2.0-SNAPSHOT/org.cresques.dxf-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.cresques.dxf/2.0-SNAPSHOT/org.cresques.dxf-2.0-SNAPSHOT-sources.jar">
75
		<attributes>
76
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.cresques.dxf/2.0-SNAPSHOT/org.cresques.dxf-2.0-SNAPSHOT-javadoc.jar!/"/>
77
		</attributes>
78
	</classpathentry>
79
	<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"/>
80
	<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">
81
		<attributes>
82
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.compat/2.0-SNAPSHOT/org.gvsig.compat-2.0-SNAPSHOT-javadoc.jar!/"/>
83
		</attributes>
84
	</classpathentry>
85
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.compat/2.0-SNAPSHOT/org.gvsig.compat-2.0-SNAPSHOT-se.jar"/>
86
	<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"/>
87
	<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">
88
		<attributes>
89
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-javadoc.jar!/"/>
90
		</attributes>
91
	</classpathentry>
92
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-impl.jar"/>
93
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-spi.jar"/>
94
	<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">
95
		<attributes>
96
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-javadoc.jar!/"/>
97
		</attributes>
98
	</classpathentry>
99
	<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"/>
100
	<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"/>
101
	<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"/>
102
	<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"/>
103
	<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"/>
104
	<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"/>
105
	<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">
106
		<attributes>
107
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT-javadoc.jar!/"/>
108
		</attributes>
109
	</classpathentry>
110
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT-impl.jar"/>
111
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT-operation.jar"/>
112
	<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">
113
		<attributes>
114
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.fmap.mapcontext/2.0-SNAPSHOT/org.gvsig.fmap.mapcontext-2.0-SNAPSHOT-javadoc.jar!/"/>
115
		</attributes>
116
	</classpathentry>
117
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.mapcontext/2.0-SNAPSHOT/org.gvsig.fmap.mapcontext-2.0-SNAPSHOT-operation.jar"/>
118
	<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">
119
		<attributes>
120
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.i18n/2.0-SNAPSHOT/org.gvsig.i18n-2.0-SNAPSHOT-javadoc.jar!/"/>
121
		</attributes>
122
	</classpathentry>
123
	<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">
124
		<attributes>
125
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.metadata/2.0-SNAPSHOT/org.gvsig.metadata-2.0-SNAPSHOT-javadoc.jar!/"/>
126
		</attributes>
127
	</classpathentry>
128
	<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">
129
		<attributes>
130
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.projection/2.0-SNAPSHOT/org.gvsig.projection-2.0-SNAPSHOT-javadoc.jar!/"/>
131
		</attributes>
132
	</classpathentry>
133
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.projection/2.0-SNAPSHOT/org.gvsig.projection-2.0-SNAPSHOT-cresques-impl.jar"/>
134
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.projection/2.0-SNAPSHOT/org.gvsig.projection-2.0-SNAPSHOT-cresques-ui.jar"/>
135
	<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"/>
136
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.tools/2.0-SNAPSHOT/org.gvsig.tools-2.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.tools/2.0-SNAPSHOT/org.gvsig.tools-2.0-SNAPSHOT-sources.jar">
137
		<attributes>
138
			<attribute name="javadoc_location" value="jar:file:/C:/Documents%20and%20Settings/vsanjaime/.m2/repository/org/gvsig/org.gvsig.tools/2.0-SNAPSHOT/org.gvsig.tools-2.0-SNAPSHOT-javadoc.jar!/"/>
139
		</attributes>
140
	</classpathentry>
141
	<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"/>
142
	<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"/>
143
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/pdf-transcoder/gvsig/pdf-transcoder-gvsig.jar"/>
144
	<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"/>
145
	<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"/>
146
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/spatialindex/gvsig/spatialindex-gvsig.jar"/>
147
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/sqljep/gvsig/sqljep-gvsig.jar"/>
148
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/tempFileManager/gvsig/tempFileManager-gvsig.jar"/>
149
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/units/gvsig/units-gvsig.jar"/>
150
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/vecmath/gvsig/vecmath-gvsig.jar"/>
151
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xerces/gvsig/xerces-gvsig.jar"/>
152
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xml-apis/gvsig/xml-apis-gvsig.jar"/>
153
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xml-apis-ext/gvsig/xml-apis-ext-gvsig.jar"/>
154
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xmlrpc/gvsig/xmlrpc-gvsig.jar"/>
155
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/zql/gvsig/zql-gvsig.jar"/>
156
	<classpathentry combineaccessrules="false" kind="src" path="/libGeocoding"/>
157
	<classpathentry kind="output" path="target/classes"/>
37 158
</classpath>
branches/v2_0_0_prep/extensions/extGeocoding/.project
1
<?xml version="1.0" encoding="UTF-8"?>
2 1
<projectDescription>
3
	<name>extGeocoding</name>
4
	<comment></comment>
5
	<projects>
6
	</projects>
7
	<buildSpec>
8
		<buildCommand>
9
			<name>org.eclipse.jdt.core.javabuilder</name>
10
			<arguments>
11
			</arguments>
12
		</buildCommand>
13
	</buildSpec>
14
	<natures>
15
		<nature>org.eclipse.jdt.core.javanature</nature>
16
	</natures>
17
</projectDescription>
2
  <name>extGeocoding</name>
3
  <comment>TODO</comment>
4
  <projects/>
5
  <buildSpec>
6
    <buildCommand>
7
      <name>org.eclipse.jdt.core.javabuilder</name>
8
    </buildCommand>
9
  </buildSpec>
10
  <natures>
11
    <nature>org.eclipse.jdt.core.javanature</nature>
12
  </natures>
13
</projectDescription>
branches/v2_0_0_prep/extensions/extGeocoding/config/config.xml
1 1
<?xml version="1.0" encoding="ISO-8859-1"?>
2 2
<plugin-config>
3
	<libraries library-dir="."/>
3
	<libraries library-dir="lib"/>
4 4
	<depends plugin-name="com.iver.cit.gvsig"/>
5 5
		<resourceBundle name="text"/>
6 6
	<extensions>	
7 7

  

Also available in: Unified diff