Revision 28375

View differences:

branches/v2_0_0_prep/libraries/libGeocoding/.settings/org.eclipse.jdt.core.prefs
1
#Wed Apr 29 17:59:45 CEST 2009
1
#Sun May 03 09:31:59 CEST 2009
2 2
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
3 3
eclipse.preferences.version=1
4 4
org.eclipse.jdt.core.compiler.source=1.5
branches/v2_0_0_prep/libraries/libGeocoding/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2 1
<classpath>
3
	<classpathentry kind="src" path="src"/>
4
	<classpathentry kind="src" output="target/test-classes" path="src-test"/>
5
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-anim/gvsig/batik-anim-gvsig.jar"/>
7
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-awt-util/gvsig/batik-awt-util-gvsig.jar"/>
8
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-bridge/gvsig/batik-bridge-gvsig.jar"/>
9
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-codec/gvsig/batik-codec-gvsig.jar"/>
10
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-css/gvsig/batik-css-gvsig.jar"/>
11
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-dom/gvsig/batik-dom-gvsig.jar"/>
12
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-ext/gvsig/batik-ext-gvsig.jar"/>
13
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-extension/gvsig/batik-extension-gvsig.jar"/>
14
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-gui-util/gvsig/batik-gui-util-gvsig.jar"/>
15
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-gvt/gvsig/batik-gvt-gvsig.jar"/>
16
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-parser/gvsig/batik-parser-gvsig.jar"/>
17
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-script/gvsig/batik-script-gvsig.jar"/>
18
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-svg-dom/gvsig/batik-svg-dom-gvsig.jar"/>
19
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-svggen/gvsig/batik-svggen-gvsig.jar"/>
20
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-swing/gvsig/batik-swing-gvsig.jar"/>
21
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-transcoder/gvsig/batik-transcoder-gvsig.jar"/>
22
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-util/gvsig/batik-util-gvsig.jar"/>
23
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-xml/gvsig/batik-xml-gvsig.jar"/>
24
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/castor/gvsig/castor-gvsig.jar"/>
25
	<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">
26
		<attributes>
27
			<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!/"/>
28
		</attributes>
29
	</classpathentry>
30
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/geoapi/gvsig/geoapi-gvsig.jar"/>
31
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/geojava/gvsig/geojava-gvsig.jar"/>
32
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-legacy/gvsig/gt2-legacy-gvsig.jar"/>
33
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-main/gvsig/gt2-main-gvsig.jar"/>
34
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-postgis/gvsig/gt2-postgis-gvsig.jar"/>
35
	<classpathentry kind="var" path="M2_REPO/javax/media/jai_codec/1.1.3/jai_codec-1.1.3.jar"/>
36
	<classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.3/jai_core-1.1.3.jar"/>
37
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jts/gvsig/jts-gvsig.jar"/>
38
	<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"/>
39
	<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"/>
40
	<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">
41
		<attributes>
42
			<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!/"/>
43
		</attributes>
44
	</classpathentry>
45
	<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">
46
		<attributes>
47
			<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!/"/>
48
		</attributes>
49
	</classpathentry>
50
	<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">
51
		<attributes>
52
			<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!/"/>
53
		</attributes>
54
	</classpathentry>
55
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-impl.jar"/>
56
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.dal/2.0-SNAPSHOT/org.gvsig.fmap.dal-2.0-SNAPSHOT-spi.jar"/>
57
	<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"/>
58
	<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" sourcepath="/M2_REPO/org/gvsig/org.gvsig.fmap.dal.file/2.0-SNAPSHOT/org.gvsig.fmap.dal.file-2.0-SNAPSHOT-sources.jar"/>
59
	<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">
60
		<attributes>
61
			<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!/"/>
62
		</attributes>
63
	</classpathentry>
64
	<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">
65
		<attributes>
66
			<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!/"/>
67
		</attributes>
68
	</classpathentry>
69
	<classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.fmap.geometry/2.0-SNAPSHOT/org.gvsig.fmap.geometry-2.0-SNAPSHOT-operation.jar"/>
70
	<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">
71
		<attributes>
72
			<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!/"/>
73
		</attributes>
74
	</classpathentry>
75
	<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">
76
		<attributes>
77
			<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!/"/>
78
		</attributes>
79
	</classpathentry>
80
	<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">
81
		<attributes>
82
			<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!/"/>
83
		</attributes>
84
	</classpathentry>
85
	<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">
86
		<attributes>
87
			<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!/"/>
88
		</attributes>
89
	</classpathentry>
90
	<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">
91
		<attributes>
92
			<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!/"/>
93
		</attributes>
94
	</classpathentry>
95
	<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"/>
96
	<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"/>
97
	<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"/>
98
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/sqljep/gvsig/sqljep-gvsig.jar"/>
99
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/units/gvsig/units-gvsig.jar"/>
100
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/vecmath/gvsig/vecmath-gvsig.jar"/>
101
	<classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xerces/gvsig/xerces-gvsig.jar"/>
102
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_dal"/>
103
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_dalfile"/>
104
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap_mapcontext"/>
105
	<classpathentry combineaccessrules="false" kind="src" path="/libTools"/>
106
	<classpathentry kind="output" path="target/classes"/>
107
</classpath>
2
  <classpathentry kind="src" path="src-test" output="target/test-classes" including="**/*.java"/>
3
  <classpathentry kind="src" path="src" including="**/*.java"/>
4
  <classpathentry kind="output" path="target/classes"/>
5
  <classpathentry kind="var" path="M2_REPO/javax/media/jai_codec/1.1.3/jai_codec-1.1.3.jar"/>
6
  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.3/jai_core-1.1.3.jar"/>
7
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-anim/gvsig/batik-anim-gvsig.jar"/>
8
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-awt-util/gvsig/batik-awt-util-gvsig.jar"/>
9
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-bridge/gvsig/batik-bridge-gvsig.jar"/>
10
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-codec/gvsig/batik-codec-gvsig.jar"/>
11
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-css/gvsig/batik-css-gvsig.jar"/>
12
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-dom/gvsig/batik-dom-gvsig.jar"/>
13
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-ext/gvsig/batik-ext-gvsig.jar"/>
14
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-extension/gvsig/batik-extension-gvsig.jar"/>
15
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-gui-util/gvsig/batik-gui-util-gvsig.jar"/>
16
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-gvt/gvsig/batik-gvt-gvsig.jar"/>
17
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-parser/gvsig/batik-parser-gvsig.jar"/>
18
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-script/gvsig/batik-script-gvsig.jar"/>
19
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-svg-dom/gvsig/batik-svg-dom-gvsig.jar"/>
20
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-svggen/gvsig/batik-svggen-gvsig.jar"/>
21
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-swing/gvsig/batik-swing-gvsig.jar"/>
22
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-transcoder/gvsig/batik-transcoder-gvsig.jar"/>
23
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-util/gvsig/batik-util-gvsig.jar"/>
24
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-xml/gvsig/batik-xml-gvsig.jar"/>
25
  <classpathentry kind="var" path="M2_REPO/castor/castor/0.9.9.1/castor-0.9.9.1.jar"/>
26
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/castor/gvsig/castor-gvsig.jar"/>
27
  <classpathentry kind="src" path="/libIverUtiles"/>
28
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/geoapi/gvsig/geoapi-gvsig.jar"/>
29
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/geojava/gvsig/geojava-gvsig.jar"/>
30
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-legacy/gvsig/gt2-legacy-gvsig.jar"/>
31
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-main/gvsig/gt2-main-gvsig.jar"/>
32
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-postgis/gvsig/gt2-postgis-gvsig.jar"/>
33
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jts/gvsig/jts-gvsig.jar"/>
34
  <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"/>
