[Magicmap-commits] magicmapclient/src/net/sf/magicmap/server/dto MapDTO.java,1.1,1.2 AccessPointDTO.java,1.1,1.2 PositionDTO.java,1.1,1.2 SignalCharacterDTO.java,1.1,1.2 SimpleScanResultDTO.java,1.2,1.3 ClientDTO.java,1.1,1.2

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/server/dto

Modified Files:
	MapDTO.java AccessPointDTO.java PositionDTO.java 
	SignalCharacterDTO.java SimpleScanResultDTO.java 
	ClientDTO.java 
Log Message:
+ Client is usable without server

Index: ClientDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/ClientDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientDTO.java	12 Feb 2005 16:00:28 -0000	1.1
--- ClientDTO.java	11 May 2005 10:51:30 -0000	1.2
***************
*** 8,186 ****
  package net.sf.magicmap.server.dto;
  
! public class ClientDTO  implements java.io.Serializable {
!     private java.lang.Long id;
!     private java.lang.String mac;
!     private java.lang.String name;
! 
!     public ClientDTO() {
!     }
  
!     public ClientDTO(
!            java.lang.Long id,
!            java.lang.String mac,
!            java.lang.String name) {
!            this.id = id;
!            this.mac = mac;
!            this.name = name;
!     }
  
  
!     /**
!      * Gets the id value for this ClientDTO.
!      * 
!      * @return id
!      */
!     public java.lang.Long getId() {
!         return id;
!     }
  
  
!     /**
!      * Sets the id value for this ClientDTO.
!      * 
!      * @param id
!      */
!     public void setId(java.lang.Long id) {
!         this.id = id;
!     }
  
  
!     /**
!      * Gets the mac value for this ClientDTO.
!      * 
!      * @return mac
!      */
!     public java.lang.String getMac() {
!         return mac;
!     }
  
  
!     /**
!      * Sets the mac value for this ClientDTO.
!      * 
!      * @param mac
!      */
!     public void setMac(java.lang.String mac) {
!         this.mac = mac;
!     }
  
  
!     /**
!      * Gets the name value for this ClientDTO.
!      * 
!      * @return name
!      */
!     public java.lang.String getName() {
!         return name;
      }
  
  
!     /**
!      * Sets the name value for this ClientDTO.
!      * 
!      * @param name
!      */
!     public void setName(java.lang.String name) {
!         this.name = name;
      }
! 
!     private java.lang.Object __equalsCalc = null;
!     public synchronized boolean equals(java.lang.Object obj) {
!         if (!(obj instanceof ClientDTO)) return false;
!         ClientDTO other = (ClientDTO) obj;
!         if (obj == null) return false;
!         if (this == obj) return true;
!         if (__equalsCalc != null) {
!             return (__equalsCalc == obj);
!         }
!         __equalsCalc = obj;
!         boolean _equals;
!         _equals = true && 
!             ((this.id==null && other.getId()==null) || 
!              (this.id!=null &&
!               this.id.equals(other.getId()))) &&
!             ((this.mac==null && other.getMac()==null) || 
!              (this.mac!=null &&
!               this.mac.equals(other.getMac()))) &&
!             ((this.name==null && other.getName()==null) || 
!              (this.name!=null &&
!               this.name.equals(other.getName())));
!         __equalsCalc = null;
!         return _equals;
      }
! 
!     private boolean __hashCodeCalc = false;
!     public synchronized int hashCode() {
!         if (__hashCodeCalc) {
!             return 0;
!         }
!         __hashCodeCalc = true;
!         int _hashCode = 1;
!         if (getId() != null) {
!             _hashCode += getId().hashCode();
!         }
!         if (getMac() != null) {
!             _hashCode += getMac().hashCode();
!         }
!         if (getName() != null) {
!             _hashCode += getName().hashCode();
!         }
!         __hashCodeCalc = false;
!         return _hashCode;
      }
  
!     // Type metadata
!     private static org.apache.axis.description.TypeDesc typeDesc =
!         new org.apache.axis.description.TypeDesc(ClientDTO.class, true);
  
!     static {
!         typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO"));
!         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("id");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("mac");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "mac"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("name");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "name"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!         typeDesc.addFieldDesc(elemField);
!     }
  
!     /**
!      * Return type metadata object
!      */
!     public static org.apache.axis.description.TypeDesc getTypeDesc() {
!         return typeDesc;
!     }
  
!     /**
!      * Get Custom Serializer
!      */
!     public static org.apache.axis.encoding.Serializer getSerializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanSerializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
!     /**
!      * Get Custom Deserializer
!      */
!     public static org.apache.axis.encoding.Deserializer getDeserializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanDeserializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
! }
--- 8,165 ----
  package net.sf.magicmap.server.dto;
  
