Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20780/src/net/sf/magicmap/client/controller
Modified Files:
PollHandler.java
Log Message:
- fixed not-showing-right-Measurement-bug in MapView
- fixed update tree in OutlineView
- implemented alphabetical-orderd-input-method for OutlineView
- fixed remove-all-nodes-method in OutlineView when loading a new map
- implemented scrollpane for OutlineView
Index: PollHandler.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PollHandler.java 11 May 2005 10:51:27 -0000 1.3
--- PollHandler.java 2 Jun 2005 00:13:12 -0000 1.4
***************
*** 110,121 ****
location.setId(position.getId().longValue());
nodeModel.addNode(location);
if (position.getPosX().intValue() != -1 && position.getPosY().intValue() != -1){
! location.setPosition(position.getPosX().intValue(), position.getPosY().intValue());
! location.setFix(true);
! } else{
! location.setFix(false);
! }
! location.setName(position.getName());
// Signalcharakteristik auswerden und gesehene
// AccessPoints ebenfalls erzeugen bzw. mit ihnen Verbindungen
--- 110,121 ----
location.setId(position.getId().longValue());
+ location.setName(position.getName());
nodeModel.addNode(location);
if (position.getPosX().intValue() != -1 && position.getPosY().intValue() != -1){
! location.setPosition(position.getPosX().intValue(), position.getPosY().intValue());
! location.setFix(true);
! } else{
! location.setFix(false);
! }
// Signalcharakteristik auswerden und gesehene
// AccessPoints ebenfalls erzeugen bzw. mit ihnen Verbindungen
***************
*** 205,209 ****
}
ap.setId(position.getId().longValue());
! ;
// Nur Position von fixierten AccessPoints beachten
if (position.isFixed()){
--- 205,209 ----
}
ap.setId(position.getId().longValue());
!
// Nur Position von fixierten AccessPoints beachten
if (position.isFixed()){
***************
*** 240,246 ****
+ ". Füge zum Graphen hinzu.");
client = new ClientNode(nodeModel);
- nodeModel.addNode(client);
- client.setName(clientdto.getName());
client.setMacAddress(clientdto.getMac());
}
--- 240,246 ----
+ ". Füge zum Graphen hinzu.");
client = new ClientNode(nodeModel);
client.setMacAddress(clientdto.getMac());
+ client.setName(clientdto.getName());
+ nodeModel.addNode(client);
}
|
