Menu
▾
▴
[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/dto SimpleScanResultDTO.java,1.2,1.3 PositionDTO.java,1.1,1.2 SignalCharacterDTO.java,1.2,1.3 ClientDTO.java,1.1,1.2 ProbabilityDensity.java,1.1,1.2 ClientSignalCharacter.java,1.1,1.2 MapDTO.java,1.1,1.2 AccessPointDTO.java,1.1,1.2 ClientProbabilityDensity.java,1.1,1.2
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:45:14
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9267/src/net/sf/magicmap/server/dto Modified Files: SimpleScanResultDTO.java PositionDTO.java SignalCharacterDTO.java ClientDTO.java ProbabilityDensity.java ClientSignalCharacter.java MapDTO.java AccessPointDTO.java ClientProbabilityDensity.java Log Message: + Client is usable without server Index: ProbabilityDensity.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/ProbabilityDensity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProbabilityDensity.java 12 Feb 2005 15:19:28 -0000 1.1 --- ProbabilityDensity.java 11 May 2005 10:45:05 -0000 1.2 *************** *** 23,36 **** * DO NOT USE */ ! public ProbabilityDensity() { ! System.out.println("DO NOT USE!"); ! } ! ! public ProbabilityDensity(String locationName, double probability, int positionX, int positionY) { ! this.locationName = locationName; ! this.probabilty = probability; ! this.positionX = positionX; ! this.positionY = positionY; ! } /** --- 23,27 ---- * DO NOT USE */ ! public ProbabilityDensity() {} /** Index: ClientDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/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 15:19:28 -0000 1.1 --- ClientDTO.java 11 May 2005 10:45:05 -0000 1.2 *************** *** 19,25 **** private String mac; ! public ClientDTO() { ! // do not use ! } /** --- 19,23 ---- private String mac; ! public ClientDTO() {} /** *************** *** 65,68 **** } - } \ No newline at end of file --- 63,65 ---- Index: PositionDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/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 15:19:28 -0000 1.1 --- PositionDTO.java 11 May 2005 10:45:05 -0000 1.2 *************** *** 31,35 **** } ! /** * @return Returns the id. */ --- 31,35 ---- } ! /** * @return Returns the id. */ Index: AccessPointDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/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 15:19:28 -0000 1.1 --- AccessPointDTO.java 11 May 2005 10:45:05 -0000 1.2 *************** *** 13,21 **** * (at your option) any later version. */ ! public class AccessPointDTO{ ! public AccessPointDTO() { ! // do not use ! } private Long id; --- 13,19 ---- * (at your option) any later version. */ ! public class AccessPointDTO { ! public AccessPointDTO() {} private Long id; Index: ClientProbabilityDensity.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/ClientProbabilityDensity.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClientProbabilityDensity.java 12 Feb 2005 15:19:28 -0000 1.1 --- ClientProbabilityDensity.java 11 May 2005 10:45:05 -0000 1.2 *************** *** 27,44 **** /** - * @param locationName - * @param probability - * @param positionX - * @param positionY - */ - public ClientProbabilityDensity(String locationName, double probability, int positionX, int positionY, - String clientName, String clientMac, String mapName) { - super(locationName, probability, positionX, positionY); - this.clientMac = clientMac; - this.clientName = clientName; - this.mapName = mapName; - } - - /** * @return Returns the clientMac. */ --- 27,30 ---- Index: ClientSignalCharacter.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/ClientSignalCharacter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClientSignalCharacter.java 12 Feb 2005 15:19:28 -0000 1.1 --- ClientSignalCharacter.java 11 May 2005 10:45:05 -0000 1.2 *************** *** 21,32 **** * DO NOT USE */ ! public ClientSignalCharacter() { ! System.out.println("DO NOT USE!"); ! } ! ! public ClientSignalCharacter(String clientName, String clientMac) { ! this.clientName = clientName; ! this.clientMac = clientMac; ! } /** --- 21,25 ---- * DO NOT USE */ ! public ClientSignalCharacter() {} /** Index: SimpleScanResultDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/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:28 -0000 1.2 --- SimpleScanResultDTO.java 11 May 2005 10:45:05 -0000 1.3 *************** *** 17,27 **** public class SimpleScanResultDTO { ! protected String ssid; // WLAN-Name (optional) ! protected String macAP; // MAC-Adresse AccessPoint ! protected Double signalLevel; // Signallevel in dB (negativer Wert) ! protected Double noise; // Signal-Rausch-Abstand (optional) ! protected Date lastSeen; // (optional) ! ! public SimpleScanResultDTO() { --- 17,25 ---- public class SimpleScanResultDTO { ! protected String ssid; // WLAN-Name (optional) ! protected String macAP; // MAC-Adresse AccessPoint ! protected Double signalLevel; // Signallevel in dB (negativer Wert) ! protected Double noise; // Signal-Rausch-Abstand (optional) ! protected Date lastSeen; // (optional) public SimpleScanResultDTO() { *************** *** 29,42 **** } - public SimpleScanResultDTO(String ssidAccessPoint, String macAccessPoint, Double signalLevel, Double noise, - Date lastSeen) { - this.ssid = ssidAccessPoint; - this.lastSeen = lastSeen; - this.macAP = macAccessPoint; - this.signalLevel = signalLevel; - this.noise = noise; - } - - /** * @return Returns the lastSeen. --- 27,30 ---- Index: MapDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/MapDTO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapDTO.java 12 Feb 2005 15:19:28 -0000 1.1 --- MapDTO.java 11 May 2005 10:45:05 -0000 1.2 *************** *** 21,36 **** private Integer imageWidth; ! public MapDTO() { ! // do not use ! } ! ! ! public MapDTO(Long id, String imageURL, String name, Integer imageHeight, Integer imageWidth) { ! this.id = id; ! this.name = name; ! this.imageURL = imageURL; ! this.imageHeight = imageHeight; ! this.imageWidth = imageWidth; ! } public Long getId(){ --- 21,25 ---- private Integer imageWidth; ! public MapDTO() {} public Long getId(){ Index: SignalCharacterDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/SignalCharacterDTO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SignalCharacterDTO.java 16 Feb 2005 08:58:27 -0000 1.2 --- SignalCharacterDTO.java 11 May 2005 10:45:05 -0000 1.3 *************** *** 2,7 **** package net.sf.magicmap.server.dto; - import java.util.ArrayList; - /** * author schweige --- 2,5 ---- *************** *** 23,29 **** } - public SignalCharacterDTO(SimpleScanResultDTO[] simpleScanResults) { - this.simpleScanResults = simpleScanResults;} - public SimpleScanResultDTO[] getSimpleScanResults(){ return this.simpleScanResults; --- 21,24 ---- |