! public class ClientDTO implements java.io.Serializable {
  
!   private java.lang.Long   id;
!   private java.lang.String mac;
!   private java.lang.String name;
  
+   public ClientDTO() {}
  
!   public ClientDTO(java.lang.Long id, java.lang.String mac, java.lang.String name) {
!     this.id = id;
!     this.mac = mac;
!     this.name = name;
!   }
  
+   /**
+    * Gets the id value for this ClientDTO.
+    * 
+    * @return id
+    */
+   public java.lang.Long getId(){
+     return id;
+   }
  
!   /**
!    * Sets the id value for this ClientDTO.
!    * 
!    * @param id
!    */
!   public void setId(java.lang.Long id){
!     this.id = id;
!   }
  
+   /**
+    * Gets the mac value for this ClientDTO.
+    * 
+    * @return mac
+    */
+   public java.lang.String getMac(){
+     return mac;
+   }
  
!   /**
!    * Sets the mac value for this ClientDTO.
!    * 
!    * @param mac
!    */
!   public void setMac(java.lang.String mac){
!     this.mac = mac;
!   }
  
+   /**
+    * Gets the name value for this ClientDTO.
+    * 
+    * @return name
+    */
+   public java.lang.String getName(){
+     return name;
+   }
  
!   /**
!    * Sets the name value for this ClientDTO.
!    * 
!    * @param name
!    */
!   public void setName(java.lang.String name){
!     this.name = name;
!   }
  
+   private java.lang.Object __equalsCalc = null;
  
!   public synchronized boolean equals(java.lang.Object obj){
!     if (!(obj instanceof ClientDTO)) return false;
!     ClientDTO other = (ClientDTO) obj;
!     if (obj == null) return false;
!     if (this == obj) return true;
!     if (__equalsCalc != null){
!       return (__equalsCalc == obj);
      }
+     __equalsCalc = obj;
+     boolean _equals;
+     _equals = true
+         && ((this.id == null && other.getId() == null) || (this.id != null && this.id.equals(other.getId())))
+         && ((this.mac == null && other.getMac() == null) || (this.mac != null && this.mac.equals(other.getMac())))
+         && ((this.name == null && other.getName() == null) || (this.name != null && this.name.equals(other.getName())));
+     __equalsCalc = null;
+     return _equals;
+   }
  
+   private boolean __hashCodeCalc = false;
  
!   public synchronized int hashCode(){
!     if (__hashCodeCalc){
!       return 0;
      }
!     __hashCodeCalc = true;
!     int _hashCode = 1;
!     if (getId() != null){
!       _hashCode += getId().hashCode();
      }
!     if (getMac() != null){
!       _hashCode += getMac().hashCode();
      }
+     if (getName() != null){
+       _hashCode += getName().hashCode();
+     }
+     __hashCodeCalc = false;
+     return _hashCode;
+   }
  
!   // Type metadata
!   private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(
!                                                                    ClientDTO.class, true);
  
!   static{
!     typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO"));
!     org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("id");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("mac");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "mac"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("name");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "name"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!     typeDesc.addFieldDesc(elemField);
!   }
  
!   /**
!    * Return type metadata object
!    */
!   public static org.apache.axis.description.TypeDesc getTypeDesc(){
!     return typeDesc;
!   }
  
!   /**
!    * Get Custom Serializer
!    */
!   public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType,
!       javax.xml.namespace.QName _xmlType){
!     return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc);
!   }
  
!   /**
!    * Get Custom Deserializer
!    */
!   public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType,
!       java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){
!     return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc);
!   }
  
! }
\ No newline at end of file

Index: PositionDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/PositionDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PositionDTO.java	12 Feb 2005 16:00:28 -0000	1.1
--- PositionDTO.java	11 May 2005 10:51:30 -0000	1.2
***************
*** 8,416 ****
  package net.sf.magicmap.server.dto;
  
