/ - Diff - | gvSIG desktop 1 - gvSIG

     		<extension class-name="org.gvsig.geocoding.extension.GeocodingExtension"
     			description="Extension that geocoding a address."
     			active="true">
     			<menu text="Tabla/geocoding"
     				tooltip="geocoding"
     			<menu text="Capa/geocoder"
     				tooltip="geocodertip"
     				action-command="GEOCODING"
     				icon="images/geocodingicon.png"
     				icon="images/icons16/geocodingicon.png"
     				position="9999" />
     			<tool-bar name="field_toolbar">
     			<tool-bar name="geocoder">
     				<action-tool icon="images/icons16/geocodingicon.png"
     					action-command="GEOCODING"
     					tooltip="geocoding"
     					tooltip="geocodertip"
     					position="9999"/>
     			</tool-bar>
     		</extension>

     # Geocoding Extension
     geocoder=Geocodificar
     geocodertip=Geocodificar un direcci?n
     geocoding=Geocodificaci?n
     geocodingrun=Geocodificando ...
     new_geocoding_pattern=Nuevo patr?n de geocodificai?n
-...
     gtabletip=Geocodificar los diferentes registros de una tabla
     butnewpattern=Crear nuevo patr?n
     buteditpattern=Modificar las carcater?sticas del patr?n
     buteditpattern=Modificar las caracter?sticas del patr?n
     butloadpattern=Cargar un patr?n desde fichero
     literalempty=El nuevo patr?n no posee ning?n elemento de direcci?n que permita la geocodificaci?n
-...
     addressgeocoded= direcci?n geocodificada
     addressesgeocoded= direcciones geocodificadas
     #create table results
     tableresults=Guardar tabla de resultados
     dbf_file=*.dbf

     # Geocoding Extension
     geocoder=Geocoder
     geocodertip=Geocoder address
     geocoding=Geocoding
     geocodingrun=Geocodiing ...
     new_geocoding_pattern=New geocoding pattern
     preference_file=Address element
     preference_file=Address elements
     preference_location=File path
     preference_edit=You can modify the address elements list
     preference_edit=You can edit the list with new address elements
     nolayersinview=No layers in view
     nolayersinview=None layers in View
     combodefaulttext=...
     combonamefields=Fields names
     combonamefields=fields names
     comboaddresselements=Address elements
     pattern_geoco_file=Geocoding pattern file (*.xml)
-...
     tablestructureelement=Element
     tableelementname=Name
     #main panel
     accuracy=Accuracy
     maxresults=Results
     patternpath=File
     pattern=Geocoding pattern
     quality=Quality
     gtype=Geocoding type
     atype=Address Type
     type=Type
     gtype=Select geocoding type
     atype=Complete address elements
     type=Select geocoding type
     gsimple=Simple
     gsimpletip=Geocoding only address
     gsimpletip=Geocoder one address
     gtable=Table
     gtabletip=Geocoding all table registries
     gtabletip=Geocoder all table registries
     butclose=Close
     butnewpattern=Create new pattern
     butnewpattern=Build new pattern
     buteditpattern=Modify settings pattern
     butloadpattern=Load pattern from file
     butrun=Search
     literalempty=New pattern hasn't address elements that it allows geocoding process
     street1=Street 1
     street2=Street 2
     street3=Street 3
     street1=Address
     street2=Address
     street3=Address
     cancel=Cancel
     ok=Ok
-...
     export=Export
     search=Search
     adrelements=Address components
     adrelements=Address elements
     valuename=Values
     valuefield=Field
     typeA=One address
     typeB=Two Address (Crossing streets)
     typeC=Three Address (Strech of street between two streets)
     xcross=Crossing paths
     xbetween=Path section between two path
     settings=Search settings
     maxresults=Maximum results
     quality=Quality
     accuracy=Accuracy
     settings=Search parameters
     maxresults=Results number
     score=Score higher than
     maxresultstip=Maximum number of search results
     scoretip=Level of search score
     results=Results
-...
     oktip=Select result
     nexttip=Next registry
     ##New pattern panel
     datasource=Select data source
     selectedlayer=Vectorial layer
     components=Define pattern elements
     xfield=Data source fields
     xelement=Elements
     xvalue=Address
     xvalue1=Address 1
     xvalue2=Address 2
     xvalue3=Address 3
     xmainvalue=Main address
     xnumAddress=Door number
     simcenstyle=Geocoding geometries by centroid. \n[Layer of points, lines and polygons]
     rangesimstyle=Geocoding path that this has single numeric range (odd and even number). \n [Layer of lines]
     rangedoustyle=Geocoding path that this has double numeric range, pairs number on the right and odd number on the left or vice versa. \n [Layer of lines]
     compostyle=Geocoding on the cross paths or the stretch of path between two paths . \n [Layer of lines]
     fid=Id
     fsel=Ok
     fquality=Calidad
     faccuracy=Precisi?n
     fx=Coordenada X
     fy=Coordenada Y
     fscore=Points
     fx=X
     fy=Y
     flong=Long
     flat=Lat
     fnumber=Number
     row=Row
     loadlayer=Do you want load the layer related with geocoding pattern?
     nopatternlayer=You haven't selected the layer related with geocoding pattern
     nolayers=To build new geocoding pattern you must load vectorial layer on the gvSIG view on which geocodified
     rangenum=Path numeric range
     numright=Right numeric range
     numleft=Left numeric range
     fromnum=From
     tonum=To
     rightfromnum=(Right) From
     righttonum=(Right) To
     leftfromnum=(Left) From
     lefttomnum=(Left) To
     #styles
     composedstyle=Composite geocoding
     doublerangestyle=Simple geocoding by double range
     simplerangestyle=Simple geocoding by single range
     simplecentroidstyle=Simple geocoding by centroid
     #process
     addressgeocoded= address geocoded
     addressesgeocoded= addresses geocoded
     #create table results
     tableresults=Save results table
     dbf_file=*.dbf

     import java.util.ArrayList;
     import java.util.List;
     import java.util.Locale;
     import java.util.Set;
     import javax.swing.DefaultComboBoxModel;
     import javax.swing.JFileChooser;
