/ - Diff - | gvSIG desktop 1 - gvSIG

trunk/libraries/libRemoteServices/.classpath
2	2	<classpath>
3	3	<classpathentry kind="src" path="src"/>
4	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	5	<classpathentry combineaccessrules="false" kind="src" path="/FMap 03"/>
5	6	<classpathentry kind="output" path="bin"/>
6	7	</classpath>

trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/ArcImsClient.java
	1	package org.gvsig.remoteClient;
	2
	3	public class ArcImsClient implements ServiceClient{
	4
	5	}
0	6

trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/WFSClient.java
	1	package org.gvsig.remoteClient;
	2
	3	public class WFSClient implements ServiceClient {
	4
	5	}
0	6

     package org.gvsig.remoteClient.descriptor;
     import java.awt.geom.Rectangle2D;
     import java.util.TreeMap;
     import java.util.Vector;
     public class Layer
+    {
     		private TreeMap props = new TreeMap();
     		private Rectangle2D boundingBox;
     		private Layer parent = null;
     		private TreeMap layers = new TreeMap();
     		private Vector layerVector = new Vector();
     		/**
     		 * Crea una capa sin par?metros
     		 */
     		public Layer() {
     			setProperty("name", "");
+    		}
     		/**
     		 * Crea una capa con los par?metros b?sicos.
     		 * @param name
     		 * @param title
     		 * @param boundingBox
     		 */
     		public Layer(String name, String title, Rectangle2D boundingBox) {
     			super();
     			setProperty("name", name);
     			setProperty("title", title);
     			setLatLonBoundingBox(boundingBox);
+    		}
     		/**
     		 * @return Returns the name.
     		 */
     		public String getName() {
     			return (String) getProperty("name");
+    		}
     		/**
     		 * @param name The name to set.
     		 */
     		public void setName(String name) {
     			setProperty("name", name);
+    		}
     		/**
     		 * @return Returns the title.
     		 */
     		public String getTitle() {
     			return (String) getProperty("title");
+    		}
     		/**
     		 * @param title The title to set.
     		 */
     		public void setTitle(String title) {
     			setProperty("title", title);
+    		}
     		/**
     		 * @return Returns the boundingBox.
     		 */
     		public Rectangle2D getLatLonBoundingBox() {
     			return boundingBox;
+    		}
     		/**
     		 * @param boundingBox The boundingBox to set.
     		 */
     		public void setLatLonBoundingBox(Rectangle2D boundingBox) {
     			this.boundingBox = boundingBox;
+    		}
     		public void setProperty(String propName, Object value) {
     			props.put(propName, value);
+    		}
     		public Object getProperty(String propName) {
     			return props.get(propName);
+    		}
     		/**
     		 * @return Returns the layerTable.
     		 */
     		public TreeMap getLayerMap() {
     			return layers;
+    		}
     		public Vector getLayerVector() {
     			return layerVector;
+    		}
     		public boolean hasLayers() {
     			return layers.size() > 0;
+    		}
     		public void addLayer(Layer layer) {
     			layerVector.add(layer);
     			if (layer.getName().length()>0)
     				layers.put(layer.getName(), layer);
+    		}
     		public Layer getLayer(String layerName) {
     			return (Layer) layers.get(layerName);
+    		}
     		/**
     		 * @return Returns the parent.
     		 */
     		public Layer getParent() {
     			return parent;
+    		}
     		/**
     		 * @param parent The parent to set.
     		 */
     		public void setParent(Layer parent) {
     			this.parent = parent;
+    		}
+    	}

     package org.gvsig.remoteClient.descriptor;
     /**
      * Class that stores a WMS Capabilities description:
      *  - Layer list
      *  - General service information.
      * @author Laura Diaz
     */
     public class WMSCapabilities
+    {
     	private MapComposition mapComposition;
     	private ServiceInformation serviceInfo;
     	public MapComposition getMapComposition()
+    	{
     		return mapComposition;
+    	}
     	public ServiceInformation getServiceInformation()
+    	{
     		return serviceInfo;
+    	}
+    }

     package org.gvsig.remoteClient.descriptor;
     import java.util.TreeMap;
     /**
      * class for storing all the metadata asociated to a map composition (LayerList)
      * @author Laura Diaz
     */
     public class MapComposition