! public class PositionDTO  implements java.io.Serializable {
!     private net.sf.magicmap.server.dto.AccessPointDTO accessPoint;
!     private net.sf.magicmap.server.dto.SignalCharacterDTO character;
!     private net.sf.magicmap.server.dto.ClientDTO client;
!     private boolean deleted;
!     private boolean fixed;
!     private java.lang.Long id;
!     private java.lang.Long lastModified;
!     private java.lang.String name;
!     private java.lang.Integer posX;
!     private java.lang.Integer posY;
! 
!     public PositionDTO() {
!     }
! 
!     public PositionDTO(
!            net.sf.magicmap.server.dto.AccessPointDTO accessPoint,
!            net.sf.magicmap.server.dto.SignalCharacterDTO character,
!            net.sf.magicmap.server.dto.ClientDTO client,
!            boolean deleted,
!            boolean fixed,
!            java.lang.Long id,
!            java.lang.Long lastModified,
!            java.lang.String name,
!            java.lang.Integer posX,
!            java.lang.Integer posY) {
!            this.accessPoint = accessPoint;
!            this.character = character;
!            this.client = client;
!            this.deleted = deleted;
!            this.fixed = fixed;
!            this.id = id;
!            this.lastModified = lastModified;
!            this.name = name;
!            this.posX = posX;
!            this.posY = posY;
!     }
! 
  
!     /**
!      * Gets the accessPoint value for this PositionDTO.
!      * 
!      * @return accessPoint
!      */
!     public net.sf.magicmap.server.dto.AccessPointDTO getAccessPoint() {
!         return accessPoint;
!     }
  
  
!     /**
!      * Sets the accessPoint value for this PositionDTO.
!      * 
!      * @param accessPoint
!      */
!     public void setAccessPoint(net.sf.magicmap.server.dto.AccessPointDTO accessPoint) {
!         this.accessPoint = accessPoint;
!     }
  
  
!     /**
!      * Gets the character value for this PositionDTO.
!      * 
!      * @return character
!      */
!     public net.sf.magicmap.server.dto.SignalCharacterDTO getCharacter() {
!         return character;
!     }
  
  
!     /**
!      * Sets the character value for this PositionDTO.
!      * 
!      * @param character
!      */
!     public void setCharacter(net.sf.magicmap.server.dto.SignalCharacterDTO character) {
!         this.character = character;
!     }
  
  
!     /**
!      * Gets the client value for this PositionDTO.
!      * 
!      * @return client
!      */
!     public net.sf.magicmap.server.dto.ClientDTO getClient() {
!         return client;
!     }
  
  
!     /**
!      * Sets the client value for this PositionDTO.
!      * 
!      * @param client
!      */
!     public void setClient(net.sf.magicmap.server.dto.ClientDTO client) {
!         this.client = client;
!     }
  
  
!     /**
!      * Gets the deleted value for this PositionDTO.
!      * 
!      * @return deleted
!      */
!     public boolean isDeleted() {
!         return deleted;
!     }
  
  
!     /**
!      * Sets the deleted value for this PositionDTO.
!      * 
!      * @param deleted
!      */
!     public void setDeleted(boolean deleted) {
!         this.deleted = deleted;
!     }
  
  
!     /**
!      * Gets the fixed value for this PositionDTO.
!      * 
!      * @return fixed
!      */
!     public boolean isFixed() {
!         return fixed;
!     }
  
  
!     /**
!      * Sets the fixed value for this PositionDTO.
!      * 
!      * @param fixed
!      */
!     public void setFixed(boolean fixed) {
!         this.fixed = fixed;
!     }
  
  
!     /**
!      * Gets the id value for this PositionDTO.
!      * 
!      * @return id
!      */
!     public java.lang.Long getId() {
!         return id;
!     }
  
  
!     /**
!      * Sets the id value for this PositionDTO.
!      * 
!      * @param id
!      */
!     public void setId(java.lang.Long id) {
!         this.id = id;
!     }
  
  
!     /**
!      * Gets the lastModified value for this PositionDTO.
!      * 
!      * @return lastModified
!      */
!     public java.lang.Long getLastModified() {
!         return lastModified;
      }
  
  
!     /**
!      * Sets the lastModified value for this PositionDTO.
!      * 
!      * @param lastModified
!      */
!     public void setLastModified(java.lang.Long lastModified) {
!         this.lastModified = lastModified;
      }
! 
! 
!     /**
!      * Gets the name value for this PositionDTO.
!      * 
!      * @return name
!      */
!     public java.lang.String getName() {
!         return name;
      }
! 
! 
!     /**
!      * Sets the name value for this PositionDTO.
!      * 
!      * @param name
!      */
!     public void setName(java.lang.String name) {
!         this.name = name;
      }
! 
! 
!     /**
!      * Gets the posX value for this PositionDTO.
!      * 
!      * @return posX
!      */
!     public java.lang.Integer getPosX() {
!         return posX;
      }
! 
! 
!     /**
!      * Sets the posX value for this PositionDTO.
!      * 
!      * @param posX
!      */
!     public void setPosX(java.lang.Integer posX) {
!         this.posX = posX;
      }
! 
! 
!     /**
!      * Gets the posY value for this PositionDTO.
!      * 
!      * @return posY
!      */
!     public java.lang.Integer getPosY() {
!         return posY;
      }
! 
! 
!     /**
!      * Sets the posY value for this PositionDTO.
!      * 
!      * @param posY
!      */
!     public void setPosY(java.lang.Integer posY) {
!         this.posY = posY;
      }
! 
!     private java.lang.Object __equalsCalc = null;
!     public synchronized boolean equals(java.lang.Object obj) {
!         if (!(obj instanceof PositionDTO)) return false;
!         PositionDTO other = (PositionDTO) obj;
!         if (obj == null) return false;
!         if (this == obj) return true;
!         if (__equalsCalc != null) {
!             return (__equalsCalc == obj);
!         }
!         __equalsCalc = obj;
!         boolean _equals;
!         _equals = true && 
!             ((this.accessPoint==null && other.getAccessPoint()==null) || 
!              (this.accessPoint!=null &&
!               this.accessPoint.equals(other.getAccessPoint()))) &&
!             ((this.character==null && other.getCharacter()==null) || 
!              (this.character!=null &&
!               this.character.equals(other.getCharacter()))) &&
!             ((this.client==null && other.getClient()==null) || 
!              (this.client!=null &&
!               this.client.equals(other.getClient()))) &&
!             this.deleted == other.isDeleted() &&
!             this.fixed == other.isFixed() &&
!             ((this.id==null && other.getId()==null) || 
!              (this.id!=null &&
!               this.id.equals(other.getId()))) &&
!             ((this.lastModified==null && other.getLastModified()==null) || 
!              (this.lastModified!=null &&
!               this.lastModified.equals(other.getLastModified()))) &&
!             ((this.name==null && other.getName()==null) || 
!              (this.name!=null &&
!               this.name.equals(other.getName()))) &&
!             ((this.posX==null && other.getPosX()==null) || 
!              (this.posX!=null &&
!               this.posX.equals(other.getPosX()))) &&
!             ((this.posY==null && other.getPosY()==null) || 
!              (this.posY!=null &&
!               this.posY.equals(other.getPosY())));
!         __equalsCalc = null;
!         return _equals;
      }
! 
!     private boolean __hashCodeCalc = false;
!     public synchronized int hashCode() {
!         if (__hashCodeCalc) {
!             return 0;
!         }
!         __hashCodeCalc = true;
!         int _hashCode = 1;
!         if (getAccessPoint() != null) {
!             _hashCode += getAccessPoint().hashCode();
!         }
!         if (getCharacter() != null) {
!             _hashCode += getCharacter().hashCode();
!         }
!         if (getClient() != null) {
!             _hashCode += getClient().hashCode();
!         }
!         _hashCode += (isDeleted() ? Boolean.TRUE : Boolean.FALSE).hashCode();
!         _hashCode += (isFixed() ? Boolean.TRUE : Boolean.FALSE).hashCode();
!         if (getId() != null) {
!             _hashCode += getId().hashCode();
!         }
!         if (getLastModified() != null) {
!             _hashCode += getLastModified().hashCode();
!         }
!         if (getName() != null) {
!             _hashCode += getName().hashCode();
!         }
!         if (getPosX() != null) {
!             _hashCode += getPosX().hashCode();
!         }
!         if (getPosY() != null) {
!             _hashCode += getPosY().hashCode();
!         }
!         __hashCodeCalc = false;
!         return _hashCode;
      }
  
!     // Type metadata
!     private static org.apache.axis.description.TypeDesc typeDesc =
!         new org.apache.axis.description.TypeDesc(PositionDTO.class, true);
  
!     static {
!         typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO"));
!         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("accessPoint");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "accessPoint"));
!         elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("character");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "character"));
!         elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("client");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "client"));
!         elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("deleted");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "deleted"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("fixed");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "fixed"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("id");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("lastModified");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "lastModified"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("name");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "name"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("posX");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "posX"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("posY");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "posY"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int"));
!         typeDesc.addFieldDesc(elemField);
!     }
  