-...
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.DataParameters;
     import org.gvsig.fmap.dal.DataServerExplorer;
     import org.gvsig.fmap.dal.DataServerExplorerParameters;
     import org.gvsig.fmap.dal.NewDataStoreParameters;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.fmap.dal.feature.EditableFeatureType;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
     import org.gvsig.geocoding.Literal;
-...
     import org.gvsig.geocoding.gui.address.AddressSimpleCentroidPanel;
     import org.gvsig.geocoding.gui.newpattern.NewGeocoPatternPanel;
     import org.gvsig.geocoding.pattern.Patterngeocoding;
     import org.gvsig.geocoding.result.GeocodingResult;
     import org.gvsig.geocoding.styles.AbstractGeocodingStyle;
     import org.gvsig.geocoding.styles.AbstractRange;
     import org.gvsig.geocoding.styles.Composed;
-...
     	private static final Logger log = LoggerFactory
     			.getLogger(GeocoController.class);
     	private PluginServices ps = null;
     	public static final String GEOCODINGELEMENTS = "GeocodingElements";
     	public static final String ROW = PluginServices.getText(null, "row")
-...
     	/**
     	 * Controller Constructor
+    	 *
     	 * @param ps
     	 */
     	public GeocoController() {
     		manager = DALLocator.getDataManager();
     		// Load the model
     		this.gmodel = new GeocodingModel(this);
     		this.gmodel = new GeocodingModel();
     		// Load the view and put it visible
     		this.gpanel = new GeocodingPanel(this);
-...
     		} else {
     			// show warning message
     			String title = PluginServices.getText(null, "geocoding");
     			String message = PluginServices.getText(null, "nolayers");
     			JOptionPane.showMessageDialog(null, message, title,
     					JOptionPane.WARNING_MESSAGE);
-...
     		return this.gpanel.getJTableResults();
+    	}
     	/**
     	 * Create initial array with list of selected results elements to export
+    	 *
     	 * @param results
     	 * @return
     	 */
     	public Integer[] createInitialResultsExportElements(
     			List<Set<GeocodingResult>> results) {
     		int cant = results.size();
     		Integer[] expElems = new Integer[cant];
     		int i = 0;
     		for (Set<GeocodingResult> res : results) {
     			if (res.size() > 0) {
     				expElems[i] = 0;
     			} else {
     				expElems[i] = -1;
+    			}
     			i++;
+    		}
     		return expElems;
+    	}
     	/**
+    	 *
     	 */
     	public void createDBFTableResults() {
     		File thefile = null;
     		JFileChooser jfc = new JFileChooser();
     		jfc.setDialogTitle(PluginServices.getText(this, "tableresults"));
     		String[] extensions = { "dbf" };
     		jfc.setCurrentDirectory(new File(""));
     		jfc.addChoosableFileFilter(new GenericFileFilter(extensions,
     				PluginServices.getText(this, "dbf_file")));
     		int returnval = jfc.showSaveDialog((java.awt.Component) PluginServices
     				.getMainFrame());
     		if (returnval == JFileChooser.APPROVE_OPTION) {
     			thefile = jfc.getSelectedFile();
     			log.debug("file opened: " + thefile);
+    		}
     		if (thefile != null) {
     			thefile = GeocoUtils.addDBFSuffix(thefile);
     			// build store
     			try {
     				File parentfile = thefile.getParentFile();
     				String name = thefile.getName();
     				DataServerExplorerParameters eparams = manager
     						.createServerExplorerParameters("FilesystemExplorer");
     				eparams
     						.setDynValue("initialpath", parentfile
     								.getAbsolutePath());
     				DataServerExplorer serverExplorer = manager
     						.createServerExplorer(eparams);
     				DataParameters sparams = serverExplorer.getAddParameters("dbf");
     				sparams.setDynValue("fileName", name);
     				EditableFeatureType featureType = (EditableFeatureType) sparams
     						.getDynValue("defaultFeatureType");
     				serverExplorer.add((NewDataStoreParameters) sparams, true);
     			} catch (InitializeException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
     			} catch (ProviderNotRegisteredException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
     			} catch (DataException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
     			// fill store
+    		}
+    	}
+    }

     				.getAllResults();
     		Set<GeocodingResult> result = results.get(0);
     		control.getGmodel().setNumResultShowed(0);
     		// arrya selected results
     		Integer[] expElems = control
     				.createInitialResultsExportElements(results);
     		control.getGmodel().setExportElements(expElems);
     		if (result.size() > 0) {
     			int max = control.getPattern().getSettings().getResultsNumber();

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2009 Prodevelop S.L  vsanjaime   programador
      */
     package org.gvsig.geocoding.utils;
     import java.util.ArrayList;
     import java.util.List;
     import org.gvsig.geocoding.result.GeocodingResult;
     public class ResultProof {
     	public static List<List<GeocodingResult>> getDefaultResults() {
     		List<List<GeocodingResult>> results = new ArrayList<List<GeocodingResult>>();
     		List<GeocodingResult> list1 = new ArrayList<GeocodingResult>();
     //		//Optional
     //		OpGeocoLocation opt1 = new OpGeocoLocation(100,80,678273.2,4395030.6);
     //		OpGeocoLocation opt2 = new OpGeocoLocation(77,70,755656.3,4456384.7);
     //		OpGeocoLocation opt3 = new OpGeocoLocation(80,100,640687.4,4366288.5);
     //		OpGeocoLocation opt4 = new OpGeocoLocation(70,70,688222.6,4254083.3);
     //		OpGeocoLocation opt5 = new OpGeocoLocation(50,100,669429.5,4320964.2);
     //		// First
     //		GeocoLocationSet loc1 = new GeocoLocationSet();
     //		loc1.add(opt1);
     //		loc1.add(opt2);
     //		loc1.add(opt3);
     //		loc1.add(opt4);
     //		loc1.add(opt5);
     //
     //		// Second
     //		GeocoLocationSet loc2 = new GeocoLocationSet();
     //		loc2.add(opt1);
     //		loc2.add(opt2);
     //		loc2.add(opt3);
     //		loc2.add(opt4);
     //		loc2.add(opt5);
     //		// Third
     //		GeocoLocationSet loc3 = new GeocoLocationSet();
     //		loc3.add(opt1);
     //		loc3.add(opt2);
     //		loc3.add(opt3);
     //		loc3.add(opt4);
     //		loc3.add(opt5);
     //
     //		list.add(loc1);
     //		list.add(loc2);
     //		list.add(loc3);
     		return results;
+    	}
+    }

+    		}
     		return file;
