/ - Diff - | gvSIG desktop 1 - gvSIG

     					tooltip="catalog_search"/>
     			</tool-bar>
     		</extension>
     		<extension class-name="es.gva.cit.gvsig.catalogClient.gazetteer.GazetteerModule"
     		<extension class-name="es.gva.cit.gvsig.gazetteer.GazetteerModule"
     			description="M?dulo de Gazetteer."
     			active="true"
     			priority="2">

     			xml = new XMLEntity();
     		if (!xml.contains("cat-servers")) {
     			String[] servers = new String[5];
     			String[] servers = new String[6];
     			servers[5] = "http://localhost:2100";
     			servers[4] = "http://delta.icc.es/indicio/csw";
     			servers[3] = "sercartlin:2100";
     			servers[2] = "mapas.euitto.upm.es:2100";

     import com.iver.andami.PluginServices;
     import com.iver.andami.ui.mdiManager.View;
     import com.iver.andami.ui.mdiManager.ViewInfo;
     import com.iver.utiles.NotExistInXMLEntity;
     import com.iver.utiles.XMLEntity;
     import es.gva.cit.catalogClient.ui.ServerConnectDialogPanel;
-...
     	private void init() {
     		this.setBounds(0, 0, 630, 260);
     		setName("connectDialog");
     		getConnectButton().addActionListener(this);
     		getSearchButton().addActionListener(new java.awt.event.ActionListener() {
                 public void actionPerformed(java.awt.event.ActionEvent evt) {
-...
+    	}
     	public void searchButtonActionPerformed() {
             closeJDialog();
     	    addHost(getCliente().getUrl().toString());
     	    closeJDialog();
     		SearchDialog dialog = new SearchDialog();
     		dialog.setCatalogClient(getCliente());
     		dialog.setBounds(0, 0, 675, 490);
-...
     		PluginServices.getMDIManager().addView(dialog);
+    	}
     	 public void addHost(String host){
     	        host = host.trim();
     	        PluginServices ps = PluginServices.getPluginServices(this);
     			XMLEntity xml = ps.getPersistentXML();
     			try {
     				String[] servers = xml.getStringArrayProperty("cat-servers");
     				String[] newServers = new String[servers.length + 1];
     				System.arraycopy(servers, 0, newServers, 0, servers.length);
     				newServers[servers.length] = host;
     				xml.putProperty("cat-servers", newServers);
     			} catch (NotExistInXMLEntity e) {
     					xml.putProperty("cat-servers", new String[] { host });
+    			}
     			ps.setPersistentXML(xml);
+    	    }
     	/**
     	 * Cierra el Dialog
     	 */

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+    *
     * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+    *
     * For more information, contact:
+    *
     *  Generalitat Valenciana
     *   Conselleria d'Infraestructures i Transport
     *   Av. Blasco Ib??ez, 50
     *   46010 VALENCIA
     *   SPAIN
+    *
     *      +34 963862235
     *   gvsig@gva.es
     *      www.gvsig.gva.es
+    *
     *    or
+    *
     *   IVER T.I. S.A
     *   Salamanca 50
     *   46005 Valencia
     *   Spain
+    *
     *   +34 963163400
     *   dac@iver.es
     */
     package es.gva.cit.gvsig.gazetteer;
     import com.iver.andami.PluginServices;
     import com.iver.andami.plugins.Extension;
     import com.iver.cit.gvsig.gui.View;
     import com.iver.utiles.NotExistInXMLEntity;
     import com.iver.utiles.XMLEntity;
     import es.gva.cit.gvsig.gazetteer.gui.ConnectDialog;
     /**
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class GazetteerModule implements Extension{
         public static void main(String[] args) {
+        }
         /* (non-Javadoc)
          * @see com.iver.andami.plugins.Extension#inicializar()
          */
         public void inicializar() {
             System.out.println("A?ado GazetteerModule");
+        }
         /* (non-Javadoc)
          * @see com.iver.andami.plugins.Extension#execute(java.lang.String)
          */
         public void execute(String actionCommand) {
             actionConnectDialogStart();
+        }
         private void actionConnectDialogStart() {
     		System.out.println("Bot?n de Gazeteer pulsado");
     		restoreServerList();
     		ConnectDialog connectDialog = new ConnectDialog();
     		PluginServices.getMDIManager().addView(connectDialog);
+    	}
         public void restoreServerList() {
     		XMLEntity xml = PluginServices.getPluginServices(this)
     		.getPersistentXML();
     		if (xml == null)
     			xml = new XMLEntity();
     		if (!xml.contains("gaz-servers")) {
     			String[] servers = new String[1];
     			servers[0] = "http://sercartlin:8080/geoserver/wfs";
     			xml.putProperty("gaz-servers", servers);
+    		}
     		try {
     			String[] servers = xml.getStringArrayProperty("gaz-servers");
     			for (int i = 0; i < servers.length; i++) {
     				ConnectDialog.addServer(servers[i]);
+    			}
     		} catch (NotExistInXMLEntity e) {
+    		}
+    	}
         /* (non-Javadoc)
          * @see com.iver.andami.plugins.Extension#isEnabled()
          */
         public boolean isEnabled() {
             return true;
+        }
         /* (non-Javadoc)
          * @see com.iver.andami.plugins.Extension#isVisible()
          */
         public boolean isVisible() {
             com.iver.andami.ui.mdiManager.View f = PluginServices.getMDIManager()
     		.getActiveView();
     		if (f == null) {
     			return false;
+    		}
     		return (f.getClass() == View.class);
+        }
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+    *
     * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+    *
     * For more information, contact:
+    *
     *  Generalitat Valenciana
     *   Conselleria d'Infraestructures i Transport
     *   Av. Blasco Ib??ez, 50
     *   46010 VALENCIA
     *   SPAIN
+    *
     *      +34 963862235
     *   gvsig@gva.es
     *      www.gvsig.gva.es
+    *
     *    or
+    *
     *   IVER T.I. S.A
     *   Salamanca 50
     *   46005 Valencia
     *   Spain
+    *
     *   +34 963163400
     *   dac@iver.es
     */
     package es.gva.cit.gvsig.gazetteer.gui;
     import com.iver.andami.PluginServices;
     import com.iver.andami.ui.mdiManager.View;
     import com.iver.andami.ui.mdiManager.ViewInfo;
     import es.gva.cit.gazetteer.GazetteerClient;
     import es.gva.cit.gazetteer.querys.Feature;
     import es.gva.cit.gazetteer.ui.ShowResultsDialogPanel;
     import es.gva.cit.gvsig.gazetteer.loaders.FeatureLoader;
     /**
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class ShowResultsDialog extends ShowResultsDialogPanel implements View  {
         /**
          * @param client
          * @param features
          * @param recordsByPage
          */
         public ShowResultsDialog(GazetteerClient client, Feature[] features, int recordsByPage) {
             super(client, features, recordsByPage);
+        }
           /* (non-Javadoc)
          * @see com.iver.andami.ui.mdiManager.View#getViewInfo()
          */
         public ViewInfo getViewInfo() {
             ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG);
     		m_viewinfo.setTitle(PluginServices.getText(this, "gazetteer_search"));
     		return m_viewinfo;
+        }
         public void closeButtonActionPerformed() {
     	     closeJDialog();
+    	 }
        public void closeJDialog() {
     		setVisible(true);
     		PluginServices.getMDIManager().closeView(ShowResultsDialog.this);
+    	}
        /**
         * This method have to load the selected feature into gvSIG
         */
        public void loadButtonActionPerformed() {
            Feature feature = ppalPanel.getFeature();
            if (feature != null){
                new FeatureLoader().load(feature);
+           }
+       }
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+    *
     * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+    *
     * For more information, contact:
+    *
     *  Generalitat Valenciana
     *   Conselleria d'Infraestructures i Transport
     *   Av. Blasco Ib??ez, 50
     *   46010 VALENCIA
     *   SPAIN
+    *
     *      +34 963862235
     *   gvsig@gva.es
     *      www.gvsig.gva.es
+    *
     *    or
+    *
     *   IVER T.I. S.A
     *   Salamanca 50
     *   46005 Valencia
     *   Spain
+    *
     *   +34 963163400
     *   dac@iver.es
     */
     package es.gva.cit.gvsig.gazetteer.gui;
     import com.iver.andami.PluginServices;
     import com.iver.andami.ui.mdiManager.View;
     import com.iver.andami.ui.mdiManager.ViewInfo;
     import es.gva.cit.gazetteer.GazetteerClient;
     import es.gva.cit.gazetteer.querys.Feature;
     import es.gva.cit.gazetteer.ui.SearchDialogPanel;
     /**
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class SearchDialog extends SearchDialogPanel
     implements View {
         public SearchDialog(GazetteerClient client){
             super(client);
+        }
         /* (non-Javadoc)
          * @see com.iver.andami.ui.mdiManager.View#getViewInfo()
          */
         public ViewInfo getViewInfo() {
             ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG);
     		m_viewinfo.setTitle(PluginServices.getText(this, "gazetteer_search"));
     		return m_viewinfo;
+        }
         public void ShowResultsActionPerformed(Feature[] features) {
             closeJDialog();
     		ShowResultsDialog dialog = new ShowResultsDialog(client,features,controlsPanel.getNPaginas());
     		dialog.setBounds(0, 0, 625, 292);
     		dialog.setName(PluginServices.getText(this, "gazetteer_search"));
     		dialog.setVisible(true);
     		PluginServices.getMDIManager().addView(dialog);
+        }
         public void closeButtonActionPerformed() {
     	     closeJDialog();
+    	 }
         public void closeJDialog() {
     		setVisible(true);
     		PluginServices.getMDIManager().closeView(SearchDialog.this);
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+    *
     * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+    *
     * For more information, contact:
+    *
     *  Generalitat Valenciana
     *   Conselleria d'Infraestructures i Transport
     *   Av. Blasco Ib??ez, 50
     *   46010 VALENCIA
     *   SPAIN
+    *
     *      +34 963862235
     *   gvsig@gva.es
     *      www.gvsig.gva.es
+    *
     *    or
+    *
     *   IVER T.I. S.A
     *   Salamanca 50
     *   46005 Valencia
     *   Spain
+    *
     *   +34 963163400
     *   dac@iver.es
     */
     package es.gva.cit.gvsig.gazetteer.gui;
     import com.iver.andami.PluginServices;
     import com.iver.andami.ui.mdiManager.View;
     import com.iver.andami.ui.mdiManager.ViewInfo;
     import com.iver.utiles.NotExistInXMLEntity;
     import com.iver.utiles.XMLEntity;
     import es.gva.cit.gazetteer.ui.ServerConnectDialogPanel;
     /**
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class ConnectDialog extends ServerConnectDialogPanel
     implements View {
         /**
          * Building the dialog Window
          */
         public ConnectDialog(/*FLayers layers, MapControl mapCtrl*/) {
     		super();
     		init();
     		getConnectButton().addActionListener(this);
     		getSearchButton().addActionListener(this);
+    	}
         /**
          * Establishing window properties
+         *
          */
         private void init() {
     		this.setBounds(0, 0, 630, 260);
     		setName("connectDialog");
+        }
         public static void addServer(String name) {
     		ServerConnectDialogPanel.addServer(name);
+        }
         public void searchButtonActionPerformed() {
             addHost(client.getUrl().toString());
             closeJDialog();
     		SearchDialog dialog = new SearchDialog(client);
     		dialog.setBounds(0, 0, 675, 490);
     		dialog.setName(PluginServices.getText(this, "gazetteer_search")+" ["+getCurrentServer()+"]");
     		dialog.setVisible(true);
     		PluginServices.getMDIManager().addView(dialog);
+    	}
         public void addHost(String host){
             host = host.trim();
             PluginServices ps = PluginServices.getPluginServices(this);
     		XMLEntity xml = ps.getPersistentXML();
     		try {
     			String[] servers = xml.getStringArrayProperty("gaz-servers");
     			String[] newServers = new String[servers.length + 1];
     			System.arraycopy(servers, 0, newServers, 0, servers.length);
     			newServers[servers.length] = host;
     			xml.putProperty("gaz-servers", newServers);
     		} catch (NotExistInXMLEntity e) {
     				xml.putProperty("gaz-servers", new String[] { host });
+    		}
     		ps.setPersistentXML(xml);
+        }
     	/**
     	 * Cierra el Dialog
     	 */
     	public void closeJDialog() {
     		setVisible(false);
     		PluginServices.getMDIManager().closeView(ConnectDialog.this);
+    	}
     	/* (non-Javadoc)
     	 * @see com.iver.andami.ui.mdiManager.View#getViewInfo()
     	 */
     	public ViewInfo getViewInfo() {
     		ViewInfo m_viewinfo=new ViewInfo(ViewInfo.MODALDIALOG);
     		m_viewinfo.setTitle(PluginServices.getText(this, "gazetteer_connect"));
     	return m_viewinfo;
+    	}
     	// Anula la asignaci?n de Listeners del cliente 'Stand-alone'
     	public void setDefaultButtonListeners() {
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+    *
     * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+    *
     * For more information, contact:
+    *
     *  Generalitat Valenciana
     *   Conselleria d'Infraestructures i Transport
     *   Av. Blasco Ib??ez, 50
     *   46010 VALENCIA
     *   SPAIN
+    *
     *      +34 963862235
     *   gvsig@gva.es
     *      www.gvsig.gva.es
+    *
     *    or
+    *
     *   IVER T.I. S.A
     *   Salamanca 50
     *   46005 Valencia
     *   Spain
+    *
     *   +34 963163400
     *   dac@iver.es
     */
     package es.gva.cit.gvsig.gazetteer.loaders;
     import com.iver.cit.gvsig.fmap.layers.FLayer;
     import es.gva.cit.gazetteer.querys.Feature;
     import es.gva.cit.gvsig.catalogClient.loaders.AbstractLoader;
     /**
      * This class is used to load a new feature like a layer in gvSIG
+     *
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class FeatureLoader extends AbstractLoader{
         /**
          * It loads a new Layer into gvSIG
          * @param feature
          * @return
          */
         public boolean load(Feature feature) {
     		try {
     			FLayer flayer = createFeatureLayer(feature);
     		    if (flayer == null){
     		        return false;
     		    }else{
     		        addLayerToView(flayer);
     		        return true;
+    		    }
     		} catch (Exception e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
     		return false;
+    	}
         /**
          * It creates the new Feature layer into gvSIG
          * @param feature
          * Feature to load
          * @return
          */
         private FLayer createFeatureLayer(Feature feature) {
             return null;
+    	}
+    }

       <property name="dist"  location="dist"/>
       <property name="mainplugin" value="com.iver.cit.gvsig"/>
       <property name="plugin" value="es.gva.cit.gvsig.catalogClient"/>
       <property name="pluginGaz" value="es.gva.cit.gvsig.gazetteer"/>
       <property name="gvsiglibjar" value="gvsig-catalogClient"/>
       <property name="extensionDir" location="../Andami/gvSIG/extensiones"/>
       <property name="catProtoDir" value="../CatalogClientPrototype"/>
       <property name="remoteMapClientsDir" value="../Cq RemoteMapClients"/>
       <property name="wfsDir" value="../gvSIG_WFS"/>
       <property name="postgisDir" value="../gvSIG_JDBC"/>
       <target name="init">
         <!-- Create the time stamp -->
-...
       	<jar jarfile="${dist}/lib/wfsClient.jar" basedir="${wfsDir}/bin"/>
       	<jar jarfile="${dist}/lib/postgis.jar" basedir="${postgisDir}/bin"/>
       	<jar jarfile="${dist}/lib/${plugin}.jar" basedir="${build}" includes="es/gva/cit/gvsig/catalogClient/**"/>
         <!--jar jarfile="${dist}/${gvsiglibjar}.jar" basedir="${build}" includes="com/iver/cit/gvsig/gui/**"/-->
       	<jar jarfile="${dist}/lib/${pluginGaz}.jar" basedir="${build}" includes="es/gva/cit/gvsig/gazetteer/**"/>
       	<!--jar jarfile="${dist}/${gvsiglibjar}.jar" basedir="${build}" includes="com/iver/cit/gvsig/gui/**"/-->
        	<copy file="config/config.xml" todir="${dist}"/>
         <copy file="config/plugin.dtd" todir="${dist}"/>
         <copy todir="${dist}">

| gvSIG desktop 1

Revision 2966