!     /**
!      * Return type metadata object
!      */
!     public static org.apache.axis.description.TypeDesc getTypeDesc() {
!         return typeDesc;
!     }
  
!     /**
!      * Get Custom Serializer
!      */
!     public static org.apache.axis.encoding.Serializer getSerializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanSerializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
!     /**
!      * Get Custom Deserializer
!      */
!     public static org.apache.axis.encoding.Deserializer getDeserializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanDeserializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
! }
--- 8,371 ----
  package net.sf.magicmap.server.dto;
  
! public class PositionDTO implements java.io.Serializable {
  
!   private net.sf.magicmap.server.dto.AccessPointDTO     accessPoint;
!   private net.sf.magicmap.server.dto.SignalCharacterDTO character;
!   private net.sf.magicmap.server.dto.ClientDTO          client;
!   private boolean                                       deleted;
!   private boolean                                       fixed;
!   private java.lang.Long                                id;
!   private java.lang.Long                                lastModified;
!   private java.lang.String                              name;
!   private java.lang.Integer                             posX;
!   private java.lang.Integer                             posY;
  
+   public PositionDTO() {}
  
!   public PositionDTO(net.sf.magicmap.server.dto.AccessPointDTO accessPoint,
!       net.sf.magicmap.server.dto.SignalCharacterDTO character, net.sf.magicmap.server.dto.ClientDTO client,
!       boolean deleted, boolean fixed, java.lang.Long id, java.lang.Long lastModified, java.lang.String name,
!       java.lang.Integer posX, java.lang.Integer posY) {
!     this.accessPoint = accessPoint;
!     this.character = character;
!     this.client = client;
!     this.deleted = deleted;
!     this.fixed = fixed;
!     this.id = id;
!     this.lastModified = lastModified;
!     this.name = name;
!     this.posX = posX;
!     this.posY = posY;
!   }
  
+   /**
+    * Gets the accessPoint value for this PositionDTO.
+    * 
+    * @return accessPoint
+    */
+   public net.sf.magicmap.server.dto.AccessPointDTO getAccessPoint(){
+     return accessPoint;
+   }
  
!   /**
!    * Sets the accessPoint value for this PositionDTO.
!    * 
!    * @param accessPoint
!    */
!   public void setAccessPoint(net.sf.magicmap.server.dto.AccessPointDTO accessPoint){
!     this.accessPoint = accessPoint;
!   }
  
+   /**
+    * Gets the character value for this PositionDTO.
+    * 
+    * @return character
+    */
+   public net.sf.magicmap.server.dto.SignalCharacterDTO getCharacter(){
+     return character;
+   }
  
!   /**
!    * Sets the character value for this PositionDTO.
!    * 
!    * @param character
!    */
!   public void setCharacter(net.sf.magicmap.server.dto.SignalCharacterDTO character){
!     this.character = character;
!   }
  
+   /**
+    * Gets the client value for this PositionDTO.
+    * 
+    * @return client
+    */
+   public net.sf.magicmap.server.dto.ClientDTO getClient(){
+     return client;
+   }
  
!   /**
!    * Sets the client value for this PositionDTO.
!    * 
!    * @param client
!    */
!   public void setClient(net.sf.magicmap.server.dto.ClientDTO client){
!     this.client = client;
!   }
  
+   /**
+    * Gets the deleted value for this PositionDTO.
+    * 
+    * @return deleted
+    */
+   public boolean isDeleted(){
+     return deleted;
+   }
  
!   /**
!    * Sets the deleted value for this PositionDTO.
!    * 
!    * @param deleted
!    */
!   public void setDeleted(boolean deleted){
!     this.deleted = deleted;
!   }
  
+   /**
+    * Gets the fixed value for this PositionDTO.
+    * 
+    * @return fixed
+    */
+   public boolean isFixed(){
+     return fixed;
+   }
  
!   /**
!    * Sets the fixed value for this PositionDTO.
!    * 
!    * @param fixed
!    */
!   public void setFixed(boolean fixed){
!     this.fixed = fixed;
!   }
  
+   /**
+    * Gets the id value for this PositionDTO.
+    * 
+    * @return id
+    */
+   public java.lang.Long getId(){
+     return id;
+   }
  
!   /**
!    * Sets the id value for this PositionDTO.
!    * 
!    * @param id
!    */
!   public void setId(java.lang.Long id){
!     this.id = id;
!   }
  
+   /**
+    * Gets the lastModified value for this PositionDTO.
+    * 
+    * @return lastModified
+    */
+   public java.lang.Long getLastModified(){
+     return lastModified;
+   }
  
!   /**
!    * Sets the lastModified value for this PositionDTO.
!    * 
!    * @param lastModified
!    */
!   public void setLastModified(java.lang.Long lastModified){
!     this.lastModified = lastModified;
!   }
  
+   /**
+    * Gets the name value for this PositionDTO.
+    * 
+    * @return name
+    */
+   public java.lang.String getName(){
+     return name;
+   }
  
!   /**
!    * Sets the name value for this PositionDTO.
!    * 
!    * @param name
!    */
!   public void setName(java.lang.String name){
!     this.name = name;
!   }
  
+   /**
+    * Gets the posX value for this PositionDTO.
+    * 
+    * @return posX
+    */
+   public java.lang.Integer getPosX(){
+     return posX;
+   }
  
!   /**
!    * Sets the posX value for this PositionDTO.
!    * 
!    * @param posX
!    */
!   public void setPosX(java.lang.Integer posX){
!     this.posX = posX;
!   }
  
+   /**
+    * Gets the posY value for this PositionDTO.
+    * 
+    * @return posY
+    */
+   public java.lang.Integer getPosY(){
+     return posY;
+   }
  
!   /**
!    * Sets the posY value for this PositionDTO.
!    * 
!    * @param posY
!    */
!   public void setPosY(java.lang.Integer posY){
!     this.posY = posY;
!   }
  
+   private java.lang.Object __equalsCalc = null;
  
!   public synchronized boolean equals(java.lang.Object obj){
!     if (!(obj instanceof PositionDTO)) return false;
!     PositionDTO other = (PositionDTO) obj;
!     if (obj == null) return false;
!     if (this == obj) return true;
!     if (__equalsCalc != null){
!       return (__equalsCalc == obj);
      }
+     __equalsCalc = obj;
+     boolean _equals;
+     _equals = true
+         && ((this.accessPoint == null && other.getAccessPoint() == null) || (this.accessPoint != null && this.accessPoint
+             .equals(other.getAccessPoint())))
+         && ((this.character == null && other.getCharacter() == null) || (this.character != null && this.character
+             .equals(other.getCharacter())))
+         && ((this.client == null && other.getClient() == null) || (this.client != null && this.client.equals(other
+             .getClient())))
+         && this.deleted == other.isDeleted()
+         && this.fixed == other.isFixed()
+         && ((this.id == null && other.getId() == null) || (this.id != null && this.id.equals(other.getId())))
+         && ((this.lastModified == null && other.getLastModified() == null) || (this.lastModified != null && this.lastModified
+             .equals(other.getLastModified())))
+         && ((this.name == null && other.getName() == null) || (this.name != null && this.name.equals(other.getName())))
+         && ((this.posX == null && other.getPosX() == null) || (this.posX != null && this.posX.equals(other.getPosX())))
+         && ((this.posY == null && other.getPosY() == null) || (this.posY != null && this.posY.equals(other.getPosY())));
+     __equalsCalc = null;
+     return _equals;
+   }
  
+   private boolean __hashCodeCalc = false;
  
!   public synchronized int hashCode(){
!     if (__hashCodeCalc){
!       return 0;
      }
!     __hashCodeCalc = true;
!     int _hashCode = 1;
!     if (getAccessPoint() != null){
!       _hashCode += getAccessPoint().hashCode();
      }
!     if (getCharacter() != null){
!       _hashCode += getCharacter().hashCode();
      }
!     if (getClient() != null){
!       _hashCode += getClient().hashCode();
      }
!     _hashCode += (isDeleted() ? Boolean.TRUE : Boolean.FALSE).hashCode();
!     _hashCode += (isFixed() ? Boolean.TRUE : Boolean.FALSE).hashCode();
!     if (getId() != null){
!       _hashCode += getId().hashCode();
      }
!     if (getLastModified() != null){
!       _hashCode += getLastModified().hashCode();
      }
!     if (getName() != null){
!       _hashCode += getName().hashCode();
      }
!     if (getPosX() != null){
!       _hashCode += getPosX().hashCode();
      }
!     if (getPosY() != null){
!       _hashCode += getPosY().hashCode();
      }
+     __hashCodeCalc = false;
+     return _hashCode;
+   }
  
!   // Type metadata
!   private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(
!                                                                    PositionDTO.class, true);
  
!   static{
!     typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO"));
!     org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("accessPoint");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "accessPoint"));
!     elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("character");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "character"));
!     elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("client");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "client"));
!     elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("deleted");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "deleted"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("fixed");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "fixed"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("id");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("lastModified");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "lastModified"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("name");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "name"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("posX");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "posX"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("posY");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "posY"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int"));
!     typeDesc.addFieldDesc(elemField);
!   }
  