+    	}
     	/**
     	 * Add to the file name the suffix .dbf
+    	 *
     	 * @param file
     	 * @return
     	 */
     	public static File addDBFSuffix(File file) {
     		if (!(file.getPath().toLowerCase().endsWith(".dbf"))) {
     			return new File(file.getPath() + ".dbf");
+    		}
     		return file;
+    	}
     	/**
     	 * @param name

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2009 Prodevelop S.L  vsanjaime   programador
      */
     package org.gvsig.geocoding.utils;
     import org.gvsig.geocoding.extension.GeocoController;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * This class generates a Layer from feature store
+     *
      * @author Jorge Gaspar Sanz Salinas (jsanz@prodevelop.es)
      * @author Vicente Sanjaime Calvet (vsanjaime@prodevelop.es)
+     *
      */
     public class Export extends Thread {
     	private Logger log = LoggerFactory.getLogger(Export.class);
     	GeocoController control = null;
     	/**
     	 * Constructor with list of results
+    	 *
     	 * @param file
     	 */
     	public Export(GeocoController control) {
     		super();
     		this.control = control;
+    	}
     	/**
     	 * Run
     	 */
     	public void run() {
     //		boolean compose = false;
     //		boolean cross = true;
     //
     //	// address fields
     //		Set<GeocodingResult> result = control.getGmodel().getAllResults().get(0);
     //		Address address = null;
     //		for (GeocodingResult res : result) {
     //			address = res.getAddress();
     //			break;
     //		}
     //		Literal literal = address.getMainLiteral();
     //		int cant = literal.size();
     //		String[] fields = new String[cant];
     //		int i = 0;
     //		for (Object obj : literal) {
     //			AddressComponent aComp= (AddressComponent)obj;
     //			fields[i]= aComp.getKeyElement();
     //			i++;
     //		}
     //		if(address instanceof ComposeAddress){
     //			compose = true;
     //			ComposeAddress caddress = (ComposeAddress)address;
     //			List<Literal> inter = caddress.getIntersectionLiteral();
     //			if(inter.size() == 2){
     //				cross = false;
     //			}
     //		}
     //
     //		// new store
     //		DataManager manager = DALLocator.getDataManager();
     //		try {
     //		DataServerExplorerParameters eparams = manager
     //				.createServerExplorerParameters("FilesystemExplorer");
     //		eparams.setDynValue("initialpath","c:/temp");
     //		DataServerExplorer serverExplorer = manager.createServerExplorer(eparams);
     //
     //		DataParameters sparams = serverExplorer.getAddParameters("Shape");
     //		sparams.setDynValue("fileName","geocode.shp");
     //
     //		EditableFeatureType featureType = (EditableFeatureType) sparams.getDynValue("defaultFeatureType");
     //
     //		// no compose address
     //		if(!compose){
     //			for (String field : fields) {
     //				featureType.add(field, DefaultFeatureAttributeDescriptor.TYPE_STRING,50);
     //			}
     //
     //		}
     //		// compose address
     //		else{
     //			for (String field : fields) {
     //				featureType.add(field+"_1", FeatureAttributeDescriptor.TYPE_STRING,50);
     //			}
     //			for (String field : fields) {
     //				featureType.add(field+"_2", FeatureAttributeDescriptor.TYPE_STRING,50);
     //			}
     //
     //
     //			// compose between address
     //			if(!cross){
     //				for (String field : fields) {
     //					featureType.add(field+"_3", FeatureAttributeDescriptor.TYPE_STRING,50);
     //				}
     //
     //			}
     //
     //
     //		}
     //		featureType.add("GEOM", FeatureAttributeDescriptor.TYPE_GEOMETRY);
     //
     //		serverExplorer.add(sparams, true);
     //		// create layer
     //		LayerFactory factory = LayerFactory.getInstance();
     //		String layerName = "GEOCODE";
     //		try {
     //			FLayer lyr = factory.createLayer(layerName, params);
     //		} catch (LoadLayerException e) {
     //			// TODO Auto-generated catch block
     //			e.printStackTrace();
     //		}
     //		// add layer TOC
+    	}
+    }

branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/utils/LayerGenerator.java
82	82	// features, def);
83	83	// FLyrVect lyr = new FLyrVect();
84	84
	85
	86
85	87	}
86	88
87	89	/**

      */
     public class ComboLayer implements ComboShowName {
     	private FLyrVect lyr = null;
     	/**
     	 * Constructor
+    	 *
     	 * @param lyr
     	 */
     	public ComboLayer(FLyrVect lyr){
     	public ComboLayer(FLyrVect lyr) {
     		this.lyr = lyr;
+    	}
     	/**
     	 * to String
+    	 *
     	 * @return layer name
     	 */
     	public String toString(){
     	public String toString() {
     		return lyr.getName();
+    	}
     	/**
     	 * get the layer stored
+    	 *
     	 * @return
     	 */
     	public FLyrVect getLayer(){
     	public FLyrVect getLayer() {
     		return lyr;
+    	}
+    }

branches/v2_0_0_prep/extensions/extGeocoding/src/org/gvsig/geocoding/gui/newpattern/ComboDesc.java
37	37	* @author <a href="mailto:vsanjaime@prodevelop.es"> Vicente Sanjaime Calvet</a>
38	38	*/
39	39
40		public class ComboDesc implements ComboShowName{
	40	public class ComboDesc implements ComboShowName {
41	41
42	42	private FeatureAttributeDescriptor desc = null;
43	43
...	...
69	69	return desc;
70	70	}
71	71
72
73
74	72	}

+    		}
     		return null;
+    	}
     	/**
     	 * set description RightFromMun Combo
+    	 *
     	 * @return
     	 */
     	public void setDescriptorRightFronMun(FeatureAttributeDescriptor desc) {
     		ComboDesc cDesc = new ComboDesc(desc);
     		jComboRightFromNum.getModel().setSelectedItem(cDesc);
+    	}
-...
     	 * @return
     	 */
     	public void setDescriptorRightToMun(FeatureAttributeDescriptor desc) {
     		ComboDesc cDesc = new ComboDesc(desc);
     		jComboRightToNum.getModel().setSelectedItem(cDesc);
+    	}
-...
     	 * @return
     	 */
     	public void setDescriptorLeftFronMun(FeatureAttributeDescriptor desc) {
     		ComboDesc cDesc = new ComboDesc(desc);
     		jComboLeftFromNum.getModel().setSelectedItem(cDesc);
+    	}
-...
     	 * @return
     	 */
     	public void setDescriptorLeftToMun(FeatureAttributeDescriptor desc) {
     		ComboDesc cDesc = new ComboDesc(desc);
     		jComboLeftToNum.getModel().setSelectedItem(cDesc);
+    	}
-...
     		fillCombos(desc);
     		this.validate();
+    	}
     	/**
     	 * This method updates all labels of the panel from properties file
     	 */
-...
     		PluginServices ps = PluginServices.getPluginServices(this);
     		jPanRight.setBorder(GeocoUtils.getTitledBorder(ps
     				.getText("right")));
     		jPanLeft.setBorder(GeocoUtils.getTitledBorder(ps
     				.getText("left")));
     		jPanRight.setBorder(GeocoUtils.getTitledBorder(ps.getText("right")));
     		jPanLeft.setBorder(GeocoUtils.getTitledBorder(ps.getText("left")));
     		jLabRightFromNum.setText(ps.getText("rightfromnum"));
     		jLabRightToNum.setText(ps.getText("righttonum"));
     		jLabLeftFromNum.setText(ps.getText("leftfromnum"));
     		jLabLeftToNum.setText(ps.getText("lefttomnum"));