35
  <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"/>
36
  <classpathentry kind="src" path="/libDXF"/>
37
  <classpathentry kind="src" path="/libCompat"/>
38
  <classpathentry kind="src" path="/libFMap_dal"/>
39
  <classpathentry kind="src" path="/libFMap_dalfile"/>
40
  <classpathentry kind="src" path="/libFMap_geometries"/>
41
  <classpathentry kind="src" path="/libFMap_mapcontext"/>
42
  <classpathentry kind="src" path="/libInternationalization"/>
43
  <classpathentry kind="src" path="/libMetadata"/>
44
  <classpathentry kind="src" path="/libProjection"/>
45
  <classpathentry kind="src" path="/libTools"/>
46
  <classpathentry kind="src" path="/libEvaluator_SQLJEP"/>
47
  <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"/>
48
  <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"/>
49
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/sqljep/gvsig/sqljep-gvsig.jar"/>
50
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/units/gvsig/units-gvsig.jar"/>
51
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/vecmath/gvsig/vecmath-gvsig.jar"/>
52
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xerces/gvsig/xerces-gvsig.jar"/>
53
  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
54
</classpath>
branches/v2_0_0_prep/libraries/libGeocoding/.project
1 1
<projectDescription>
2 2
  <name>org.gvsig.geocoding</name>
3 3
  <comment>TODO</comment>
4
  <projects/>
4
  <projects>
5
    <project>libIverUtiles</project>
6
    <project>libDXF</project>
7
    <project>libCompat</project>
8
    <project>libFMap_dal</project>
9
    <project>libFMap_dalfile</project>
10
    <project>libFMap_geometries</project>
11
    <project>libFMap_mapcontext</project>
12
    <project>libInternationalization</project>
13
    <project>libMetadata</project>
14
    <project>libProjection</project>
15
    <project>libTools</project>
16
    <project>libEvaluator_SQLJEP</project>
17
  </projects>
5 18
  <buildSpec>
6 19
    <buildCommand>
7 20
      <name>org.eclipse.jdt.core.javabuilder</name>
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/persistence/TestPersistence.java
27 27

  
28 28
package org.gvsig.geocoding.persistence;
29 29

  
30
import java.io.BufferedWriter;
31 30
import java.io.File;
32
import java.io.FileOutputStream;
31
import java.io.FileReader;
32
import java.io.FileWriter;
33 33
import java.io.IOException;
34
import java.io.OutputStreamWriter;
34
import java.io.Reader;
35
import java.io.Writer;
35 36

  
36 37
import junit.framework.TestCase;
37 38

  
39
import org.cresques.ProjectionLibrary;
40
import org.cresques.impl.CresquesCtsLibrary;
38 41
import org.gvsig.fmap.dal.DALFileLibrary;
39 42
import org.gvsig.fmap.dal.DALLibrary;
40 43
import org.gvsig.fmap.dal.DALLocator;
41 44
import org.gvsig.fmap.dal.DataManager;
45
import org.gvsig.fmap.dal.DataStore;
42 46
import org.gvsig.fmap.dal.exception.DataException;
43 47
import org.gvsig.fmap.dal.feature.FeatureStore;
44 48
import org.gvsig.fmap.dal.feature.FeatureType;
45 49
import org.gvsig.fmap.dal.store.shp.SHPLibrary;
46 50
import org.gvsig.fmap.dal.store.shp.SHPStoreParameters;
47 51
import org.gvsig.fmap.dal.store.shp.SHPStoreProvider;
52
import org.gvsig.fmap.geom.impl.DefaultGeometryLibrary;
48 53
import org.gvsig.geocoding.address.Literal;
49 54
import org.gvsig.geocoding.address.impl.DefaultLiteral;
50 55
import org.gvsig.geocoding.address.impl.DefaultRelationsComponent;
......
77 82
			.getLogger(TestPersistence.class);
78 83

  
79 84
	private DataManager dataManager = null;
80
	private FeatureStore streetsStore = null;
85
	private DataStore streetsStore = null;
81 86

  
82 87
	private Patterngeocoding pat = null;
83 88

  
......
87 92
	public TestPersistence() {
88 93

  
89 94
		try {
90
			Library tools = new ToolsLibrary();
91
			tools.initialize();
95

  
96
			DefaultGeometryLibrary defGeomLib = new DefaultGeometryLibrary();
97
			defGeomLib.initialize();
98
			defGeomLib.postInitialize();
99

  
100
			ToolsLibrary tools = new ToolsLibrary();
101
			tools.initialize();			
102
			ToolsLocator.registerPersistenceManager(org.exolab.castor.xml.Marshaller.class);
92 103
			tools.postInitialize();
93 104

  
94 105
			Library dlib = new DALLibrary();
......
103 114
			shpLib.initialize();
104 115
			shpLib.postInitialize();
105 116

  
117
			Library proj = new CresquesCtsLibrary();
118
			proj.initialize();
119
			proj.postInitialize();
120

  
106 121
		} catch (Exception e) {
107 122
			e.printStackTrace();
108 123
		}
......
116 131
			SHPStoreParameters strParam = (SHPStoreParameters) dataManager
117 132
					.createStoreParameters(SHPStoreProvider.NAME);
118 133
			strParam.setFile(streets);
119
			streetsStore = (FeatureStore) dataManager.createStore(strParam);
134
			strParam.setSRSID("EPSG:23030");
135
			streetsStore = dataManager.createStore(strParam);
120 136
			assertNotNull(streetsStore);
121 137

  
122 138
		} catch (Exception e) {
......
151 167
	 */
152 168
	public void testPersistPattern() throws IOException, PersistenceException {
153 169

  
170
		
154 171
		File file = new File("c:/pat.xml");
155 172
		// File file = File.createTempFile("pat", "xml");
156

  
173
		
157 174
		PersistenceManager manager = ToolsLocator.getPersistenceManager();
158
		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
159
				new FileOutputStream(file), "Cp1252"));
160
		writer.write("<?xml version=\"1.0\" encoding=\"Cp1252\"?>\n");
175
		Writer writer = new FileWriter(file);
161 176
		PersistentState state = manager.getState(pat);
162 177
		state.save(writer);
163 178
		writer.close();
179
		
164 180
	}