!   /**
!    * Return type metadata object
!    */
!   public static org.apache.axis.description.TypeDesc getTypeDesc(){
!     return typeDesc;
!   }
  
!   /**
!    * Get Custom Serializer
!    */
!   public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType,
!       javax.xml.namespace.QName _xmlType){
!     return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc);
!   }
  
!   /**
!    * Get Custom Deserializer
!    */
!   public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType,
!       java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){
!     return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc);
!   }
  
! }
\ No newline at end of file

Index: AccessPointDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/AccessPointDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccessPointDTO.java	12 Feb 2005 16:00:28 -0000	1.1
--- AccessPointDTO.java	11 May 2005 10:51:30 -0000	1.2
***************
*** 8,186 ****
  package net.sf.magicmap.server.dto;
  
! public class AccessPointDTO  implements java.io.Serializable {
!     private java.lang.Long id;
!     private java.lang.String mac;
!     private java.lang.String ssid;
! 
!     public AccessPointDTO() {
!     }
  
!     public AccessPointDTO(
!            java.lang.Long id,
!            java.lang.String mac,
!            java.lang.String ssid) {
!            this.id = id;
!            this.mac = mac;
!            this.ssid = ssid;
!     }
  
  
!     /**
!      * Gets the id value for this AccessPointDTO.
!      * 
!      * @return id
!      */
!     public java.lang.Long getId() {
!         return id;
!     }
  
  
!     /**
!      * Sets the id value for this AccessPointDTO.
!      * 
!      * @param id
!      */
!     public void setId(java.lang.Long id) {
!         this.id = id;
!     }
  
  
!     /**
!      * Gets the mac value for this AccessPointDTO.
!      * 
!      * @return mac
!      */
!     public java.lang.String getMac() {
!         return mac;
!     }
  
  
!     /**
!      * Sets the mac value for this AccessPointDTO.
!      * 
!      * @param mac
!      */
!     public void setMac(java.lang.String mac) {
!         this.mac = mac;
!     }
  
  
!     /**
!      * Gets the ssid value for this AccessPointDTO.
!      * 
!      * @return ssid
!      */
!     public java.lang.String getSsid() {
!         return ssid;
      }
  
  
!     /**
!      * Sets the ssid value for this AccessPointDTO.
!      * 
!      * @param ssid
!      */
!     public void setSsid(java.lang.String ssid) {
!         this.ssid = ssid;
      }
! 
!     private java.lang.Object __equalsCalc = null;
!     public synchronized boolean equals(java.lang.Object obj) {
!         if (!(obj instanceof AccessPointDTO)) return false;
!         AccessPointDTO other = (AccessPointDTO) obj;
!         if (obj == null) return false;
!         if (this == obj) return true;
!         if (__equalsCalc != null) {
!             return (__equalsCalc == obj);
!         }
!         __equalsCalc = obj;
!         boolean _equals;
!         _equals = true && 
!             ((this.id==null && other.getId()==null) || 
!              (this.id!=null &&
!               this.id.equals(other.getId()))) &&
!             ((this.mac==null && other.getMac()==null) || 
!              (this.mac!=null &&
!               this.mac.equals(other.getMac()))) &&
!             ((this.ssid==null && other.getSsid()==null) || 
!              (this.ssid!=null &&
!               this.ssid.equals(other.getSsid())));
!         __equalsCalc = null;
!         return _equals;
      }
! 
!     private boolean __hashCodeCalc = false;
!     public synchronized int hashCode() {
!         if (__hashCodeCalc) {
!             return 0;
!         }
!         __hashCodeCalc = true;
!         int _hashCode = 1;
!         if (getId() != null) {
!             _hashCode += getId().hashCode();
!         }
!         if (getMac() != null) {
!             _hashCode += getMac().hashCode();
!         }
!         if (getSsid() != null) {
!             _hashCode += getSsid().hashCode();
!         }
!         __hashCodeCalc = false;
!         return _hashCode;
      }
  
!     // Type metadata
!     private static org.apache.axis.description.TypeDesc typeDesc =
!         new org.apache.axis.description.TypeDesc(AccessPointDTO.class, true);
  
!     static {
!         typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO"));
!         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("id");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("mac");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "mac"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("ssid");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "ssid"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!         typeDesc.addFieldDesc(elemField);
!     }
  
!     /**
!      * Return type metadata object
!      */
!     public static org.apache.axis.description.TypeDesc getTypeDesc() {
!         return typeDesc;
!     }
  
!     /**
!      * Get Custom Serializer
!      */
!     public static org.apache.axis.encoding.Serializer getSerializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanSerializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
!     /**
!      * Get Custom Deserializer
!      */
!     public static org.apache.axis.encoding.Deserializer getDeserializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanDeserializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
! }
--- 8,165 ----
  package net.sf.magicmap.server.dto;
  