+    {
       protected int     m_ID;
       private TreeMap layers = new TreeMap();
       /**
        * Instance creation. Creates a nameless map composition.
        */
       public MapComposition()
+      {
+      }
       /**
        * returns the unique identifier from this mapComposition
        */
       public int getID()
+      {
         return m_ID;
+      }
       /**
        * Sets the unique identifier from this mapComposition
        */
       public void setID(int id)
+      {
         m_ID = id;
+      }
       /**
        * Adds a Layer object to the vector of layers of this mapComposition
        */
       public void addLayer(Layer layer)
+      {
         String layerName = layer.getName();
         if (layerName == null)
+        {
           throw new RuntimeException("Error: attempt to add a nameless layer");
+        }
         // We use the lower case version of the name as a key for the hash map.
         layerName = layerName.toLowerCase();
         layers.put(layerName, layer);
+      }
       /**
        * removes the vector of layers of this mapComposition
        */
       public void removeAllLayers()
+      {
         layers.clear();
+      }
       /**
        * checks if there are layers in this mapComposition
        * @return true if there are layers in the mapComposition
        */
       public boolean hasLayers()
+      {
         return ( layers.size() > 0 );
+      }
       /**
        * returns the number of layers the mapComposition
        */
       public int numberOfLayers()
+      {
         return layers.size();
+      }
      /**
       * returns the layer with this layerName in the mapComposition
       * @param String layerName the name of the required layer
       * @return Layer. the "first" Layer in this mapComposition with this layerName
       */
       public Layer getLayer(String layerName)
+      {
       	Layer layer;
       	if (layers.get(layerName) != null)
+      	{
           layers.get(layerName);
+      	}
         return null;
+      }
       /**
        * checks if there is a layer in the mapComposition with this name
        * @param layerName, name of the layer to be searched
        * @return true if a layer with this name exists in the mapComposition
        */
       public boolean containsLayer(String layerName)
+      {
         return (getLayer(layerName) != null);
+      }
+    }

     package org.gvsig.remoteClient.descriptor;
     /**
       * Class for storing all the general information of this Service
       * @author Laura Diaz
     */
     public class ServiceInformation
