From: Florian L. <fle...@us...> - 2006-02-23 21:40:45
|
Update of /cvsroot/magicmap/magicmapserver/dblayer/src/net/sf/magicmap/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27319/dblayer/src/net/sf/magicmap/db Modified Files: AccessPoint.java Map.java Position.java Log Message: geoposition fixed Index: Position.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/dblayer/src/net/sf/magicmap/db/Position.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Position.java 14 Jan 2005 16:08:46 -0000 1.1 --- Position.java 23 Feb 2006 21:40:35 -0000 1.2 *************** *** 244,247 **** --- 244,248 ---- public void setAccessPoint(AccessPoint accessPoint){ this.accessPoint = accessPoint; + this.lastModified = System.currentTimeMillis(); } *************** *** 258,261 **** --- 259,263 ---- public void setClient(Client client){ this.client = client; + this.lastModified = System.currentTimeMillis(); } Index: Map.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/dblayer/src/net/sf/magicmap/db/Map.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Map.java 19 Feb 2006 17:43:58 -0000 1.3 --- Map.java 23 Feb 2006 21:40:35 -0000 1.4 *************** *** 132,136 **** * mapped-by="map" **/ ! Collection GeoPositions = new HashSet(); /** --- 132,136 ---- * mapped-by="map" **/ ! Collection geoPositions = new HashSet(); /** *************** *** 261,269 **** public Collection getGeoPositions() { ! return GeoPositions; } public void addGeoPosition(GeoPosition p){ ! this.positions.add(p); } --- 261,269 ---- public Collection getGeoPositions() { ! return geoPositions; } public void addGeoPosition(GeoPosition p){ ! this.geoPositions.add(p); } Index: AccessPoint.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/dblayer/src/net/sf/magicmap/db/AccessPoint.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AccessPoint.java 23 Jan 2005 18:10:51 -0000 1.2 --- AccessPoint.java 23 Feb 2006 21:40:35 -0000 1.3 *************** *** 76,79 **** --- 76,87 ---- /** + * Status der Berechnung + * + * @jdo.field + * persistence-modifier="persistent" + **/ + int hidden; + + /** * ScanResults für diesen AP * *************** *** 177,179 **** --- 185,204 ---- this.hardware = hardware; } + + /** + * @return Returns the hidden. + */ + public boolean getHidden(){ + return hidden == 1; + } + + /** + * @param hidden The hidden to set. + */ + public void setHidden(boolean hidden){ + if (hidden) + this.hidden = 1; + else + this.hidden = 0; + } } \ No newline at end of file |