! public class AccessPointDTO implements java.io.Serializable {
  
!   private java.lang.Long   id;
!   private java.lang.String mac;
!   private java.lang.String ssid;
  
+   public AccessPointDTO() {}
  
!   public AccessPointDTO(java.lang.Long id, java.lang.String mac, java.lang.String ssid) {
!     this.id = id;
!     this.mac = mac;
!     this.ssid = ssid;
!   }
  
+   /**
+    * Gets the id value for this AccessPointDTO.
+    * 
+    * @return id
+    */
+   public java.lang.Long getId(){
+     return id;
+   }
  
!   /**
!    * Sets the id value for this AccessPointDTO.
!    * 
!    * @param id
!    */
!   public void setId(java.lang.Long id){
!     this.id = id;
!   }
  
+   /**
+    * Gets the mac value for this AccessPointDTO.
+    * 
+    * @return mac
+    */
+   public java.lang.String getMac(){
+     return mac;
+   }
  
!   /**
!    * Sets the mac value for this AccessPointDTO.
!    * 
!    * @param mac
!    */
!   public void setMac(java.lang.String mac){
!     this.mac = mac;
!   }
  
+   /**
+    * Gets the ssid value for this AccessPointDTO.
+    * 
+    * @return ssid
+    */
+   public java.lang.String getSsid(){
+     return ssid;
+   }
  
!   /**
!    * Sets the ssid value for this AccessPointDTO.
!    * 
!    * @param ssid
!    */
!   public void setSsid(java.lang.String ssid){
!     this.ssid = ssid;
!   }
  
+   private java.lang.Object __equalsCalc = null;
  
!   public synchronized boolean equals(java.lang.Object obj){
!     if (!(obj instanceof AccessPointDTO)) return false;
!     AccessPointDTO other = (AccessPointDTO) obj;
!     if (obj == null) return false;
!     if (this == obj) return true;
!     if (__equalsCalc != null){
!       return (__equalsCalc == obj);
      }
+     __equalsCalc = obj;
+     boolean _equals;
+     _equals = true
+         && ((this.id == null && other.getId() == null) || (this.id != null && this.id.equals(other.getId())))
+         && ((this.mac == null && other.getMac() == null) || (this.mac != null && this.mac.equals(other.getMac())))
+         && ((this.ssid == null && other.getSsid() == null) || (this.ssid != null && this.ssid.equals(other.getSsid())));
+     __equalsCalc = null;
+     return _equals;
+   }
  
+   private boolean __hashCodeCalc = false;
  
!   public synchronized int hashCode(){
!     if (__hashCodeCalc){
!       return 0;
      }
!     __hashCodeCalc = true;
!     int _hashCode = 1;
!     if (getId() != null){
!       _hashCode += getId().hashCode();
      }
!     if (getMac() != null){
!       _hashCode += getMac().hashCode();
      }
+     if (getSsid() != null){
+       _hashCode += getSsid().hashCode();
+     }
+     __hashCodeCalc = false;
+     return _hashCode;
+   }
  
!   // Type metadata
!   private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(
!                                                                    AccessPointDTO.class, true);
  
!   static{
!     typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO"));
!     org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("id");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "id"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("mac");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "mac"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!     typeDesc.addFieldDesc(elemField);
!     elemField = new org.apache.axis.description.ElementDesc();
!     elemField.setFieldName("ssid");
!     elemField.setXmlName(new javax.xml.namespace.QName("", "ssid"));
!     elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!     typeDesc.addFieldDesc(elemField);
!   }
  
!   /**
!    * Return type metadata object
!    */
!   public static org.apache.axis.description.TypeDesc getTypeDesc(){
!     return typeDesc;
!   }
  
!   /**
!    * Get Custom Serializer
!    */
!   public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType,
!       javax.xml.namespace.QName _xmlType){
!     return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc);
!   }
  