+    	}
+    }

+    	 *
     	 * @return
     	 */
     	public List<FeatureAttributeDescriptor> getListDescriptorSelectedTable();
     	public List<FeatureAttributeDescriptor> getListDescriptorSelectedTable();
     	/**
     	 * get store of selected table
+    	 *
     	 * @return
     	 */
     	public FeatureStore getSelectedTableStore();
     	/**
     	 * set store of selected table
     	 * set store of selected table
+    	 *
     	 * @param selectedTableStore
     	 */
     	public void setSelectedTableStore(FeatureStore selectedTableStore);
     	/**
     	 * Add one result to list of results
+    	 *
     	 * @param result
     	 */
     	public void addResult(Set<GeocodingResult> result);
     	/**
     	 * Clear list of geocoding results
     	 */
-...
     	/**
     	 * set number of result of results list showed
+    	 *
     	 * @param i
     	 */
     	public void setNumResultShowed(int i);
     	/**
     	 * get number of result of the results list showed
+    	 *
     	 * @return
     	 */
     	public int getNumResultShowed();
     	/**
     	 * get selected results export elements
+    	 *
     	 * @return
     	 */
     	public Integer[] getExportElements();
     	/**
     	 * set selected results export elements
+    	 *
     	 * @param exportElements
     	 */
     	public void setExportElements(Integer[] exportElements);