+    {
       static private String  m_name;
       static private String  m_scope;
       static private String  m_title;
       static private String  m_abstract;
       static private String  m_keywords;
       static private String  m_fees;
       static private String  m_operationsInfo;
       //all the contact person information
       static String m_personname = new String();
       static String m_organization = new String();
       static String m_function = new String();
       static String m_addresstype = new String();
       static String m_address = new String();
       static String m_place = new String();
       static String m_province = new String();
       static String m_postcode = new String();
       static String m_country = new String();
       static String m_phone = new String();
       static String m_fax =  new String();
       static String m_email = new String();
       // TODO: Add all the supported formats...
      /**
       * returns the name of this server
       */
       public static String getName()
+      {
         if(m_name == null)
+        {
           return "";
+        }
         else
+        {
           return m_name;
+        }
+      }
      /**
       * Sets the name of this service
       */
       public static void setName(String name)
+      {
         m_name = name;
+      }
      /**
       * returns the scope of this service
       */
       public static String getScope()
+      {
         if(m_scope == null)
+        {
           return "";
+        }
         else
+        {
           return m_scope;
+        }
+      }
      /**
       * Sets the scope of this service
       */
       public static void setScope(String scope)
+      {
         m_scope = scope;
+      }
      /**
       * returns the title of this service
       */
       public static String getTitle()
+      {
         if(m_title == null)
+        {
           return "";
+        }
         else
+        {
           return m_title;
+        }
+      }
      /**
       * Sets the title of this service
       */
       public static void setTitle(String title)
+      {
         m_title = title;
+      }
      /**
       * returns the abstract of this service
       */
       public static String getAbstract()
+      {
         if(m_abstract == null)
+        {
           return "";
+        }
         else
+        {
           return m_abstract;
+        }
+      }
      /**
       * Sets the abstract of this service
       */
       public static void setAbstract(String abstrac)
+      {
         m_abstract = abstrac;
+      }
      /**
       * returns the keywords of this service
       */
       public static String getKeywords()
+      {
         if(m_keywords == null)
+        {
           return "";
+        }
         else
+        {
           return m_keywords;
+        }
+      }
      /**
       * Sets the keywords of this service
       */
       public static void setKeywords(String keywords)
+      {
         m_keywords = keywords;
+      }
      /**
       * returns the fees of this service
       */
       public static String getFees()
+      {
         if(m_fees == null)
+        {
           return "";
+        }
         else
+        {
           return m_fees;
+        }
+      }
      /**
       * Sets the fees of this service
       */
       public static void setFees(String fees)
+      {
         m_fees = fees;
+      }
      /**
       * returns the operationsInfo of this service
       */
       public static String getOperationsInfo()
+      {
         if(m_operationsInfo == null)
+        {
           return "";
+        }
         else
+        {
           return m_operationsInfo;
+        }
+      }
      /**
       * Sets the operationsInfo of this service
       */
       public static void setOperationsInfo(String operationsInfo)
+      {
         m_operationsInfo = operationsInfo;
+      }
       //All the methods for the Service contact Information
      /**
       * Sets the Contact person in this service
       */
        public static void setContactPerson (String name)
+      {
         m_personname = name;
+      }
      /**
       * Returns the Contact person in this service
       */
       public static String getContactPerson ()
+      {
         if(m_personname == null)
+        {
           return "";
+        }
         else
+        {
           return m_personname;
+        }
+      }
     /**
       * Sets the Contact person function in this service
       */
       public static void setContactPersonFunction(String function)
+      {
         m_function = function;
+      }
      /**
       * Returns the Contact person function in this service
       */
       public static String getContactPersonFunction ()
+      {
         if(m_function == null)
+        {
           return "";
+        }
         else
+        {
           return m_function;
+        }
+      }
      /**
       * Sets the Contact person phone in this service
       */
       public static void setContactPersonPhone(String phone)
+      {
         m_phone = phone;
+      }
      /**
       * Returns the Contact person phone in this service
       */
       public static String getContactPersonPhone ()
+      {
         if(m_phone == null)
+        {
           return "";
+        }
         else
+        {
           return m_phone;
+        }
+      }
      /**
       * Sets the Contact person fax in this service
       */
       public static void setContactPersonFax(String fax)
+      {
         m_fax = fax;
+      }
      /**
       * Returns the Contact person fax in this service
       */
       public static String getContactPersonFax ()
+      {
         if(m_fax == null)
+        {
           return "";
+        }
         else
+        {
           return m_fax;
+        }
+      }
      /**
       * Sets the Contact person email in this service
       */
       public static void setContactPersonEmail(String email)
+      {
         m_email = email;
+      }
      /**
       * Returns the Contact person email in this service
       */
       public static String getContactPersonEmail ()
+      {
         if(m_email == null)
+        {
           return "";
+        }
         else
+        {
           return m_email;
+        }
+      }
      /**
       * Sets the Contact Organization in this service
       */
       public static void setContactOrganization(String organization)
+      {
         m_organization = organization;
+      }
      /**
       * Returns the Contact Organization in this service
       */
       public static String getContactOrganization ()
+      {
         if(m_organization == null)
+        {
           return "";
+        }
         else
+        {
           return m_organization;
+        }
+      }
      /**
       * Sets the Contact address type in this service
       */
       public static void setContactAddressType(String type)
+      {
         m_addresstype = type;
+      }
      /**
       * Returns the Contact address type in this service
       */
       public static String getContactAddressType()
+      {
         if(m_addresstype ==null)
+        {
           return "";
+        }
         else
+        {
           return m_addresstype;
+        }
+      }
      /**
       * Sets the Contact address in this service
       */
       public static void setContactAddress(String address)
+      {
         m_address = address;
+      }
      /**
       * Returns the Contact address in this service
       */
       public static String getContactAddress()
+      {
         if(m_address == null)
+        {
           return "";
+        }
         else
+        {
           return m_address;
+        }
+      }
      /**
       * Sets the Contact place in this service
       */
       public static void setContactPlace(String place)
+      {
         m_place = place;
+      }
      /**
       * Returns the Contact place in this service
       */
       public static String getContactPlace()
+      {
         if(m_place == null)
+        {
           return "";
+        }
         else
+        {
           return m_place;
+        }
+      }
      /**
       * Sets the Contact province in this service
       */
       public static void setContactProvince(String province)
+      {
         m_province = province;
+      }
      /**
       * Returns the Contact province in this service
       */
       public static String getContactProvince()
+      {
         if(m_province == null)
+        {
           return "";
+        }
         else
+        {
           return m_province;
+        }
+      }
      /**
       * Sets the Contact postCode in this service
       */
       public static void setContactPostCode(String code)
+      {
         m_postcode = code;
+      }
     /**
       * Returns the Contact postcode in this service
       */
       public static String getContactPostCode()
+      {
         if(m_postcode == null)
+        {
           return "";
+        }
         else
+        {
           return m_postcode;
+        }
+      }
      /**
       * Sets the Contact country in this service
       */
       public static void setContactCountry(String country)
+      {
         m_country = country;
+      }
      /**
       * returns the Contact country in this service
       */
       public static String getContactCountry()
+      {
         if(m_country == null)
+        {
           return "";
+        }
         else
+        {
           return m_country;
+        }
+      }
+    }

     package org.gvsig.remoteClient;
     /**
      * Interface with the methods that give support to remote Service?s clients
      * @author Laura Diaz
     */
     public interface ServiceClient {
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+    *
     * Copyright (C) 2005 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.remoteClient;
     import java.io.IOException;
     import java.util.ArrayList;
     import org.gvsig.remoteClient.driver.RemoteServiceDriver;
     import org.gvsig.remoteClient.driver.wms.WMSDriver;
     import org.gvsig.remoteClient.exception.ServerOutOfOrderException;
     import org.gvsig.remoteClient.exception.UnsupportedVersionException;
     import org.gvsig.remoteClient.exception.WMSException;
     import com.iver.cit.gvsig.fmap.DriverException;
     /**
      * Class that describes a Client interface to a OGC Web Mapping Service
      * @author Jaume
      * @author Laura Diaz
     */
     public class WMSClient extends RemoteServiceDriver implements ServiceClient
+    {
     	WMSDriver wms;
     	public String getName() { return "WMSDriver"; }
     	/**
     	 * Sets the server that we want to connect to.
     	 * Establece el servidor al que se quiere conectar.
     	 * @param host
     	 */
     	public void setHost(String host){
     		super.setHost(host);
     		setServiceName("WMS");
+    	}
     	/**
     	 * Sends the GetCapabilities operation to the server.
     	 * Env?a la operaci?n GetCapabilities al servidor.
     	 * @throws ServerOutOfOrderException
     	 */
     	public void getCapabilities()
     		throws ServerOutOfOrderException, IOException, UnsupportedVersionException {
     		wms.getCapabilities();
+    	}
     	public void getMap()
     	throws IOException, NoSuchFieldException, WMSException {
     		wms.getMap();
+    	}
     	public void getFeatureInfo()
     	throws IOException, NoSuchFieldException, WMSException {
     		wms.getFeatureInfo();
+    	}
     	/**
     	 * Returns the server's name. The string is extracted from the GetCapabilities
     	 * response.
     	 * Devuelve el nombre del servidor indicado por ?ste.
     	 * @return String
     	 */
     	public String getServerName(){
     		return "";
+    	}
     	/**
     	 * Returns a string containing the server's WMS version number.
     	 * Devuelve el n?mero de versi?n WMS del servidor
     	 * @return String
     	 */
     	public String getVersion(){
     		return ""; //wms.getCapabilities().getVersion;
+    	}
     	/**
     	 * Returns name and description of the server. It is supposed to be used
     	 * as the source of the abstract field in your application's interface.
     	 * Devuelve nombre y descripci?n (abstract) del servidor.
     	 * @return String
     	 */
     	public String getDescription(){
     		String name="";//wms.getCapabilities().getServiceName();
     		String description = ""; //wms.getCapabilities().getServiceDescription();
     		if ( (name == null) && (description == null) ) return "Sin descripci?n";
     		else if ( (name != null) && (description == null) ) return name;
     		else if ( (name == null) && (description != null) ) return description;
     		else if ( (name != null) && (description != null) ) return name+"\n\n"+description;
     		else return null;
+    	}
     	/**
     	 * Returns a list containing the formats supported by the coverage
     	 * Devuelve una lista de formatos soportados por la cobertura.
     	 * @param coverage
     	 * @return ArrayList
     	 */
     	public ArrayList getFormats(){
     		return wms.getFormats();
     		//return null;//wms.getCapabilities().getFormats();
+    	}
     	public String[] getLayerNames(){
     		return wms.getLayerNames();
     		//return null;
+    	}
     	/**
     	 * Returns the number of layers at the server.
     	 * Devuelve el numero de layers en el servidor
     	 * @return int
     	 */
     	public int getNumOfLayers(){
     		return getLayerNames().length;
+    	}
     	public void close()
     	{}
     	public void connect() throws IOException, DriverException {
     		//wms.getCapabilities();
     		//wms = new WMSClient(getHost()); //
     		try {
     			wms.getCapabilities();
     			setConnected(true);
     		} catch (Exception e) {
     			throw new DriverException(e);
+    		}
+    	}
+    }

     import java.io.IOException;
     import org.gvsig.remoteClient.cat.WMSCapabilities;
     import org.gvsig.remoteClient.descriptor.WMSCapabilities;
     import org.gvsig.remoteClient.driver.wms.WMSDriver;
     import org.gvsig.remoteClient.exception.UnsupportedVersionException;
     import org.gvsig.remoteClient.exception.WMSException;

     import java.io.IOException;
     import java.util.ArrayList;
     import org.gvsig.remoteClient.cat.WMSCapabilities;
     import org.gvsig.remoteClient.descriptor.WMSCapabilities;
     import org.gvsig.remoteClient.driver.RemoteServiceDriver;
     import org.gvsig.remoteClient.exception.*;
     import org.gvsig.remoteClient.request.wms.GetCapabilitiesRequest;

| gvSIG desktop 1

Revision 2991