165 181

  
166 182
	/**
......
182 198
			source.setLayerSource(streetsStore);
183 199

  
184 200
			AbstractGeocodingStyle style = new SimpleCentroid();
185
			FeatureType ftype = streetsStore.getDefaultFeatureType();
201
			FeatureType ftype = ((FeatureStore) streetsStore)
202
					.getDefaultFeatureType();
186 203
			Literal relations = new DefaultLiteral();
187
			relations.add(new DefaultRelationsComponent("Calle", ftype
188
					.getAttributeDescriptor("STREET_NAM")));
204
			relations.add(new DefaultRelationsComponent("Calle","STREET_NAM"));
189 205

  
190 206
			style.setRelationsLiteral(relations);
191 207
			source.setStyle(style);
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/SimpleRangeTest.java
169 169
			source.setLayerSource(store);
170 170

  
171 171
			AbstractGeocodingStyle style = new SimpleRange();
172
			FeatureType ftype = store.getDefaultFeatureType();
173 172
			DefaultLiteral relations = new DefaultLiteral();
174
			relations.add(new DefaultRelationsComponent("Calle", ftype
175
					.getAttributeDescriptor("STREET_NAM")));
176
			relations.add(new DefaultRelationsComponent("TipoVia", ftype
177
					.getAttributeDescriptor("STREET_TYP")));
178
			relations.add(new DefaultRelationsComponent("Municipio", ftype
179
					.getAttributeDescriptor("MUNI")));
180
			relations.add(new DefaultRelationsComponent("Provincia", ftype
181
					.getAttributeDescriptor("PROV")));
182
			relations.add(new DefaultRelationsComponent("Pais", ftype
183
					.getAttributeDescriptor("PAIS")));
173
			relations.add(new DefaultRelationsComponent("Calle","STREET_NAM"));
174
			relations.add(new DefaultRelationsComponent("TipoVia","STREET_TYP"));
175
			relations.add(new DefaultRelationsComponent("Municipio","MUNI"));
176
			relations.add(new DefaultRelationsComponent("Provincia","PROV"));
177
			relations.add(new DefaultRelationsComponent("Pais","PAIS"));
184 178

  
185 179
			style.setRelationsLiteral(relations);
186 180
			source.setStyle(style);
187 181

  
188
			RelationsComponent from = new DefaultRelationsComponent("NParFrom", ftype
189
					.getAttributeDescriptor("RF_ADD"));
182
			RelationsComponent from = new DefaultRelationsComponent("NParFrom","RF_ADD");
190 183
			;
191 184
			((SimpleRange) style).setFirstNumber(from);
192 185

  
193
			RelationsComponent to = new DefaultRelationsComponent("NParTo", ftype
194
					.getAttributeDescriptor("RT_ADD"));
186
			RelationsComponent to = new DefaultRelationsComponent("NParTo","RT_ADD");
195 187
			((SimpleRange) style).setLastNumber(to);
196 188

  
197 189
			pat.setSource(source);
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/DoubleRangeTest.java
166 166
			AbstractGeocodingStyle style = new DoubleRange();
167 167
			FeatureType ftype = store.getDefaultFeatureType();
168 168
			Literal relations = new DefaultLiteral();
169
			relations.add(new DefaultRelationsComponent("Calle", ftype
170
					.getAttributeDescriptor("STREET_NAM")));
171
			relations.add(new DefaultRelationsComponent("TipoVia", ftype
172
					.getAttributeDescriptor("STREET_TYP")));
173
			relations.add(new DefaultRelationsComponent("Municipio", ftype
174
					.getAttributeDescriptor("MUNI")));
175
			relations.add(new DefaultRelationsComponent("Provincia", ftype
176
					.getAttributeDescriptor("PROV")));
177
			relations.add(new DefaultRelationsComponent("Pais", ftype
178
					.getAttributeDescriptor("PAIS")));
169
			relations.add(new DefaultRelationsComponent("Calle","STREET_NAM"));
170
			relations.add(new DefaultRelationsComponent("TipoVia","STREET_TYP"));
171
			relations.add(new DefaultRelationsComponent("Municipio","MUNI"));
172
			relations.add(new DefaultRelationsComponent("Provincia","PROV"));
173
			relations.add(new DefaultRelationsComponent("Pais","PAIS"));
179 174

  
180 175
			style.setRelationsLiteral(relations);
181 176
			source.setStyle(style);
182 177

  
183 178
			DefaultRelationsComponent rfrom = new DefaultRelationsComponent(
184
					"NParFrom", ftype.getAttributeDescriptor("RF_ADD"));
179
					"NParFrom","RF_ADD");
185 180
			;
186 181
			((DoubleRange) style).setFirstRightNumber(rfrom);
187 182

  
188 183
			DefaultRelationsComponent rto = new DefaultRelationsComponent(
189
					"NParTo", ftype.getAttributeDescriptor("RT_ADD"));
184
					"NParTo","RT_ADD");
190 185
			((DoubleRange) style).setLastRightNumber(rto);
191 186

  
192 187
			DefaultRelationsComponent lfrom = new DefaultRelationsComponent(
193
					"NImparFrom", ftype.getAttributeDescriptor("LF_ADD"));
188
					"NImparFrom","LF_ADD");
194 189
			;
195 190
			((DoubleRange) style).setFirstLeftNumber(lfrom);
196 191
			DefaultRelationsComponent lto = new DefaultRelationsComponent(
197
					"NImparTo", ftype.getAttributeDescriptor("LT_ADD"));
192
					"NImparTo","LT_ADD");
198 193
			((DoubleRange) style).setLastLeftNumber(lto);
199 194

  
200 195
			pat.setSource(source);
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/GeocoderTest.java
172 172
			source.setLayerSource(store);
173 173

  
174 174
			AbstractGeocodingStyle style = new SimpleCentroid();
175
			FeatureType ftype = store.getDefaultFeatureType();
176 175
			Literal relations = new DefaultLiteral();
177
			relations.add(new DefaultRelationsComponent("via", ftype
178
					.getAttributeDescriptor("STREET_TYP")));
179
			relations.add(new DefaultRelationsComponent("calle", ftype
180
					.getAttributeDescriptor("STREET_NAM")));
181
			relations.add(new DefaultRelationsComponent("nparfrom", ftype
182
					.getAttributeDescriptor("RF_ADD")));
183
			relations.add(new DefaultRelationsComponent("nparto", ftype
184
					.getAttributeDescriptor("RT_ADD")));
185
			relations.add(new DefaultRelationsComponent("nimparfrom", ftype
186
					.getAttributeDescriptor("LF_ADD")));
187
			relations.add(new DefaultRelationsComponent("nimparto", ftype
188
					.getAttributeDescriptor("LT_ADD")));
176
			relations.add(new DefaultRelationsComponent("via","STREET_TYP"));
177
			relations.add(new DefaultRelationsComponent("calle","STREET_NAM"));
178
			relations.add(new DefaultRelationsComponent("nparfrom","RF_ADD"));
179
			relations.add(new DefaultRelationsComponent("nparto","RT_ADD"));
180
			relations.add(new DefaultRelationsComponent("nimparfrom","LF_ADD"));
181
			relations.add(new DefaultRelationsComponent("nimparto","LT_ADD"));
189 182

  
190 183
			style.setRelationsLiteral(relations);
191 184
			source.setStyle(style);
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/massive/TestMassiveGeocoding.java
343 343
			AbstractGeocodingStyle style = new SimpleCentroid();
344 344
			FeatureType ftype = streetsStore.getDefaultFeatureType();
345 345
			Literal relations = new DefaultLiteral();
346
			relations.add(new DefaultRelationsComponent("Calle", ftype
347
					.getAttributeDescriptor("STREET_NAM")));
346
			relations.add(new DefaultRelationsComponent("Calle","STREET_NAM"));
348 347

  
349 348
			style.setRelationsLiteral(relations);
350 349
			source.setStyle(style);
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/ComposedTest.java
202 202
			AbstractGeocodingStyle style = new Composed();
203 203
			FeatureType ftype = store.getDefaultFeatureType();
204 204
			Literal relations = new DefaultLiteral();
205
			relations.add(new DefaultRelationsComponent("Calle", ftype
206
					.getAttributeDescriptor("STREET_NAM")));
207
			relations.add(new DefaultRelationsComponent("TipoVia", ftype
208
					.getAttributeDescriptor("STREET_TYP")));
209
			relations.add(new DefaultRelationsComponent("Municipio", ftype
210
					.getAttributeDescriptor("MUNI")));
211
			relations.add(new DefaultRelationsComponent("Provincia", ftype
212
					.getAttributeDescriptor("PROV")));
213
			relations.add(new DefaultRelationsComponent("Pais", ftype
214
					.getAttributeDescriptor("PAIS")));
205
			relations.add(new DefaultRelationsComponent("Calle", "STREET_NAM"));
206
			relations.add(new DefaultRelationsComponent("TipoVia","STREET_TYP"));
207
			relations.add(new DefaultRelationsComponent("Municipio","MUNI"));
208
			relations.add(new DefaultRelationsComponent("Provincia","PROV"));
209
			relations.add(new DefaultRelationsComponent("Pais","PAIS"));
215 210

  
216 211
			style.setRelationsLiteral(relations);
217 212
			source.setStyle(style);
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/geomatches/TestMatcherUtils.java
227 227
			listFeats.add(sFeat);
228 228
		}
229 229
		// group by attribute
230
		FeatureAttributeDescriptor field = sLinesStore.getDefaultFeatureType()
231
				.getAttributeDescriptor("Campo1");
232 230
		HashMap<String, List<ScoredFeature>> dissolAttributes = MatcherUtils
233
				.groupScoredFeaturesByAttribute(field, listFeats);
231
				.groupScoredFeaturesByAttribute("Campo1", listFeats);
234 232

  
235 233
		// For each group of features, to do geometries dissolve process getting
236 234
		// at the end one o more geometries
......
272 270
			sFeat.setScore(Math.random());
273 271
			listFeats.add(sFeat);
274 272
		}
275
		// group by attribute
276
		FeatureAttributeDescriptor field = provStore.getDefaultFeatureType()
277
				.getAttributeDescriptor("COM");
273
		// group by attribute		
278 274
		HashMap<String, List<ScoredFeature>> dissolAttributes = MatcherUtils
279
				.groupScoredFeaturesByAttribute(field, listFeats);
275
				.groupScoredFeaturesByAttribute("COM", listFeats);
280 276

  
281 277
		// For each group of features, to do geometries dissolve process getting
282 278
		// at the end one o more geometries
branches/v2_0_0_prep/libraries/libGeocoding/src-test/org/gvsig/geocoding/SimpleCentroidTest.java
238 238
			source.setLayerSource(store);
239 239

  
240 240
			AbstractGeocodingStyle style = new SimpleCentroid();
241
			FeatureType ftype = store.getDefaultFeatureType();
242 241
			Literal relations = new DefaultLiteral();
243
			relations.add(new DefaultRelationsComponent("Provincia", ftype
244
					.getAttributeDescriptor("NOMBRE99")));
245
			relations.add(new DefaultRelationsComponent("Pais", ftype
246
					.getAttributeDescriptor("PAIS")));
242
			relations.add(new DefaultRelationsComponent("Provincia","NOMBRE99"));
243
			relations.add(new DefaultRelationsComponent("Pais","PAIS"));
247 244

  
248 245
			style.setRelationsLiteral(relations);
249 246
			source.setStyle(style);
......
282 279
			source.setLayerSource(store);
283 280

  
284 281
			AbstractGeocodingStyle style = new SimpleCentroid();
285
			FeatureType ftype = store.getDefaultFeatureType();
286 282
			Literal relations = new DefaultLiteral();
287
			relations.add(new DefaultRelationsComponent("Calle", ftype
288
					.getAttributeDescriptor("STREET_NAM")));
289
			relations.add(new DefaultRelationsComponent("TipoVia", ftype
290
					.getAttributeDescriptor("STREET_TYP")));
291
			relations.add(new DefaultRelationsComponent("Municipio", ftype
292
					.getAttributeDescriptor("MUNI")));
293
			relations.add(new DefaultRelationsComponent("Provincia", ftype
294
					.getAttributeDescriptor("PROV")));
295
			relations.add(new DefaultRelationsComponent("Pais", ftype
296
					.getAttributeDescriptor("PAIS")));
283
			relations.add(new DefaultRelationsComponent("Calle","STREET_NAM"));
284
			relations.add(new DefaultRelationsComponent("TipoVia","STREET_TYP"));
285
			relations.add(new DefaultRelationsComponent("Municipio","MUNI"));
286
			relations.add(new DefaultRelationsComponent("Provincia","PROV"));
287
			relations.add(new DefaultRelationsComponent("Pais","PAIS"));
297 288

  
298 289
			style.setRelationsLiteral(relations);
299 290
			source.setStyle(style);
......
334 325
			AbstractGeocodingStyle style = new SimpleCentroid();
335 326
			FeatureType ftype = store.getDefaultFeatureType();
336 327
			DefaultLiteral relations = new DefaultLiteral();
337
			relations.add(new DefaultRelationsComponent("Provincia", ftype
338
					.getAttributeDescriptor("NOMBRE99")));
339
			relations.add(new DefaultRelationsComponent("Pais", ftype
340
					.getAttributeDescriptor("PAIS")));
328
			relations.add(new DefaultRelationsComponent("Provincia", "NOMBRE99"));
329
			relations.add(new DefaultRelationsComponent("Pais","PAIS"));
341 330

  
342 331
			style.setRelationsLiteral(relations);
343 332
			source.setStyle(style);
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/impl/DataGeocoderImpl.java
35 35

  
36 36
import org.gvsig.fmap.dal.DALLocator;
37 37
import org.gvsig.fmap.dal.DataManager;
38
import org.gvsig.fmap.dal.DataStore;
38 39
import org.gvsig.fmap.dal.exception.DataException;
39 40
import org.gvsig.fmap.dal.feature.Feature;
40
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
41 41
import org.gvsig.fmap.dal.feature.FeatureQuery;
42 42
import org.gvsig.fmap.dal.feature.FeatureSelection;
43 43
import org.gvsig.fmap.dal.feature.FeatureSet;
......
76 76
	private Patterngeocoding pattern = null;
77 77
	private DataManager manager = null;
78 78

  
79
	
80
	
81 79
	/**
82 80
	 * Constructor with one pattern
83 81
	 * 
......
86 84
	public DataGeocoderImpl() {
87 85
		manager = DALLocator.getDataManager();
88 86
	}
89
	
87

  
90 88
	/**
91 89
	 * Constructor with one pattern
92 90
	 * 
......
128 126

  
129 127
		Set<GeocodingResult> results = new TreeSet<GeocodingResult>();
130 128
		// get the FeatureStore registred in the pattern
131
		FeatureStore store = getPattern().getSource().getLayerSource();
129
		DataStore store = getPattern().getSource().getLayerSource();
132 130
		// get the style
133 131
		AbstractGeocodingStyle astyle = getPattern().getSource().getStyle();
134 132
		// get literal with relations with the store
......
207 205
	 * @throws DataException
208 206
	 */