+    }

     	 */
     	private void getMainColumnNames() {
     		columnNames[0] = ps.getText("fid");
     		columnNames[1] = ps.getText("fsel");
     		columnNames[2] = ps.getText("fscore");
     		View view = GeocoUtils.getCurrentView();
     		if (view != null) {
     			MapContext context = view.getModel().getMapContext();
     			MapControl mControl = new MapControl();
     			mControl.setMapContext(context);
     			IProjection proj = mControl.getProjection();
     			if (proj.isProjected()) {
     		if (ps != null) {
     			columnNames[0] = ps.getText("fid");
     			columnNames[1] = ps.getText("fsel");
     			columnNames[2] = ps.getText("fscore");
     			View view = GeocoUtils.getCurrentView();
     			if (view != null) {
     				MapContext context = view.getModel().getMapContext();
     				MapControl mControl = new MapControl();
     				mControl.setMapContext(context);
     				IProjection proj = mControl.getProjection();
     				if (proj.isProjected()) {
     					columnNames[3] = ps.getText("fx");
     					columnNames[4] = ps.getText("fy");
     				} else {
     					columnNames[3] = ps.getText("flong");
     					columnNames[4] = ps.getText("flat");
+    				}
     			} else {
     				columnNames[3] = ps.getText("fx");
     				columnNames[4] = ps.getText("fy");
     			} else {
     				columnNames[3] = ps.getText("flong");
     				columnNames[4] = ps.getText("flat");
+    			}
     		} else {
     			columnNames[3] = ps.getText("fx");
     			columnNames[4] = ps.getText("fy");
+    		}
+    	}

     import org.gvsig.geocoding.gui.settings.SettingsPanel;
     import org.gvsig.geocoding.pattern.Patterngeocoding;
     import org.gvsig.geocoding.result.GeocodingResult;
     import org.gvsig.geocoding.utils.Export;
     import org.gvsig.geocoding.utils.GeocoUtils;
     import org.gvsig.project.document.table.FeatureTableDocument;
     import org.slf4j.Logger;
-...
+    	 *
     	 */
     	private void setImages() {
     		String baseDir = PluginServices.getPluginServices(this)
     				.getClassLoader().getBaseDir();
     		PluginServices ps = PluginServices.getPluginServices(this);
     		if (ps != null) {
     			String baseDir = ps.getClassLoader().getBaseDir();
     		jButLoad.setIcon(new ImageIcon(baseDir + File.separator + "images"
     				+ File.separator + "icons16" + File.separator + "open.png"));
     		jButNew.setIcon(new ImageIcon(baseDir + File.separator + "images"
     				+ File.separator + "icons16" + File.separator + "new.png"));
     			jButLoad
     					.setIcon(new ImageIcon(baseDir + File.separator + "images"
     							+ File.separator + "icons16" + File.separator
     							+ "open.png"));
     			jButNew.setIcon(new ImageIcon(baseDir + File.separator + "images"
     					+ File.separator + "icons16" + File.separator + "new.png"));
     		jButEdit.setIcon(new ImageIcon(baseDir + File.separator + "images"
     				+ File.separator + "icons16" + File.separator + "edit.png"));
     			jButEdit
     					.setIcon(new ImageIcon(baseDir + File.separator + "images"
     							+ File.separator + "icons16" + File.separator
     							+ "edit.png"));
     		jButNext.setIcon(new ImageIcon(baseDir + File.separator + "images"
     				+ File.separator + "icons16" + File.separator + "next.png"));
     			jButNext
     					.setIcon(new ImageIcon(baseDir + File.separator + "images"
     							+ File.separator + "icons16" + File.separator
     							+ "next.png"));
     		jButPrevious
     				.setIcon(new ImageIcon(baseDir + File.separator + "images"
     						+ File.separator + "icons16" + File.separator
     						+ "previous.png"));
     			jButPrevious.setIcon(new ImageIcon(baseDir + File.separator
     					+ "images" + File.separator + "icons16" + File.separator
     					+ "previous.png"));
     		jButSearch.setIcon(new ImageIcon(baseDir + File.separator + "images"
     				+ File.separator + "icons16" + File.separator + "search.png"));
     			jButSearch.setIcon(new ImageIcon(baseDir + File.separator
     					+ "images" + File.separator + "icons16" + File.separator
     					+ "search.png"));
     		jButExit.setIcon(new ImageIcon(baseDir + File.separator + "images"
     				+ File.separator + "icons16" + File.separator + "out.png"));
     			jButExit.setIcon(new ImageIcon(baseDir + File.separator + "images"
     					+ File.separator + "icons16" + File.separator + "out.png"));
     		jButExport.setIcon(new ImageIcon(baseDir + File.separator + "images"
     				+ File.separator + "icons16" + File.separator + "up.png"));
     			jButExport.setIcon(new ImageIcon(baseDir + File.separator
     					+ "images" + File.separator + "icons16" + File.separator
     					+ "up.png"));
+    		}
+    	}
     	/**
-...
     	private void setMesages() {
     		PluginServices ps = PluginServices.getPluginServices(this);
     		jPanPattern
     				.setBorder(GeocoUtils.getTitledBorder(ps.getText("pattern")));
     		if (ps != null) {
     			jPanPattern.setBorder(GeocoUtils.getTitledBorder(ps
     					.getText("pattern")));
     		this.jButLoad.setToolTipText(ps.getText("butloadpattern"));
     			this.jButLoad.setToolTipText(ps.getText("butloadpattern"));
     		this.jButNew.setToolTipText(ps.getText("butnewpattern"));
     			this.jButNew.setToolTipText(ps.getText("butnewpattern"));
     		this.jButEdit.setToolTipText(ps.getText("buteditpattern"));
     			this.jButEdit.setToolTipText(ps.getText("buteditpattern"));
     		this.jLabPatternPath.setText(ps.getText("patternpath"));
     			this.jLabPatternPath.setText(ps.getText("patternpath"));
     		jPanGeocodingType.setBorder(GeocoUtils.getTitledBorder(ps
     				.getText("gtype")));
     			jPanGeocodingType.setBorder(GeocoUtils.getTitledBorder(ps
     					.getText("gtype")));
     		this.jRadioSimple.setText(ps.getText("gsimple"));
     		this.jRadioSimple.setToolTipText(ps.getText("gsimpletip"));
     			this.jRadioSimple.setText(ps.getText("gsimple"));
     			this.jRadioSimple.setToolTipText(ps.getText("gsimpletip"));
     		this.jRadioTable.setText(ps.getText("gtable"));
     		this.jRadioTable.setToolTipText(ps.getText("gtabletip"));
     			this.jRadioTable.setText(ps.getText("gtable"));
     			this.jRadioTable.setToolTipText(ps.getText("gtabletip"));
     		jPanType.setBorder(GeocoUtils.getTitledBorder(ps.getText("atype")));
     			jPanType.setBorder(GeocoUtils.getTitledBorder(ps.getText("atype")));
     		jPanSettings.setBorder(GeocoUtils.getTitledBorder(ps
     				.getText("settings")));
     			jPanSettings.setBorder(GeocoUtils.getTitledBorder(ps
     					.getText("settings")));
     		jPanResults
     				.setBorder(GeocoUtils.getTitledBorder(ps.getText("results")));
     			jPanResults.setBorder(GeocoUtils.getTitledBorder(ps
     					.getText("results")));
     		this.jButPrevious.setToolTipText(ps.getText("previoustip"));
     		this.jButNext.setToolTipText(ps.getText("nexttip"));
     			this.jButPrevious.setToolTipText(ps.getText("previoustip"));
     			this.jButNext.setToolTipText(ps.getText("nexttip"));
     		this.jButExit.setText(ps.getText("exit"));
     		this.jButSearch.setText(ps.getText("search"));
     		this.jButExport.setText(ps.getText("export"));
     			this.jButExit.setText(ps.getText("exit"));
     			this.jButSearch.setText(ps.getText("search"));
     			this.jButExport.setText(ps.getText("export"));
+    		}
+    	}
-...
     		jButExport.setText("Export");
     		jButExport.setToolTipText("Export");
     		jButExport.setEnabled(false);
     		jButExport.addActionListener(new java.awt.event.ActionListener() {
     			public void actionPerformed(java.awt.event.ActionEvent evt) {
     				evExport(evt);
-...
     		boolean apto = control.loadPatternXML();
     		if (apto) {
     			/* update the url of the pattern in the panel */
     			if (control.getGmodel().getPatternFile() != null) {
     				jTextPatternPath.setText(control.getGmodel().getPatternFile()
-...
     					.getResultsNumber());
     			settingsPanel.setScore(control.getPattern().getSettings()
     					.getScore());
     			// enable components
     			if (control.getPattern() != null) {
     				this.enableComponents();
-...
     		control.getGmodel().setSimple(true);
     		activeTableGUIFeatures(false);
     		jButExport.setEnabled(false);
     		// insert address panel
     		insertAddressPanel();
+    	}
-...
     		control.getGmodel().setSimple(false);
     		jComboTable.setEnabled(true);
     		jButExport.setEnabled(false);
     		// save descriptor table in the model
     		List<FeatureAttributeDescriptor> descs = getListOfDescriptorSelectedTable();
     		control.getGmodel().setListDescriptorSelectedTable(descs);
     		// insert address panel
     		insertAddressPanel();
-...
     		// save descriptor table in the model
     		List<FeatureAttributeDescriptor> descs = getListOfDescriptorSelectedTable();
     		control.getGmodel().setListDescriptorSelectedTable(descs);
     		// insert address panel
     		insertAddressPanel();
+    	}
     	/**
-...
     	 * @param evt
     	 */
     	private void evSearch(java.awt.event.ActionEvent evt) {
     		jTableResults.setModel(new TableResultsModel(control));
     		jTableResults.validate();
     		// // GEOCODING PROCESS
     		control.geocoding();
     		// // GEOCODING PROCESS
+    	}
     	/**
-...
     	 * @param evt
     	 */
     	private void evExport(java.awt.event.ActionEvent evt) {
     		new Export(control).run();
+    	}
     	/**
-...
     	 * get window info
     	 */
     	public WindowInfo getWindowInfo() {
     		// WindowInfo info = new WindowInfo(WindowInfo.MODALDIALOG
     		// | WindowInfo.RESIZABLE);
     		WindowInfo info = new WindowInfo(WindowInfo.RESIZABLE);
     		info.setMinimumSize(this.getMinimumSize());
     		info.setWidth(600);
     		info.setHeight(530);
     		info.setTitle(PluginServices.getText(this, "geocoding"));
     		return info;
+    	}
-...
     			jButNext.setEnabled(active);
     			jButPrevious.setEnabled(active);
     			jLabRow.setEnabled(active);
     			jButExport.setEnabled(active);
     		} else {
     			jLabRow.setText("");
     			jButNext.setEnabled(false);
     			jButPrevious.setEnabled(false);
     			jButExport.setEnabled(false);
+    		}
+    	}
-...
     	 * Mouse pressed events
     	 */
     	public void mousePressed(MouseEvent e) {
     		int row = jTableResults.getSelectedRow();
     		TableResultsModel model = (TableResultsModel) jTableResults.getModel();
     		boolean sel = (Boolean) model.getValueAt(row, 1);
     		if (sel) {
     			model.setValueAt(new Boolean(false), row, 1);
     			// update list of selected result elements
     			int num = control.getGmodel().getNumResultShowed();
     			control.getGmodel().getExportElements()[num] = -1;
     		} else {
     			model.setValueAt(new Boolean(true), row, 1);
     			// update list of selected result elements
     			int num = control.getGmodel().getNumResultShowed();
     			control.getGmodel().getExportElements()[num] = row;
+    		}
+    	}
     	/**
-...
     		for (int i = 0; i < cant; i++) {
     			if (i != row) {
     				model.setValueAt(new Boolean(false), i, 1);
     				// update list of selected result elements
     				int num = control.getGmodel().getNumResultShowed();
+    			}
+    		}
+    		}
     		// zoom to geom
     		Point2D pto = model.getGeometry(row);
     		try {

     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
     import org.gvsig.geocoding.extension.GeocoController;
     import org.gvsig.geocoding.pattern.Patterngeocoding;
     import org.gvsig.geocoding.result.GeocodingResult;
     import org.slf4j.Logger;
-...
     public class GeocodingModel implements IGeocodingModel {
     	@SuppressWarnings("unused")
     	private static final Logger log = LoggerFactory
     			.getLogger(GeocodingModel.class);
     	private GeocoController control = null;
     	private Patterngeocoding pattern = null;
     	private File patternFile = null;
-...
     	private List<FeatureAttributeDescriptor> selDescs = null;
     	private FeatureStore selectedTableStore = null;
     	private int numResultShowed;
     	private Integer[] exportElements = null;
     	/**
     	 * Constructor
+    	 *
     	 * @param _control
     	 */
     	public GeocodingModel(GeocoController control) {
     		this.control = control;
     	public GeocodingModel() {
     		listResults = new ArrayList<Set<GeocodingResult>>();
+    	}
-...
     	public void setSelectedTableStore(FeatureStore selectedTableStore) {
     		this.selectedTableStore = selectedTableStore;
+    	}
     	/**
     	 * Add one result to list of results
+    	 *
     	 * @param result
     	 */
     	public void addResult(Set<GeocodingResult> result){
     	public void addResult(Set<GeocodingResult> result) {
     		this.listResults.add(result);
+    	}
     	/**
     	 * Clear list of geocoding results
     	 */
     	public void clearResults(){
     	public void clearResults() {
     		this.listResults.clear();
+    	}
-...
     	/**
     	 * set number of result of results list showed
+    	 *
     	 * @param
     	 */
     	public void setNumResultShowed(int i) {
     		this.numResultShowed = i;
+    	}
     	/**
     	 * get results export elements
+    	 *
     	 * @return
     	 */
     	public Integer[] getExportElements() {
     		return exportElements;
+    	}
     	/**
     	 * set results export elemnts
+    	 *
     	 * @param exportElements
     	 */
     	public void setExportElements(Integer[] exportElements) {
     		this.exportElements = exportElements;
+    	}
+    }

     package org.gvsig.geocoding.gui.settings;
     import java.awt.event.FocusEvent;
     import java.awt.event.FocusListener;
     import java.awt.event.KeyEvent;
     import java.awt.event.KeyListener;
-...
      * @author vsanjaime
      */
     public class SettingsPanel extends JPanel implements KeyListener {
     	private static final int MAXRESULTS = 10;
     	private static final long serialVersionUID = 1L;
-...
     		add(jPanScore, gridBagConstraints);
+    	}
     	/**
     	 * change score value event
+    	 *
-...
     	 */
     	private void evChangeScore(javax.swing.event.ChangeEvent evt) {
     		double score = (double) jSliderScore.getValue();
     		jLabScorePercent.setText(Integer.toString((int)score));
     		if(control.getPattern() != null){
     		jLabScorePercent.setText(Integer.toString((int) score));
     		if (control.getPattern() != null) {
     			control.getPattern().getSettings().setScore(score);
+    		}
+    		}
+    	}
     	/**
-...
     	 */
     	private void setMesages() {
     		PluginServices ps = PluginServices.getPluginServices(this);
     		this.jLabMaxResults.setText(ps.getText("maxresults"));
     		this.jLabScore.setText(ps.getText("score"));
     		jTextMaxResults.setToolTipText(ps.getText("maxresultstip"));
     		jSliderScore.setToolTipText(ps.getText("scoretip"));
     		if (ps != null) {
     			this.jLabMaxResults.setText(ps.getText("maxresults"));
     			this.jLabScore.setText(ps.getText("score"));
     			jTextMaxResults.setToolTipText(ps.getText("maxresultstip"));
     			jSliderScore.setToolTipText(ps.getText("scoretip"));
+    		}
+    	}
     	/**
-...
     	 */
     	public void setScore(double score) {
     		jSliderScore.setValue((int) score);
     		jLabScorePercent.setText(Integer.toString((int)score));
     		jLabScorePercent.setText(Integer.toString((int) score));
+    	}
     	/**
     	 * swich on and off components
+    	 *
-...
     	/**
     	 * get new pattern maximum results
+    	 *
     	 * @return
     	 */
     	public int getMaxResults() {
     	public int getMaxResults() {
     		return Integer.parseInt(jTextMaxResults.getText());
+    	}
     	/**
     	 * get new pattern minimum score
+    	 *
     	 * @return
     	 */
     	public double getScore() {
     		return (double)jSliderScore.getValue();
     	public double getScore() {
     		return (double) jSliderScore.getValue();
+    	}
     //	/**
     //	 * focus gained event
     //	 * @param event
     //	 */
     //	public void focusGained(FocusEvent e) {
     //		// nothing to do
     //
     //	}
     //
     //	/**
     //	 * focus lost event
     //	 * @param event
     //	 */
     //	public void focusLost(FocusEvent e) {
     //		String max = jTextMaxResults.getText().trim();
     //		int maxresults;
     //		try {
     //			maxresults = Integer.parseInt(max);
     //			if (maxresults < 1) {
     //				maxresults = 1;
     //				jTextMaxResults.setText(Integer.toString(maxresults));
     //				control.getPattern().getSettings().setResultsNumber(maxresults);
     //			}
     //			else{
     //				control.getPattern().getSettings().setResultsNumber(maxresults);
     //			}
     //		} catch (Exception ex) {
     //			jTextMaxResults.setText(Integer.toString(MAXRESULTS));
     //			jTextMaxResults.requestFocus();
     //		}
     //
     //	}
     	/**
     	 * key pressed event
+    	 *
     	 * @param e
     	 */
     	public void keyPressed(KeyEvent e) {
     		// TODO Auto-generated method stub
     		// nothing to do
+    	}
     	/**
     	 * key released event
+    	 *
     	 * @param e
     	 */
     	public void keyReleased(KeyEvent e) {
     		String max = jTextMaxResults.getText().trim();
     		int maxresults;
-...
     				maxresults = 1;
     				jTextMaxResults.setText(Integer.toString(maxresults));
     				control.getPattern().getSettings().setResultsNumber(maxresults);
+    			}
     			else{
     			} else {
     				control.getPattern().getSettings().setResultsNumber(maxresults);
+    			}
     		} catch (Exception ex) {
     		} catch (Exception ex) {
     			jTextMaxResults.setText(Integer.toString(MAXRESULTS));
     			jTextMaxResults.requestFocus();
+    		}
+    	}
     	/**
     	 * key typed event
+    	 *
     	 * @param e
     	 */
     	public void keyTyped(KeyEvent e) {

| gvSIG desktop 1

Revision 27564