!   /**
!    * Get Custom Deserializer
!    */
!   public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType,
!       java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){
!     return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc);
!   }
  
! }
\ No newline at end of file

Index: SimpleScanResultDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/SimpleScanResultDTO.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleScanResultDTO.java	13 Feb 2005 22:27:52 -0000	1.2
--- SimpleScanResultDTO.java	11 May 2005 10:51:30 -0000	1.3
***************
*** 8,254 ****
  package net.sf.magicmap.server.dto;
  
! public class SimpleScanResultDTO  implements java.io.Serializable {
!     private java.util.Calendar lastSeen;
!     private java.lang.String macAP;
!     private java.lang.Double noise;
!     private java.lang.Double signalLevel;
!     private java.lang.String ssid;
! 
!     public SimpleScanResultDTO() {
!     }
  
!     public SimpleScanResultDTO(
!            java.util.Calendar lastSeen,
!            java.lang.String macAP,
!            java.lang.Double noise,
!            java.lang.Double signalLevel,
!            java.lang.String ssid) {
!            this.lastSeen = lastSeen;
!            this.macAP = macAP;
!            this.noise = noise;
!            this.signalLevel = signalLevel;
!            this.ssid = ssid;
!     }
  
  
!     /**
!      * Gets the lastSeen value for this SimpleScanResultDTO.
!      * 
!      * @return lastSeen
!      */
!     public java.util.Calendar getLastSeen() {
!         return lastSeen;
!     }
  
  
!     /**
!      * Sets the lastSeen value for this SimpleScanResultDTO.
!      * 
!      * @param lastSeen
!      */
!     public void setLastSeen(java.util.Calendar lastSeen) {
!         this.lastSeen = lastSeen;
!     }
  
  
!     /**
!      * Gets the macAP value for this SimpleScanResultDTO.
!      * 
!      * @return macAP
!      */
!     public java.lang.String getMacAP() {
!         return macAP;
!     }
  
  
!     /**
!      * Sets the macAP value for this SimpleScanResultDTO.
!      * 
!      * @param macAP
!      */
!     public void setMacAP(java.lang.String macAP) {
!         this.macAP = macAP;
!     }
  
  
!     /**
!      * Gets the noise value for this SimpleScanResultDTO.
!      * 
!      * @return noise
!      */
!     public java.lang.Double getNoise() {
!         return noise;
!     }
  
  
!     /**
!      * Sets the noise value for this SimpleScanResultDTO.
!      * 
!      * @param noise
!      */
!     public void setNoise(java.lang.Double noise) {
!         this.noise = noise;
!     }
  
  
!     /**
!      * Gets the signalLevel value for this SimpleScanResultDTO.
!      * 
!      * @return signalLevel
!      */
!     public java.lang.Double getSignalLevel() {
!         return signalLevel;
      }
  
  
!     /**
!      * Sets the signalLevel value for this SimpleScanResultDTO.
!      * 
!      * @param signalLevel
!      */
!     public void setSignalLevel(java.lang.Double signalLevel) {
!         this.signalLevel = signalLevel;
      }
! 
! 
!     /**
!      * Gets the ssid value for this SimpleScanResultDTO.
!      * 
!      * @return ssid
!      */
!     public java.lang.String getSsid() {
!         return ssid;
      }
! 
! 
!     /**
!      * Sets the ssid value for this SimpleScanResultDTO.
!      * 
!      * @param ssid
!      */
!     public void setSsid(java.lang.String ssid) {
!         this.ssid = ssid;
      }
! 
!     private java.lang.Object __equalsCalc = null;
!     public synchronized boolean equals(java.lang.Object obj) {
!         if (!(obj instanceof SimpleScanResultDTO)) return false;
!         SimpleScanResultDTO other = (SimpleScanResultDTO) obj;
!         if (obj == null) return false;
!         if (this == obj) return true;
!         if (__equalsCalc != null) {
!             return (__equalsCalc == obj);
!         }
!         __equalsCalc = obj;
!         boolean _equals;
!         _equals = true && 
!             ((this.lastSeen==null && other.getLastSeen()==null) || 
!              (this.lastSeen!=null &&
!               this.lastSeen.equals(other.getLastSeen()))) &&
!             ((this.macAP==null && other.getMacAP()==null) || 
!              (this.macAP!=null &&
!               this.macAP.equals(other.getMacAP()))) &&
!             ((this.noise==null && other.getNoise()==null) || 
!              (this.noise!=null &&
!               this.noise.equals(other.getNoise()))) &&
!             ((this.signalLevel==null && other.getSignalLevel()==null) || 
!              (this.signalLevel!=null &&
!               this.signalLevel.equals(other.getSignalLevel()))) &&
!             ((this.ssid==null && other.getSsid()==null) || 
!              (this.ssid!=null &&
!               this.ssid.equals(other.getSsid())));
!         __equalsCalc = null;
!         return _equals;
      }
! 
!     private boolean __hashCodeCalc = false;
!     public synchronized int hashCode() {
!         if (__hashCodeCalc) {
!             return 0;
!         }
!         __hashCodeCalc = true;
!         int _hashCode = 1;
!         if (getLastSeen() != null) {
!             _hashCode += getLastSeen().hashCode();
!         }
!         if (getMacAP() != null) {
!             _hashCode += getMacAP().hashCode();
!         }
!         if (getNoise() != null) {
!             _hashCode += getNoise().hashCode();
!         }
!         if (getSignalLevel() != null) {
!             _hashCode += getSignalLevel().hashCode();
!         }
!         if (getSsid() != null) {
!             _hashCode += getSsid().hashCode();
!         }
!         __hashCodeCalc = false;
!         return _hashCode;
      }
  
!     // Type metadata
!     private static org.apache.axis.description.TypeDesc typeDesc =
!         new org.apache.axis.description.TypeDesc(SimpleScanResultDTO.class, true);
  
!     static {
!         typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SimpleScanResultDTO"));
!         org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("lastSeen");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "lastSeen"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("macAP");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "macAP"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("noise");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "noise"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "double"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("signalLevel");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "signalLevel"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "double"));
!         typeDesc.addFieldDesc(elemField);
!         elemField = new org.apache.axis.description.ElementDesc();
!         elemField.setFieldName("ssid");
!         elemField.setXmlName(new javax.xml.namespace.QName("", "ssid"));
!         elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"));
!         typeDesc.addFieldDesc(elemField);
!     }
  