209 207
	private List<ScoredFeature> literalSearch(Literal relationsLiteral,
210
			Literal addressLiteral, FeatureStore store) throws DataException {
208
			Literal addressLiteral, DataStore store) throws DataException {
211 209

  
212 210
		List<FeatureSelection> sels = new ArrayList<FeatureSelection>();
213 211
		FeatureSet features = null;
......
218 216
		// search features related with the parameters
219 217
		for (Object obj : relationsLiteral) {
220 218
			RelationsComponent lit = (RelationsComponent) obj;
221
			FeatureSelection selection = store.createFeatureSelection();
222
			FeatureQuery query = store.createFeatureQuery();
219
			FeatureSelection selection = ((FeatureStore) store)
220
					.createFeatureSelection();
221
			FeatureQuery query = ((FeatureStore) store).createFeatureQuery();
223 222
			String key = lit.getKeyElement().trim();
224 223
			String chain = getValueAddress(key, addressLiteral);
225 224

  
226
			FeatureAttributeDescriptor field = lit.getValue();
225
			String fname = lit.getValue();
227 226
			if (i == 0) {
228
				exp = field.getName() + " like '%" + chain + "%'";
227
				exp = fname + " like '%" + chain + "%'";
229 228
			} else {
230
				exp = exp + " AND " + field.getName() + " like '%" + chain
231
						+ "%'";
229
				exp = exp + " AND " + fname + " like '%" + chain + "%'";
232 230
			}
233 231

  
234 232
			Evaluator eval = manager.createExpresion(exp);
235 233

  
236 234
			query.setFilter(eval);
237
			features = store.getFeatureSet(query);
235
			features = ((FeatureStore) store).getFeatureSet(query);
238 236
			selection.select(features);
239 237
			sels.add(selection);
240 238
			log.debug("Iteration " + i + " - Selection : "
......
256 254
	 * @throws DataException
257 255
	 */
258 256
	@SuppressWarnings("unchecked")
259
	private List<ScoredFeature> createLiteralScores(FeatureStore store,
257
	private List<ScoredFeature> createLiteralScores(DataStore store,
260 258
			List<FeatureSelection> sels) throws DataException {
261 259

  
262 260
		List<ScoredFeature> scores = new ArrayList<ScoredFeature>();
263 261

  
264
		FeatureSet features = store.getFeatureSet();
262
		FeatureSet features = ((FeatureStore) store).getFeatureSet();
265 263

  
266 264
		for (Iterator<Feature> it = features.iterator(); it.hasNext();) {
267 265
			Feature feature = it.next();
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/impl/DefaultGeocodingLibrary.java
32 32
import org.gvsig.tools.locator.ReferenceNotRegisteredException;
33 33

  
34 34
/**
35
 * Geocoding library
35
 * Default Geocoding library
36 36
 * 
37 37
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
38 38
 * @author <a href="mailto:vsanjaime@prodevelop.es"> Vicente Sanjaime Calvet</a>
......
45 45
	 */
46 46
	public void initialize() throws ReferenceNotRegisteredException {
47 47
		super.initialize();
48
		GeocodingLocator.registerGeocoder(DataGeocoderImpl.class);
49
		String[] names = GeocodingLocator.getInstance().getNames();
50
		for (int i = 0; i < names.length; i++) {
51
			System.out.println("Implementacion registrada: "+names[i]);
52
		}		
48
		GeocodingLocator.registerGeocoder(DataGeocoderImpl.class);			
53 49
	}
54 50

  
55 51
}
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/GeocodingLocator.java
40 40
public class GeocodingLocator extends AbstractLocator {
41 41

  
42 42
	private static final String LOCATOR_NAME = "GeocodingLocator";
43
	public static final String GEOCODER_NAME = "Geocoder"; 
43
	public static final String GEOCODER_NAME = "Geocoder"; 	
44 44

  
45
	
46

  
47 45
	/**
48 46
	 * Unique instance.
49 47
	 */
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/GeocodingLibrary.java
52 52
		super.postInitialize();
53 53

  
54 54
		// Validate if there are any implementation registered
55

  
56 55
		Geocoder geocoder = GeocodingLocator.getGeocoder();
57 56
		if (geocoder == null) {
58 57
			throw new ReferenceNotRegisteredException(
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/styles/impl/Composed.java
33 33
import java.util.TreeSet;
34 34

  
35 35
import org.gvsig.fmap.dal.exception.DataException;
36
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
37 36
import org.gvsig.fmap.geom.primitive.Point;
38 37
import org.gvsig.fmap.geom.util.Converter;
39 38
import org.gvsig.geocoding.address.Address;
......
54 53
import org.slf4j.LoggerFactory;
55 54

  
56 55
/**
57
 * Geocoding style with a address composed. This style can geocode a cross of
58
 * streets and the street result of the intersection between two parallel
59
 * streets.
56
 * Implemented Geocoding style with a address composed. This style can geocode a
57
 * cross of streets and the street result of the intersection between two
58
 * parallel streets.
60 59
 * 
61 60
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
62 61
 * @author <a href="mailto:vsanjaime@prodevelop.es"> Vicente Sanjaime Calvet</a>
......
223 222
		for (Object obj : relLiteral) {
224 223
			RelationsComponent rel = (RelationsComponent) obj;
225 224
			String key = rel.getKeyElement();
226
			FeatureAttributeDescriptor desc = rel.getValue();
227
			String fieldName = desc.getName();
225
			String fieldName = rel.getValue();
228 226
			Object object = null;
229 227
			String value = "";
230 228
			try {
......
239 237
		for (Object obj : relLiteral) {
240 238
			RelationsComponent rel = (RelationsComponent) obj;
241 239
			String key = rel.getKeyElement();
242
			FeatureAttributeDescriptor desc = rel.getValue();
243
			String fieldName = desc.getName();
240
			String fieldName = rel.getValue();
244 241
			Object object = null;
245 242
			String value = "";
246 243
			try {
......
263 260
			for (Object obj : relLiteral) {
264 261
				RelationsComponent rel = (RelationsComponent) obj;
265 262
				String key = rel.getKeyElement();
266
				FeatureAttributeDescriptor desc = rel.getValue();
267
				String fieldName = desc.getName();
263
				String fieldName = rel.getValue();
268 264
				Object object = null;
269 265
				String value = "";
270 266
				try {
......
289 285
	 * @param state
290 286
	 */
291 287
	public void saveToState(PersistentState state) throws PersistenceException {
288
		super.saveToState(state);
292 289
		state.set(INTERSECTLITERALS, this.intersectsLiterals.iterator());
293 290
	}
294 291

  
......
298 295
	 * @param state
299 296
	 */
300 297
	public void setState(PersistentState state) throws PersistenceException {
298
		super.setState(state);
301 299
		this.intersectsLiterals = (List<Literal>) state.get(INTERSECTLITERALS);
302 300
	}
303 301

  
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/styles/impl/SimpleCentroid.java
36 36
import java.util.TreeSet;
37 37

  
38 38
import org.gvsig.fmap.dal.exception.DataException;
39
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
40 39
import org.gvsig.fmap.geom.Geometry;
41 40
import org.gvsig.fmap.geom.primitive.Point;
42 41
import org.gvsig.fmap.geom.util.Converter;
......
58 57
import org.slf4j.LoggerFactory;
59 58

  
60 59
/**
61
 * Geocoding style with search by centroid. Search of the centroid of points,
60
 * Implemented Geocoding style with search by centroid. Search of the centroid of points,
62 61
 * lines or polygons geometries.
63 62
 * 
64 63
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
......
89 88
		// to make the dissolve process
90 89
		RelationsComponent rComp0 = (RelationsComponent) this
91 90
				.getRelationsLiteral().get(0);
92
		FeatureAttributeDescriptor descriptDissol = (FeatureAttributeDescriptor) rComp0
93
				.getValue();
91
		String descriptDissol = rComp0.getValue();
94 92

  
95 93
		// Get the first list
96 94
		List<ScoredFeature> firstListFeatures = inLists.get(0);
......
153 151
	 * @return list with dissolved features
154 152
	 * @throws DataException
155 153
	 */
156
	private List<DissolveResult> dissolveScoredFeatures(
157
			FeatureAttributeDescriptor field, List<ScoredFeature> features)
158
			throws DataException {
154
	private List<DissolveResult> dissolveScoredFeatures(String field,
155
			List<ScoredFeature> features) throws DataException {
159 156

  
160 157
		List<DissolveResult> listResults = new ArrayList<DissolveResult>();
161 158

  
......
211 208
		for (Object obj : relLiteral) {
212 209
			RelationsComponent rel = (RelationsComponent) obj;
213 210
			String key = rel.getKeyElement();
214
			FeatureAttributeDescriptor desc = rel.getValue();
215
			String fieldName = desc.getName();
211
			String fieldName = rel.getValue();
216 212
			Object object = null;
217 213
			String value = "";
218 214
			try {
......
265 261
	 * @param state
266 262
	 */
267 263
	public void saveToState(PersistentState state) throws PersistenceException {
268

  
264
		super.saveToState(state);
269 265
	}
270 266

  
271 267
	/**
......
274 270
	 * @param state
275 271
	 */
276 272
	public void setState(PersistentState state) throws PersistenceException {
277

  
273
		super.setState(state);
278 274
	}
279 275
}
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/styles/impl/SimpleRange.java
34 34

  
35 35
import org.gvsig.fmap.dal.exception.DataException;
36 36
import org.gvsig.fmap.dal.feature.Feature;
37
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
38 37
import org.gvsig.fmap.geom.Geometry;
39 38
import org.gvsig.fmap.geom.primitive.Point;
40 39
import org.gvsig.fmap.geom.util.Converter;
......
55 54
import org.slf4j.LoggerFactory;
56 55

  
57 56
/**
58
 * Geocoding style with search by numerical range. This style geocodes streets
57
 * Implemented Geocoding style with search by numerical range. This style geocodes streets
59 58
 * with even numbers and odd numbers followed.
60 59
 * 
61 60
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
......
126 125
			Address address) {
127 126
		Set<GeocodingResult> results = new TreeSet<GeocodingResult>();
128 127

  
129
		FeatureAttributeDescriptor firstNumberDesc = this.getFirstNumber()
130
				.getValue();
131
		FeatureAttributeDescriptor lastNumberDesc = this.getLastNumber()
132
				.getValue();
128
		String firstNumberDesc = this.getFirstNumber().getValue();
129
		String lastNumberDesc = this.getLastNumber().getValue();
133 130

  
134 131
		// Get the list
135 132
		List<ScoredFeature> sFeats = inLists.get(0);
......
221 218
	 * @param feat
222 219
	 * @return
223 220
	 */
224
	private int[] getNumberRange(Feature feat,
225
			FeatureAttributeDescriptor firstNumberDesc,
226
			FeatureAttributeDescriptor lastNumberDesc) {
221
	private int[] getNumberRange(Feature feat, String firstNumberDesc,
222
			String lastNumberDesc) {
227 223

  
228 224
		int[] range = new int[2];
229 225

  
230
		Object oFirst = feat.get(firstNumberDesc.getName());
231
		Object oLast = feat.get(lastNumberDesc.getName());
226
		Object oFirst = feat.get(firstNumberDesc);
227
		Object oLast = feat.get(lastNumberDesc);
232 228

  
233 229
		// FIRST
234 230
		if (oFirst instanceof Double) {
......
269 265
		for (Object obj : relLiteral) {
270 266
			RelationsComponent rel = (RelationsComponent) obj;
271 267
			String key = rel.getKeyElement();
272
			FeatureAttributeDescriptor desc = rel.getValue();
273
			String fieldName = desc.getName();
268
			String fieldName = rel.getValue();
274 269
			Object object = null;
275 270
			String value = "";
276 271
			try {
......
295 290
	 * @param state
296 291
	 */
297 292
	public void saveToState(PersistentState state) throws PersistenceException {
293
		super.saveToState(state);
298 294
		state.set(FIRSTNUMBER, this.firstNumber);
299 295
		state.set(LASTNUMBER, this.lastNumber);
300 296
	}
......
305 301
	 * @param state
306 302
	 */
307 303
	public void setState(PersistentState state) throws PersistenceException {
304
		super.setState(state);
308 305
		this.firstNumber = (RelationsComponent) state.get(FIRSTNUMBER);
309 306
		this.lastNumber = (RelationsComponent) state.get(LASTNUMBER);
310 307
	}
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/styles/impl/DoubleRange.java
34 34

  
35 35
import org.gvsig.fmap.dal.exception.DataException;
36 36
import org.gvsig.fmap.dal.feature.Feature;
37
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
38 37
import org.gvsig.fmap.geom.Geometry;
39 38
import org.gvsig.fmap.geom.primitive.Point;
40 39
import org.gvsig.fmap.geom.util.Converter;
......
55 54
import org.slf4j.LoggerFactory;
56 55

  
57 56
/**
58
 * Geocoding style with search by numerical range. This style geocodes streets
57
 * Implemented Geocoding style with search by numerical range. This style geocodes streets
59 58
 * with even numbers on one side of the street and odd numbers on other side.
60 59
 * 
61 60
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
......
171 170

  
172 171
		Set<GeocodingResult> results = new TreeSet<GeocodingResult>();
173 172

  
174
		FeatureAttributeDescriptor firstLeftNumberDesc = this
175
				.getFirstLeftNumber().getValue();
176
		FeatureAttributeDescriptor lastLeftNumberDesc = this
177
				.getLastLeftNumber().getValue();
178
		FeatureAttributeDescriptor firstRightNumberDesc = this
179
				.getFirstRightNumber().getValue();
180
		FeatureAttributeDescriptor lastRightNumberDesc = this
181
				.getLastRightNumber().getValue();
173
		String firstLeftNumberDesc = this.getFirstLeftNumber().getValue();
174
		String lastLeftNumberDesc = this.getLastLeftNumber().getValue();
175
		String firstRightNumberDesc = this.getFirstRightNumber().getValue();
176
		String lastRightNumberDesc = this.getLastRightNumber().getValue();
182 177

  
183 178
		// get the list
184 179
		List<ScoredFeature> sFeats = inLists.get(0);
......
334 329
	 * @param feat
335 330
	 * @return
336 331
	 */
337
	private int[] getNumberRange(Feature feat,
338
			FeatureAttributeDescriptor firstRightNumberDesc,
339
			FeatureAttributeDescriptor lastRightNumberDesc,
340
			FeatureAttributeDescriptor firstLeftNumberDesc,
341
			FeatureAttributeDescriptor lastLeftNumberDesc) {
332
	private int[] getNumberRange(Feature feat, String firstRightNumberDesc,
333
			String lastRightNumberDesc, String firstLeftNumberDesc,
334
			String lastLeftNumberDesc) {
342 335

  
343 336
		int[] range = new int[4];
344 337

  
345
		Object oRFirst = feat.get(firstRightNumberDesc.getName());
346
		Object oRLast = feat.get(lastRightNumberDesc.getName());
347
		Object oLFirst = feat.get(firstLeftNumberDesc.getName());
348
		Object oLLast = feat.get(lastLeftNumberDesc.getName());
338
		Object oRFirst = feat.get(firstRightNumberDesc);
339
		Object oRLast = feat.get(lastRightNumberDesc);
340
		Object oLFirst = feat.get(firstLeftNumberDesc);
341
		Object oLLast = feat.get(lastLeftNumberDesc);
349 342

  
350 343
		// RIGHT FIRST
351 344
		if (oRFirst instanceof Double) {
......
405 398
		for (Object obj : relLiteral) {
406 399
			RelationsComponent rel = (RelationsComponent) obj;
407 400
			String key = rel.getKeyElement();
408
			FeatureAttributeDescriptor desc = rel.getValue();
409
			String fieldName = desc.getName();
401
			String fieldName = rel.getValue();
410 402
			Object object = null;
411 403
			String value = "";
412 404
			try {
......
431 423
	 * @param state
432 424
	 */
433 425
	public void saveToState(PersistentState state) throws PersistenceException {
426
		super.saveToState(state);
434 427
		state.set(FIRSTLEFTNUMBER, this.firstLeftNumber);
435 428
		state.set(FIRSTRIGHTNUMBER, this.firstRightNumber);
436 429
		state.set(LASTLEFTNUMBER, this.lastLeftNumber);
......
442 435
	 * @param state
443 436
	 */
444 437
	public void setState(PersistentState state) throws PersistenceException {
438
		super.setState(state);
445 439
		this.firstLeftNumber = (RelationsComponent) state.get(FIRSTLEFTNUMBER);
446 440
		this.firstRightNumber = (RelationsComponent) state
447 441
				.get(FIRSTRIGHTNUMBER);
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/styles/AbstractGeocodingStyle.java
90 90
	 * @param state
91 91
	 */
92 92
	public void saveToState(PersistentState state) throws PersistenceException {
93
		state.set(RELATIONSLITERAL, this.relationsLiteral);
93
		state.set(RELATIONSLITERAL, this.relationsLiteral.iterator());
94 94
	}
95 95

  
96 96
	/**
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/address/impl/DefaultAddress.java
34 34
import org.gvsig.tools.persistence.PersistentState;
35 35

  
36 36
/**
37
 * Class address, this class has the elements to locate one place
37
 * Address class implementation, this class has the elements to locate one place
38 38
 * 
39 39
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
40 40
 * @author <a href="mailto:vsanjaime@prodevelop.es"> Vicente Sanjaime Calvet</a>
......
42 42
public class DefaultAddress implements Address {
43 43

  
44 44
	private static final String MAINLITERAL = "mainliteral";
45

  
46 45
	private Literal mainLiteral = new DefaultLiteral();
47 46

  
48 47
	/**
......
59 58
	 * @param main
60 59
	 */
61 60
	public DefaultAddress(Literal main) {
61
		this();
62 62
		this.mainLiteral = main;
63 63
	}
64 64

  
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/address/impl/DefaultAddressComponent.java
32 32
import org.gvsig.tools.persistence.PersistentState;
33 33

  
34 34
/**
35
 * Class AddresComponent, this class has the keys of the extension (elements)
35
 * AddresComponent class implementation, this class has the keys of the extension (elements)
36 36
 * and the values that to define a address
37 37
 * 
38 38
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/address/impl/DefaultLiteral.java
34 34
import org.gvsig.tools.persistence.PersistentState;
35 35

  
36 36
/**
37
 * Class DefaultLiteral, this class is a list with address components of one
37
 * Literal class implementation, this class is a list with address components of one
38 38
 * address
39 39
 * 
40 40
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/address/impl/DefaultNumberAddress.java
33 33
import org.gvsig.tools.persistence.PersistentState;
34 34

  
35 35
/**
36
 * Class DefaultNumberAddress, this class has the literal of address, plus the address
36
 * NumberAddress class implementation, this class has the literal of address, plus the address
37 37
 * number
38 38
 * 
39 39
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/address/impl/DefaultComposedAddress.java
36 36
import org.gvsig.tools.persistence.PersistentState;
37 37

  
38 38
/**
39
 * Class ComposeAddress, this class has the main literal and one list of
39
 * ComposeAddress class implementation, this class has the main literal and one list of
40 40
 * intersection literals to complete the address
41 41
 * 
42 42
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/address/impl/DefaultRelationsComponent.java
27 27

  
28 28
package org.gvsig.geocoding.address.impl;
29 29

  
30
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
31 30
import org.gvsig.geocoding.address.RelationsComponent;
32 31
import org.gvsig.tools.persistence.PersistenceException;
33 32
import org.gvsig.tools.persistence.PersistentState;
34 33

  
35 34
/**
36
 * Class DefaultRelationsComponent, relation between the keys of the extension
35
 * RelationsComponent class implementation, relation between the keys of the extension
37 36
 * (elements) and fields of the data source
38 37
 * 
39 38
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
......
46 45
	private static final String FIELD = "field";
47 46

  
48 47
	private String element;
49
	private FeatureAttributeDescriptor field;
48
	private String field;
50 49

  
51 50
	/**
52 51
	 * RelationsComponent constructor
......
54 53
	 * @param elementy
55 54
	 * @param field
56 55
	 */
57
	public DefaultRelationsComponent(String element,
58
			FeatureAttributeDescriptor field) {
56
	public DefaultRelationsComponent(String element, String field) {
59 57
		this.element = element;
60 58
		this.field = field;
61 59
	}
......
74 72
	 * 
75 73
	 * @return
76 74
	 */
77
	public FeatureAttributeDescriptor getValue() {
75
	public String getValue() {
78 76
		return field;
79 77
	}
80 78

  
......
97 95
	 */
98 96
	public void setState(PersistentState state) throws PersistenceException {
99 97
		this.element = (String) state.get(ELEMENT);
100
		this.field = (FeatureAttributeDescriptor) state.get(FIELD);
98
		this.field = (String) state.get(FIELD);
101 99
	}
102 100

  
103 101
}
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/address/RelationsComponent.java
27 27

  
28 28
package org.gvsig.geocoding.address;
29 29

  
30
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
31 30
import org.gvsig.tools.persistence.Persistent;
32 31

  
33 32
/**
34
 * Interface RelationComponent, relation between the keys of the extension (elements)
35
 * and fields of the data source
33
 * Interface RelationComponent, relation between the keys of the extension
34
 * (elements) and fields of the data source
36 35
 * 
37 36
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
38 37
 * @author <a href="mailto:vsanjaime@prodevelop.es"> Vicente Sanjaime Calvet</a>
39 38
 */
40 39

  
41
public interface RelationsComponent extends Persistent {	
40
public interface RelationsComponent extends Persistent {
42 41

  
43 42
	/**
44 43
	 * Get key element
......
48 47
	public String getKeyElement();
49 48

  
50 49
	/**
51
	 * Get field descriptor
50
	 * Get name field descriptor
52 51
	 * 
53 52
	 * @return
54 53
	 */
55
	public FeatureAttributeDescriptor getValue();
54
	public String getValue();
56 55

  
57 56
}
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/geommatches/MatcherUtils.java
36 36

  
37 37
import org.gvsig.fmap.dal.exception.DataException;
38 38
import org.gvsig.fmap.dal.feature.Feature;
39
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
40 39
import org.gvsig.fmap.geom.Geometry;
41 40
import org.gvsig.fmap.geom.GeometryLocator;
42 41
import org.gvsig.fmap.geom.exception.CreateGeometryException;
......
328 327
	 * @return
329 328
	 */
330 329
	public static HashMap<String, List<ScoredFeature>> groupScoredFeaturesByAttribute(
331
			FeatureAttributeDescriptor desc, List<ScoredFeature> features) {
330
			String desc, List<ScoredFeature> features) {
332 331

  
333 332
		HashMap<String, List<ScoredFeature>> groups = new HashMap<String, List<ScoredFeature>>();
334 333
		Iterator<ScoredFeature> it = features.iterator();
......
339 338
			Feature feat = null;
340 339
			try {
341 340
				feat = sFeat.getFeature();
342
				String key = feat.get(desc.getIndex()).toString();
341
				String key = feat.get(desc).toString();
343 342
				// Store the geometries for attribute in the List
344 343
				boolean contiene = groups.containsKey(key);
345 344
				if (!contiene) {
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/pattern/impl/DefaultGeocodingSettings.java
30 30
import org.gvsig.geocoding.pattern.GeocodingSettings;
31 31
import org.gvsig.tools.persistence.PersistenceException;
32 32
import org.gvsig.tools.persistence.PersistentState;
33
import org.slf4j.Logger;
34
import org.slf4j.LoggerFactory;
35 33

  
36 34
/**
37
 * Class Settings. This class has the parameters that define the quality of
38
 * search and the maximun number of results showed in the panel.
35
 * Settings class implementation. This class has the parameters that define the
36
 * quality of search and the maximun number of results showed in the panel.
39 37
 * 
40 38
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
41 39
 * @author <a href="mailto:vsanjaime@prodevelop.es"> Vicente Sanjaime Calvet</a>
42 40
 */
43 41
public class DefaultGeocodingSettings implements GeocodingSettings {
44 42

  
45
	@SuppressWarnings("unused")
46
	private static final Logger log = LoggerFactory
47
			.getLogger(DefaultGeocodingSettings.class);
48

  
49 43
	private static final String SCORE = "score";
50 44
	private static final String RESULTSNUMBER = "resultsnumber";
51 45

  
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/pattern/impl/DefaultGeocodingSource.java
27 27

  
28 28
package org.gvsig.geocoding.pattern.impl;
29 29

  
30
import org.gvsig.fmap.dal.DataStore;
30 31
import org.gvsig.fmap.dal.feature.FeatureStore;
31 32
import org.gvsig.geocoding.pattern.GeocodingSource;
32 33
import org.gvsig.geocoding.styles.AbstractGeocodingStyle;
......
36 37
import org.slf4j.LoggerFactory;
37 38

  
38 39
/**
39
 * Class Source. This class has the geocoding style and the FeatureStore of the
40
 * GeocodingSource class implementation. This class has the geocoding style and the FeatureStore of the
40 41
 * data source
41 42
 * 
42 43
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
......
52 53
	private static final String LAYERSOURCE = "layersource";
53 54

  
54 55
	private AbstractGeocodingStyle style;
55
	private FeatureStore layerSource;
56
	private DataStore layerSource;
56 57

  
57 58
	/**
58 59
	 * Default constructor
......
96 97
	 * 
97 98
	 * @return
98 99
	 */
99
	public FeatureStore getLayerSource() {
100
	public DataStore getLayerSource() {
100 101
		return layerSource;
101 102
	}
102 103

  
......
105 106
	 * 
106 107
	 * @param layerSource
107 108
	 */
108
	public void setLayerSource(FeatureStore layerSource) {
109
	public void setLayerSource(DataStore layerSource) {
109 110
		this.layerSource = layerSource;
110 111
	}
111 112

  
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/pattern/impl/DefaultPatterngeocoding.java
45 45
import org.slf4j.LoggerFactory;
46 46

  
47 47
/**
48
 * Class Patterngeocoding.
48
 *  Patterngeocoding class implementation.
49 49
 * 
50 50
 * This class is the geocoding pattern. This pattern has your name (name), the
51 51
 * settings (settings) and the data source (source)
......
59 59
	private static final Logger log = LoggerFactory
60 60
			.getLogger(DefaultPatterngeocoding.class);
61 61

  
62
	private static final String PATTERNNAME = "patternname";
63
	private static final String SOURCE = "source";
64
	private static final String SETTINGS = "settings";
62
	private static final String PATTERNNAME = "gpatternname";
63
	private static final String SOURCE = "gsource";
64
	private static final String SETTINGS = "gsettings";
65 65

  
66 66
	private String name;
67 67
	private GeocodingSettings settings;
......
160 160
	public void saveToXML(File file) throws PersistenceException, IOException {
161 161

  
162 162
		PersistenceManager manager = ToolsLocator.getPersistenceManager();
163
		// BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
164
		// new FileOutputStream(file), "Cp1252"));
165
		// writer.write("<?xml version=\"1.0\" encoding=\"Cp1252\"?>\n");
163
		
166 164
		Writer writer = new FileWriter(file);
167 165
		PersistentState state = manager.getState(this);
168 166
		state.save(writer);
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/pattern/GeocodingSource.java
27 27

  
28 28
package org.gvsig.geocoding.pattern;
29 29

  
30
import org.gvsig.fmap.dal.feature.FeatureStore;
30
import org.gvsig.fmap.dal.DataStore;
31 31
import org.gvsig.geocoding.styles.AbstractGeocodingStyle;
32 32
import org.gvsig.tools.persistence.Persistent;
33 33

  
......
59 59
	 * 
60 60
	 * @return
61 61
	 */
62
	public FeatureStore getLayerSource();
62
	public DataStore getLayerSource();
63 63

  
64 64
	/**
65 65
	 * Set layer source
66 66
	 * 
67 67
	 * @param layerSource
68 68
	 */
69
	public void setLayerSource(FeatureStore layerSource);
69
	public void setLayerSource(DataStore layerSource);
70 70
}
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/result/impl/GeomMatchResult.java
42 42

  
43 43
//
44 44
/**
45
 * Class with the results of geocoding process. It has the geometry of the
45
 * Implementation with the results of geocoding process. It has the geometry of the
46 46
 * geocoding position and the features related. This objects are stored in a
47 47
 * TreeSet the best to worst quality.
48 48
 * 
......
197 197
				return 1;
198 198
			}
199 199
		}
200

  
201 200
	}
202 201

  
203 202
	/**
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/result/impl/DefaultDissolveResult.java
36 36
import org.gvsig.geocoding.result.ScoredFeature;
37 37

  
38 38
/**
39
 * Class DissolveResult, This class has the new dissolved geometry and the
39
 * DissolveResult class implementation, This class has the new dissolved geometry and the
40 40
 * references of features dissolved
41 41
 * 
42 42
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/result/impl/DefaultScoredFeature.java
33 33
import org.gvsig.geocoding.result.ScoredFeature;
34 34

  
35 35
/**
36
 * feature with a new attribute named score. the score define the score of the
36
 * Feature with a new attribute named score. the score define the score of the
37 37
 * feature in the search proces.
38 38
 * 
39 39
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
branches/v2_0_0_prep/libraries/libGeocoding/pom.xml
10 10
	<packaging>jar</packaging>
11 11
	<version>2.0-SNAPSHOT</version>
12 12
	<name>libGeocoding</name>
13
	<description>TODO</description>
13
	<description>libGeocoding is a library that it has tools to geocoding process</description>
14 14
	<url>http://www.gvsig.org</url>
15 15
	<scm>
16 16
		<connection>
......
33 33
			</roles>
34 34
		</developer>
35 35
		<developer>
36
			<id>jmvivo</id>
37
			<name>José Manuel Vivó</name>
38
			<email>josemanuel.vivo@iver.es</email>
36
			<id>vsanjaime</id>
37
			<name>Vicente Sanjaime Calvet</name>
38
			<email>vsanjaime@prodevelop.es</email>
39 39
			<roles>
40 40
				<role>Developer</role>
41 41
			</roles>
......
48 48
		<version>2.0-SNAPSHOT</version>
49 49
	</parent>
50 50
	<dependencies>
51
	<dependency>
52
			<groupId>castor</groupId>
53
			<artifactId>castor</artifactId>
54
			<version>0.9.9.1</version>
55
		</dependency>
51 56
		<dependency>
52 57
			<groupId>org.gvsig</groupId>
53 58
			<artifactId>org.gvsig.fmap.geometry</artifactId>

Also available in: Unified diff