[Magicmap-commits] /magicmapserver/dblayer/src/net/sf/magicmap/db GeoPosition.java,1.4,1.5

[Andreas W. <an...@us...>]

Update of /cvsroot/magicmap//magicmapserver/dblayer/src/net/sf/magicmap/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10908/dblayer/src/net/sf/magicmap/db

Modified Files:
	GeoPosition.java 
Log Message:
patch 

Index: GeoPosition.java
===================================================================
RCS file: /cvsroot/magicmap//magicmapserver/dblayer/src/net/sf/magicmap/db/GeoPosition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GeoPosition.java	19 Feb 2006 18:18:46 -0000	1.4
--- GeoPosition.java	20 Feb 2006 11:07:42 -0000	1.5
***************
*** 1,10 ****
  package net.sf.magicmap.db;
  
- import java.util.Collection;
- import java.util.HashSet;
  
  
   /**
   * @author lederer & weiß
   * @jdo.persistence-capable 
   *   identity-type="application"
--- 1,9 ----
  package net.sf.magicmap.db;
  
  
  
   /**
   * @author lederer & weiß
+  * 
   * @jdo.persistence-capable 
   *   identity-type="application"
***************
*** 19,26 ****
   *   vendor-name="jpox" key="poid-class-generator"
   *   value="org.jpox.poid.SequenceTablePoidGenerator"
!  */  
! /**
!  * @author Florian
!  */
  public class GeoPosition {
  
--- 18,22 ----
   *   vendor-name="jpox" key="poid-class-generator"
   *   value="org.jpox.poid.SequenceTablePoidGenerator"
!  */ 
  public class GeoPosition {
  
***************
*** 59,63 ****
     *   null-value="exception"
     */
!   int         posX;
  
    /**
--- 55,59 ----
     *   null-value="exception"
     */
!   Integer         posX;
  
    /**
***************
*** 68,72 ****
     *   null-value="exception"
     */
!   int         posY;
  
    
--- 64,68 ----
     *   null-value="exception"
     */
!   Integer         posY;
  
    
***************
*** 78,82 ****
     *   null-value="exception"
     */
!   int         latitude;
  
    /**
--- 74,78 ----
     *   null-value="exception"
     */
!   Integer         latitude;
  
    /**
***************
*** 87,91 ****
     *   null-value="exception"
     */
!   int         longitude;
  
    /**
--- 83,87 ----
     *   null-value="exception"
     */
!   Integer         longitude;
  
    /**
***************
*** 96,108 ****
     *   null-value="exception"
     */
!   int         altitude;
  
    /**
!    * 
!    * @param map
!    * @param posX
!    * @param posY
!    */
!   public GeoPosition(Map map, int posX, int posY, int latitude, int longitude, int altitude) {
      super();
  
--- 92,107 ----
     *   null-value="exception"
     */
!   Integer         altitude;
! 
  
    /**
!  * @param map
!  * @param posX
!  * @param posY
!  * @param latitude
!  * @param longitude
!  * @param altitude
!  */
! public GeoPosition(Map map, Integer posX, Integer posY, Integer latitude, Integer longitude, Integer altitude) {
      super();
  
***************
*** 132,136 ****
     * @return Returns the posX.
     */
!   public int getPosX(){
      return this.posX;
    }
--- 131,135 ----
     * @return Returns the posX.
     */
!   public Integer getPosX(){
      return this.posX;
    }
***************
*** 139,143 ****
     * @return Returns the posY.
     */
!   public int getPosY(){
      return this.posY;
    }
--- 138,142 ----
     * @return Returns the posY.
     */
!   public Integer getPosY(){
      return this.posY;
    }
***************
*** 146,150 ****
     * @return Returns the latitude.
     */
!   public int getLatitude() {
        return latitude;
    }
--- 145,149 ----
     * @return Returns the latitude.
     */
!   public Integer getLatitude() {
        return latitude;
    }
***************
*** 153,157 ****
     * @return Returns the longitude.
     */
!   public int getLongitude() {
        return longitude;
    }
--- 152,156 ----
     * @return Returns the longitude.
     */
!   public Integer getLongitude() {
        return longitude;
    }
***************
*** 160,164 ****
     * @return Returns the altitude.
     */
!   public int getAltitude() {
      return altitude;
    }
--- 159,163 ----
     * @return Returns the altitude.
     */
!   public Integer getAltitude() {
      return altitude;
    }
***************
*** 167,171 ****
   * @param altitude The altitude to set.
   */
! public void setAltitude(int altitude) {
      this.altitude = altitude;
  }
--- 166,170 ----
   * @param altitude The altitude to set.
   */
! public void setAltitude(Integer altitude) {
      this.altitude = altitude;
  }
***************
*** 174,178 ****
   * @param latitude The latitude to set.
   */
! public void setLatitude(int latitude) {
      this.latitude = latitude;
  }
--- 173,177 ----
   * @param latitude The latitude to set.
   */
! public void setLatitude(Integer latitude) {
      this.latitude = latitude;
  }
***************
*** 181,185 ****
   * @param longitude The longitude to set.
   */
! public void setLongitude(int longitude) {
      this.longitude = longitude;
  }
--- 180,184 ----
   * @param longitude The longitude to set.
   */
! public void setLongitude(Integer longitude) {
      this.longitude = longitude;
  }
***************
*** 195,199 ****
   * @param posX The posX to set.
   */
! public void setPosX(int posX) {
      this.posX = posX;
  }
--- 194,198 ----
   * @param posX The posX to set.
   */
! public void setPosX(Integer posX) {
      this.posX = posX;
  }
***************
*** 202,206 ****
   * @param posY The posY to set.
   */
! public void setPosY(int posY) {
      this.posY = posY;
  }
--- 201,205 ----
   * @param posY The posY to set.
   */
! public void setPosY(Integer posY) {
      this.posY = posY;
  }