/ - Diff - Application: gvSIG desktop - gvSIG

branches/v2_0_0_prep/extensions/extGazetteer/src/org/gvsig/gazetteer/gui/ConnectDialog.java
80	80	}
81	81
82	82	public static void addServer(ServerData server) {
83		ServerConnectDialogPanel.addTreeMapServer(server);
	83	addTreeMapServer(server);
84	84	}
85	85
86	86	/*

      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class GazetteerExtension extends Extension {
     //	private GazetteerLibrary gazetteerLibrary = null;
     //	private DefaultGazetteerLibrary defaultGazetteerLibrary = null;
     	public static void main(String[] args) {
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see com.iver.andami.plugins.Extension#inicializar()
     	 */
     	public void initialize() {
     //		gazetteerLibrary = new GazetteerLibrary();
     //		gazetteerLibrary.initialize();
     //
     //		defaultGazetteerLibrary = new DefaultGazetteerLibrary();
     //		defaultGazetteerLibrary.initialize();
     		registerIcons();
+    	}
-...
     				"images/GazzButton.png"));
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see com.iver.andami.plugins.Extension#postInitialize()
     	 */
     	public void postInitialize() {
     //		gazetteerLibrary.postInitialize();
     //		defaultGazetteerLibrary.postInitialize();
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see com.iver.andami.plugins.Extension#execute(java.lang.String)
     	 */
     	public void execute(String actionCommand) {
     		// JToolBar toolBar =
     		// (JToolBar)PluginServices.getMainFrame().getComponentByName("Catalogo");
     		// System.out.println("gjkmgbghb");
     		// for (int i=0 ; i<toolBar.getComponentCount() ; i++){
     		// System.out.println(((JButton)toolBar.getComponentAtIndex(i)).getName());
     		// }
     		actionConnectDialogStart();
+    	}
     	/**
+    	 *
+    	 *
     	 */
     	private void actionConnectDialogStart() {
     		System.out.println("Bot?n de Gazeteer pulsado");
     		restoreServerList();
-...
     	 * @return
     	 */
     	private ServerData[] getDefaultServers() {
     		ServerData[] servers = new ServerData[3];
     		ServerData[] servers = new ServerData[0];
     		Calendar cal = new GregorianCalendar();
     		Date date = cal.getTime();
     		servers[0] = new ServerData(
     				"http://middleware.alexandria.ucsb.edu/gaz/adlgaz/dispatch",
     				date, date, ServerData.SERVER_TYPE_GAZETTEER,
     				ServerData.SERVER_SUBTYPE_GAZETTEER_ADL);
     		servers[1] = new ServerData(
     				"http://demo.deegree.org:8080/gazetteer/wfs-g", date, date,
     				ServerData.SERVER_TYPE_GAZETTEER,
     				ServerData.SERVER_SUBTYPE_GAZETTEER_WFSG);
     		servers[2] = new ServerData(
     				"http://193.144.250.29/webservices/services/IDEC_GeoServeisPort",
     				date, date, ServerData.SERVER_TYPE_GAZETTEER,
     				ServerData.SERVER_SUBTYPE_GAZETTEER_IDEC);
     //		servers[0] = new ServerData(
     //				"httpdescargamedee://middleware.alexandria.ucsb.edu/gaz/adlgaz/dispatch",
     //				date, date, ServerData.SERVER_TYPE_GAZETTEER,
     //				ServerData.SERVER_SUBTYPE_GAZETTEER_ADL);
     //		servers[1] = new ServerData(
     //				"http://demo.deegree.org:8080/gazetteer/wfs-g", date, date,
     //				ServerData.SERVER_TYPE_GAZETTEER,
     //				ServerData.SERVER_SUBTYPE_GAZETTEER_WFSG);
     //		servers[2] = new ServerData(
     //				"http://delta.icc.es/webservices/services/IDEC_GeoServeisPort",
     //				date, date, ServerData.SERVER_TYPE_GAZETTEER,
     //				ServerData.SERVER_SUBTYPE_GAZETTEER_IDEC);
     		return servers;
+    	}
     	/*
     	 * (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() {
     		org.gvsig.andami.ui.mdiManager.IWindow f = PluginServices
     		.getMDIManager().getActiveWindow();

     	 * @return
     	 */
     	private ServerData[] getDefaultServers() {
     		ServerData[] servers = new ServerData[4];
     		ServerData[] servers = new ServerData[0];
     		Calendar cal = new GregorianCalendar();
     		Date date = cal.getTime();
     		servers[0] = new ServerData("http://delta.icc.es/indicio/csw", date, date, ServerData.SERVER_TYPE_CATALOG, ServerData.SERVER_SUBTYPE_CATALOG_CSW);
     		servers[1] = new ServerData("mapas.euitto.upm.es:2100", date, date, ServerData.SERVER_TYPE_CATALOG, ServerData.SERVER_SUBTYPE_CATALOG_Z3950);
     		servers[2] = new ServerData("193.43.36.137:2100", date, date, ServerData.SERVER_TYPE_CATALOG, ServerData.SERVER_SUBTYPE_CATALOG_Z3950);
     		servers[3] = new ServerData("http://idee.unizar.es/SRW/servlet/search/ExplainSOAP",date,date,ServerData.SERVER_TYPE_CATALOG,ServerData.SERVER_SUBTYPE_CATALOG_SRW);
     		//servers[0] = new ServerData("http://delta.icc.es/indicio/csw", date, date, ServerData.SERVER_TYPE_CATALOG, ServerData.SERVER_SUBTYPE_CATALOG_CSW);
     		//servers[1] = new ServerData("mapas.euitto.upm.es:2100", date, date, ServerData.SERVER_TYPE_CATALOG, ServerData.SERVER_SUBTYPE_CATALOG_Z3950);
     		//servers[2] = new ServerData("193.43.36.137:2100", date, date, ServerData.SERVER_TYPE_CATALOG, ServerData.SERVER_SUBTYPE_CATALOG_Z3950);
     		//servers[3] = new ServerData("http://idee.unizar.es/SRW/servlet/search/ExplainSOAP",date,date,ServerData.SERVER_TYPE_CATALOG,ServerData.SERVER_SUBTYPE_CATALOG_SRW);
     		return servers;
+    	}

     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class NotSupportedVersionException extends Exception{
     public class NotSupportedVersionException extends DiscoveryServiceException{
     	public NotSupportedVersionException(Throwable cause) {
     		super(cause);

     /* 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.
+     *
      */
     package org.gvsig.catalog.exceptions;
     import org.gvsig.tools.exception.BaseException;
     /**
      * @author gvSIG Team
      * @version $Id$
+     *
      */
     public class DiscoveryServiceException extends BaseException {
         private static final long serialVersionUID = -2033440799086244875L;
         private static final String MESSAGE =
             "Error connecting to a catalog service";
         private static final String KEY = "_CatalogException";
         /**
          * Constructor to be used in rare cases, usually you must create a new child
          * exception class for each case.
          * <strong>Don't use this constructor in child classes.</strong>
          */
         public DiscoveryServiceException() {
             super(MESSAGE, KEY, serialVersionUID);
+        }
         /**
          * Constructor to be used in rare cases, usually you must create a new child
          * exception class for each case.
          * <p>
          * <strong>Don't use this constructor in child classes.</strong>
          * </p>
+         *
          * @param cause
          *            the original cause of the exception
          */
         public DiscoveryServiceException(Throwable cause) {
             super(MESSAGE, cause, KEY, serialVersionUID);
+        }
         /**
          * @see BaseException#BaseException(String, String, long).
          * @param message
          *            the default messageFormat to describe the exception
          * @param key
          *            the key to use to search a localized messageFormnata
          * @param code
          *            the unique code to identify the exception
          */
         protected DiscoveryServiceException(String message, String key, long code) {
             super(message, key, code);
+        }
         /**
          * @see BaseException#BaseException(String, Throwable, String, long).
          * @param message
          *            the default messageFormat to describe the exception
          * @param cause
          *            the original cause of the exception
          * @param key
          *            the key to use to search a localized messageFormnata
          * @param code
          *            the unique code to identify the exception
          */
         protected DiscoveryServiceException(String message, Throwable cause,
             String key, long code) {
             super(message, cause, key, code);
+        }
+    }

     /**
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class NotSupportedProtocolException extends Exception {
     public class NotSupportedProtocolException extends DiscoveryServiceException {
         public NotSupportedProtocolException() {
             super();
+        }
     	public NotSupportedProtocolException(Throwable cause) {
     		super(cause);
+    	}

      * This exception indicates that the server is not ready
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class ServerIsNotReadyException extends Exception {
     public class ServerIsNotReadyException extends DiscoveryServiceException {
     	private static final long serialVersionUID = 397526568003318327L;
     	public ServerIsNotReadyException(Throwable cause) {

     import java.util.Collection;
     import org.apache.commons.httpclient.NameValuePair;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.catalog.metadataxml.XMLTree;
     import org.gvsig.remoteclient.utils.Utilities;
-...
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class HTTPGetProtocol implements IProtocols {
         private static final Logger LOG =
             LoggerFactory.getLogger(HTTPGetProtocol.class);
     	/**
+    	 *
+    	 *
-...
     					"catalog-", null);
     		} catch (Exception e) {
     			return null;
     		    LOG.error("Error sending the request", e);
     		    return null;
+    		}
     		Collection col = new java.util.ArrayList();

     /* 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
     */
+     *
      * 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 org.gvsig.catalog.protocols;
     import java.io.BufferedReader;
     import java.io.ByteArrayInputStream;
-...
     import org.apache.soap.messaging.Message;
     import org.apache.soap.transport.SOAPTransport;
     import org.apache.soap.util.xml.XMLParserUtils;
     import org.gvsig.catalog.metadataxml.XMLTree;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.w3c.dom.Document;
     import org.xml.sax.InputSource;
     import org.gvsig.catalog.metadataxml.XMLTree;
     /**
+     *
+     *
-...
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class SOAPProtocol implements IProtocols {
     /**
+     *
+     *
+     *
      * @return
      * @param url
      * @param object
      * @param firstRecord
      */
         public Collection doQuery(URL url, Object object, int firstRecord) {
         private static final Logger LOG =
             LoggerFactory.getLogger(SOAPProtocol.class);
         /**
          * @return
          * @param url
          * @param object
          * @param firstRecord
          */
         public Collection doQuery(URL url, Object object, int firstRecord) {
             String message = (String) object;
             File fileAnswer = null;
             //get the envelope to send
             try {
                 InputStream buffer = new ByteArrayInputStream(message.getBytes());
-...
                 Document doc = xdb.parse(new InputSource(buffer));
                 if (doc == null) {
                     throw new SOAPException(Constants.FAULT_CODE_CLIENT,
                         "parsing error");
                     "parsing error");
+                }
                 Envelope msgEnv = Envelope.unmarshall(doc.getDocumentElement());
                 // send the message
-...
                     fwAnswer.flush();
+                }
                 fwAnswer.close();
             } catch (Exception e) {
                 LOG.error("Error sending the SOAP request", e);
                 return null;
+            }
             Collection col = new java.util.ArrayList();
-...
             return col;
+        }
     /**
+     *
+     *
+     *
      * @return
      * @param url
      */
         /**
+         *
+         *
+         *
          * @return
          * @param url
          */
         public static boolean isProtocolSupported(URL url) {
             return true;
+        }
     /**
      * This function returns a SOAP message
+     *
+     *
      * @return
      * @param message the XML message
      * @param schemas
      */
         /**
          * This function returns a SOAP message
+         *
+         *
          * @return
          * @param message the XML message
          * @param schemas
          */
         public static String setSOAPMessage(String message, String[] schemas) {
             String soap =  "<SOAP:Envelope xmlns:SOAP=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
             	"xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" ;
             "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" ;
             if (schemas != null){
                 for (int i=0 ; i<schemas.length ; i++){
                     soap = soap + " " + schemas[i];
-...
             soap = soap + ">";
             soap = soap + "<SOAP:Body>" + message + "</SOAP:Body>" + "</SOAP:Envelope>";
             return soap;
+        }
+     }
+    }

     import java.net.URL;
     import java.util.Collection;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.catalog.metadataxml.XMLTree;
     import org.gvsig.catalog.utils.Strings;
-...
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class HTTPPostProtocol implements IProtocols {
     /**
      * @return
      * @param url
      * @param message
      * @param firstRecord
      */
         private static final Logger LOG =
             LoggerFactory.getLogger(HTTPPostProtocol.class);
         /**
          * @return
          * @param url
          * @param message
          * @param firstRecord
          */
         public Collection doQuery(URL url, Object message, int firstRecord) {
             String body = (String) message;
             ByteArrayInputStream output = null;
-...
             output = new ByteArrayInputStream(str.getBytes());
             }  catch (IOException e) {
                 // TODO Auto-generated catch block
                 //e.printStackTrace();
                 LOG.error("Error sending the POST request", e);
                 return null;
+            }
-...
         	}  catch (IOException e) {
         		e.printStackTrace();
         	    LOG.error("Error sending the POST request", e);
+        	}
+        }

     import java.util.Properties;
     import org.apache.commons.httpclient.HttpConnection;
     import org.gvsig.catalog.drivers.DiscoveryServiceCapabilities;
     import org.gvsig.catalog.drivers.IDiscoveryServiceDriver;
     import org.gvsig.catalog.exceptions.DiscoveryServiceException;
     import org.gvsig.catalog.exceptions.NotSupportedProtocolException;
     import org.gvsig.catalog.exceptions.NotSupportedVersionException;
     import org.gvsig.catalog.exceptions.ServerIsNotReadyException;
     import org.gvsig.catalog.querys.DiscoveryServiceQuery;
     import org.gvsig.catalog.ui.search.SearchAditionalPropertiesPanel;
     import org.gvsig.catalog.utils.URIUtils;
     import org.gvsig.utils.swing.jcomboServer.ServerData;
-...
     	 * @return the service version
     	 * @throws ServerIsNotReadyException
     	 */
     	public DiscoveryServiceCapabilities getCapabilities() throws ServerIsNotReadyException {
     	public DiscoveryServiceCapabilities getCapabilities() throws DiscoveryServiceException {
     		if (serverIsReady()){
     			try {
     				if (getDriver().isProtocolSupported(getUri())) {

     			setProtocol(server.getServiceSubType());
+    		}
+    	}
     	public void updateServerByProtocol(){
     	    IDiscoveryServiceDriver discoveryServiceDriver =
     	        (IDiscoveryServiceDriver)protocolCombo.getSelectedItem();
     	    if (discoveryServiceDriver != null){
     	        ServerData serverData = discoveryServiceDriver.getOneServer();
     	        if (serverData != null){
     	            serverCombo.setSelectedItem(serverData);
+    	        }
+    	    }
+    	}
     	/**
     	 * @return the selected server

     import java.net.URI;
     import org.gvsig.catalog.exceptions.DiscoveryServiceException;
     import org.gvsig.catalog.exceptions.NotSupportedProtocolException;
     import org.gvsig.catalog.exceptions.NotSupportedVersionException;
     import org.gvsig.catalog.querys.DiscoveryServiceQuery;
     import org.gvsig.catalog.ui.search.SearchAditionalPropertiesPanel;
     import org.gvsig.utils.swing.jcomboServer.ServerData;
-...
     	 * @return Node with the server answer.
     	 * @param uri Server URI
     	 */
     	public DiscoveryServiceCapabilities getCapabilities(URI uri) throws NotSupportedVersionException;
     	public DiscoveryServiceCapabilities getCapabilities(URI uri) throws DiscoveryServiceException;
     	/**
     	 * It have to prove if the specified protocol is supported.

     	protected String serversFile = "servers/GazetteerServers.txt";
     	protected String currentServer = "";
     	private ConnectThread connectThread = null;
     	protected boolean isUpdating = false;
     	/**
     	 * Constructor
-...
     	public void actionPerformed(ActionEvent e) {
     		if (e.getActionCommand().compareTo(CatalogConstants.CONNECT_BUTTON_ACTION_COMMAND)==0) {
     			connectButtonActionPerformed();
+    		}
     		if (e.getActionCommand().compareTo(CatalogConstants.SEARCH_BUTTON_ACTION_COMMAND)==0) {
     		}else if (e.getActionCommand().compareTo(CatalogConstants.SEARCH_BUTTON_ACTION_COMMAND)==0) {
     			searchButtonActionPerformed();
+    		}
     		if (e.getActionCommand().compareTo(CatalogConstants.CLOSE_BUTTON_ACTION_COMMAND)==0) {
     		}else if (e.getActionCommand().compareTo(CatalogConstants.CLOSE_BUTTON_ACTION_COMMAND)==0) {
     			closeButtonActionPerformed();
     		}else if (e.getActionCommand().compareTo(CatalogConstants.PROTOCOL_COMBO_ACTION_COMMAND)==0){
     		    if (!isUpdating){
     		        isUpdating = true;
     		        controlsPanel.updateServerByProtocol();
     		        isUpdating = false;
+    		    }
     		}else if (e.getActionCommand().compareTo(CatalogConstants.SERVER_COMBO_ACTION_COMMAND)==0) {
     		    if (!isUpdating){
     		        isUpdating = true;
     		        controlsPanel.updateProtocol();
     		        isUpdating = false;
+    		    }
+    		}
     		if (e.getActionCommand().compareTo(CatalogConstants.PROTOCOL_COMBO_ACTION_COMMAND)==0){
+    		}
     		if (e.getActionCommand().compareTo(CatalogConstants.SERVER_COMBO_ACTION_COMMAND)==0) {
     			controlsPanel.updateProtocol();
+    		}
+    	}
     	/**

Application: gvSIG desktop

Revision 37871