!     /**
!      * Return type metadata object
!      */
!     public static org.apache.axis.description.TypeDesc getTypeDesc() {
!         return typeDesc;
!     }
  
!     /**
!      * Get Custom Serializer
!      */
!     public static org.apache.axis.encoding.Serializer getSerializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanSerializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
!     /**
!      * Get Custom Deserializer
!      */
!     public static org.apache.axis.encoding.Deserializer getDeserializer(
!            java.lang.String mechType, 
!            java.lang.Class _javaType,  
!            javax.xml.namespace.QName _xmlType) {
!         return 
!           new  org.apache.axis.encoding.ser.BeanDeserializer(
!             _javaType, _xmlType, typeDesc);
!     }
  
! }
--- 8,228 ----
  package net.sf.magicmap.server.dto;
  
! public class SimpleScanResultDTO implements java.io.Serializable {
  
!   private java.util.Calendar lastSeen;
!   private java.lang.String   macAP;
!   private java.lang.Double   noise;
!   private java.lang.Double   signalLevel;
!   private java.lang.String   ssid;
  
+   public SimpleScanResultDTO() {}
  
!   public SimpleScanResultDTO(java.util.Calendar lastSeen, java.lang.String macAP, java.lang.Double noise,
!       java.lang.Double signalLevel, java.lang.String ssid) {
!     this.lastSeen = lastSeen;
!     this.macAP = macAP;
!     this.noise = noise;
!     this.signalLevel = signalLevel;
!     this.ssid = ssid;
!   }
  
+   /**
+    * Gets the lastSeen value for this SimpleScanResultDTO.
+    * 
+    * @return lastSeen
+    */
+   public java.util.Calendar getLastSeen(){
+     return lastSeen;
+   }
  
!   /**
!    * Sets the lastSeen value for this SimpleScanResultDTO.
!    * 
!    * @param lastSeen
!    */
!   public void setLastSeen(java.util.Calendar lastSeen){
!     this.lastSeen = lastSeen;
!   }
  
+   /**
+    * Gets the macAP value for this SimpleScanResultDTO.
+    * 
+    * @return macAP
+    */
+   public java.lang.String getMacAP(){
+     return macAP;
+   }
  
!   /**
!    * Sets the macAP value for this SimpleScanResultDTO.
!    * 
!    * @param macAP
!    */
!   public void setMacAP(java.lang.String macAP){
!     this.macAP = macAP;
!   }
  
+   /**
+    * Gets the noise value for this SimpleScanResultDTO.
+    * 
+    * @return noise
+    */
+   public java.lang.Double getNoise(){
+     return noise;
+   }
  
!   /**
!    * Sets the noise value for this SimpleScanResultDTO.
!    * 
!    * @param noise
!    */
!   public void setNoise(java.lang.Double noise){
!     this.noise = noise;
!   }
  
+   /**
+    * Gets the signalLevel value for this SimpleScanResultDTO.
+    * 
+    * @return signalLevel
+    */
+   public java.lang.Double getSignalLevel(){
+     return signalLevel;
+   }
  
!   /**
!    * Sets the signalLevel value for this SimpleScanResultDTO.
!    * 
!    * @param signalLevel
!    */
!   public void setSignalLevel(java.lang.Double signalLevel){
!     this.signalLevel = signalLevel;
!   }
  
+   /**
+    * Gets the ssid value for this SimpleScanResultDTO.
+    * 
+    * @return ssid
+    */
+   public java.lang.String getSsid(){
+     return ssid;
+   }
  
!   /**
!    * Sets the ssid value for this SimpleScanResultDTO.
!    * 
!    * @param ssid
!    */
!   public void setSsid(java.lang.String ssid){
!     this.ssid = ssid;
!   }
  
+   private java.lang.Object __equalsCalc = null;
  
!   public synchronized boolean equals(java.lang.Object obj){
!     if (!(obj instanceof SimpleScanResultDTO)) return false;
!     SimpleScanResultDTO other = (SimpleScanResultDTO) obj;
!     if (obj == null) return false;
!     if (this == obj) return true;
!     if (__equalsCalc != null){
!       return (__equalsCalc == obj);
      }
+     __equalsCalc = obj;
+     boolean _equals;
+     _equals = true
+         && ((this.lastSeen == null && other.getLastSeen() == null) || (this.lastSeen != null && this.lastSeen
+             .equals(other.getLastSeen())))
+         && ((this.macAP == null && other.getMacAP() == null) || (this.macAP != null && this.macAP.equals(other
+             .getMacAP())))
+         && ((this.noise == null && other.getNoise() == null) || (this.noise != null && this.noise.equals(other
+             .getNoise())))
+         && ((this.signalLevel == null && other.getSignalLevel() == null) || (this.signalLevel != null && this.signalLevel
+             .equals(other.getSignalLevel())))
+         && ((this.ssid == null && ...
 
[truncated message content]