Menu
▾
▴
magicmap-commits — SVN commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(14) |
Mar
|
Apr
(4) |
May
(57) |
Jun
(14) |
Jul
(15) |
Aug
(5) |
Sep
(29) |
Oct
(13) |
Nov
(44) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(14) |
Feb
(78) |
Mar
(55) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(9) |
| 2007 |
Jan
(21) |
Feb
(67) |
Mar
(39) |
Apr
(28) |
May
(7) |
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(1) |
Oct
(18) |
Nov
(8) |
Dec
(11) |
| 2008 |
Jan
(16) |
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andreas W. <an...@us...> - 2005-08-23 14:17:14
|
Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11332/src/net/sf/magicmap/server/facade Modified Files: PositionFacade.java Log Message: pos.setClient(Client) deleted, as it caused much trouble when creating or updating a refencepoint Index: PositionFacade.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PositionFacade.java 12 Jun 2005 12:26:08 -0000 1.7 --- PositionFacade.java 23 Aug 2005 14:17:07 -0000 1.8 *************** *** 140,144 **** pos.setPosY(positionY); pos.setFixed(fixed); ! pos.setClient(client); setNewSignalCharacter(character, pm, client, pos); --- 140,144 ---- pos.setPosY(positionY); pos.setFixed(fixed); ! //pos.setClient(client); setNewSignalCharacter(character, pm, client, pos); |
|
From: Andreas W. <an...@us...> - 2005-07-15 17:54:55
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20139/src/net/sf/magicmap/client/controller Modified Files: SOAPServerManager.java Log Message: konsistenz in fetchpositionsFromServer-Thread Index: SOAPServerManager.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SOAPServerManager.java 11 May 2005 10:51:27 -0000 1.1 --- SOAPServerManager.java 15 Jul 2005 17:54:32 -0000 1.2 *************** *** 353,357 **** try{ PositionDTO[] positions = SOAPServerManager.this.positionDelgate.getPositionsForMapSince( ! SOAPServerManager.this.sessionId, controller.getCurrentMap().name, timestamp); for (int i = 0; i < positions.length; i++){ if (positions[i].getLastModified().longValue() > SOAPServerManager.this.timestamp){ --- 353,357 ---- try{ PositionDTO[] positions = SOAPServerManager.this.positionDelgate.getPositionsForMapSince( ! SOAPServerManager.this.sessionId, controller.getCurrentMap().name, SOAPServerManager.this.timestamp); // korrigierter fehler? SOAPServerManager.this.timestamp anstatt timestamp for (int i = 0; i < positions.length; i++){ if (positions[i].getLastModified().longValue() > SOAPServerManager.this.timestamp){ |
|
From: Andreas W. <an...@us...> - 2005-07-15 16:40:15
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4627/src/net/sf/magicmap/client/controller Modified Files: Controller.java Log Message: Index: Controller.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Controller.java 11 May 2005 10:51:27 -0000 1.3 --- Controller.java 15 Jul 2005 16:40:04 -0000 1.4 *************** *** 337,340 **** --- 337,341 ---- } else{ serverManager.createLocation(x, y, fixed, name, callback); + } } |
|
From: Andreas W. <an...@us...> - 2005-07-15 16:40:15
|
Update of /cvsroot/magicmap//magicmapclient/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4627/dist Added Files: magicmap.jar Log Message: --- NEW FILE: magicmap.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Andreas W. <an...@us...> - 2005-07-15 16:40:14
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4627/src/net/sf/magicmap/client/views Modified Files: MapView.java Log Message: Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MapView.java 8 Jul 2005 20:12:10 -0000 1.9 --- MapView.java 15 Jul 2005 16:40:05 -0000 1.10 *************** *** 886,895 **** } else if (type == NodeModel.UPDATE_RESCAN){ sl.update(); - try { - wait(10000); - }catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } } --- 886,889 ---- |
|
From: Andreas W. <an...@us...> - 2005-07-15 16:40:14
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4627/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MapPanel.java 8 Jul 2005 20:12:10 -0000 1.9 --- MapPanel.java 15 Jul 2005 16:40:04 -0000 1.10 *************** *** 235,239 **** selectedNode.setUpdate(true); Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); ! selectedNode.setUpdate(false); } } --- 235,239 ---- selectedNode.setUpdate(true); Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); ! selectedNode.setUpdate(false); } } |
|
From: Andreas W. <an...@us...> - 2005-07-15 16:39:53
|
Update of /cvsroot/magicmap//magicmapclient/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4596/dist Log Message: Directory /cvsroot/magicmap//magicmapclient/dist added to the repository |
|
From: Andreas W. <an...@us...> - 2005-07-08 20:12:23
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27101/src/net/sf/magicmap/client/views Modified Files: MapView.java Log Message: new icon for location rescanning part 3 thread.sleep at the right position is missing Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MapView.java 8 Jul 2005 15:47:32 -0000 1.8 --- MapView.java 8 Jul 2005 20:12:10 -0000 1.9 *************** *** 884,888 **** --- 884,897 ---- sl.setX(v, node.getX()); sl.setY(v, node.getY()); + } else if (type == NodeModel.UPDATE_RESCAN){ + sl.update(); + try { + wait(10000); + }catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } + } |
|
From: Andreas W. <an...@us...> - 2005-07-08 20:12:23
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27101/src/net/sf/magicmap/client/model/node Modified Files: Node.java NodeModel.java Log Message: new icon for location rescanning part 3 thread.sleep at the right position is missing Index: NodeModel.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NodeModel.java 16 Jan 2005 16:01:26 -0000 1.1 --- NodeModel.java 8 Jul 2005 20:12:11 -0000 1.2 *************** *** 27,30 **** --- 27,31 ---- public static final int UPDATE_CLEAR = 4; public static final int UPDATE_POSITION = 5; + public static final int UPDATE_RESCAN = 6; public static final int NODETYPE_ACCESSPOINT = 1; Index: Node.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/model/node/Node.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Node.java 8 Jul 2005 16:59:41 -0000 1.3 --- Node.java 8 Jul 2005 20:12:11 -0000 1.4 *************** *** 54,57 **** --- 54,58 ---- public void setUpdate(boolean newupdate){ this.update = newupdate; + this.model.updateNode(this,NodeModel.UPDATE_RESCAN,null); } |
|
From: Andreas W. <an...@us...> - 2005-07-08 20:12:23
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27101/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: new icon for location rescanning part 3 thread.sleep at the right position is missing Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MapPanel.java 8 Jul 2005 16:59:40 -0000 1.8 --- MapPanel.java 8 Jul 2005 20:12:10 -0000 1.9 *************** *** 235,239 **** selectedNode.setUpdate(true); Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); ! selectedNode.setUpdate(false); } } --- 235,239 ---- selectedNode.setUpdate(true); Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); ! selectedNode.setUpdate(false); } } |
|
From: Andreas W. <an...@us...> - 2005-07-08 16:59:51
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25031/src/net/sf/magicmap/client/model/node Modified Files: Node.java Log Message: new icon for location rescanning part 2 Index: Node.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/model/node/Node.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Node.java 2 Jun 2005 00:13:12 -0000 1.2 --- Node.java 8 Jul 2005 16:59:41 -0000 1.3 *************** *** 19,22 **** --- 19,23 ---- private String internal; protected boolean fix; // Fest oder beweglich + protected boolean update = false; // wenn Referenzpunktupdate = true private int x; // Position (nur wenn fix = true) private int y; *************** *** 47,50 **** --- 48,59 ---- } + public boolean isUpdate(){ + return update; + } + + public void setUpdate(boolean newupdate){ + this.update = newupdate; + } + public boolean isFix(){ return fix; |
|
From: Andreas W. <an...@us...> - 2005-07-08 16:59:51
|
Update of /cvsroot/magicmap//magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25031/res Modified Files: screentext_de_DE.properties Log Message: new icon for location rescanning part 2 Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** screentext_de_DE.properties 11 May 2005 10:50:58 -0000 1.2 --- screentext_de_DE.properties 8 Jul 2005 16:59:41 -0000 1.3 *************** *** 10,14 **** disconnect_from_server=Vom Server trennen createlocation=Neuer Referenzpunkt ! namelocation=Benenne Referemzpunkt fetchlocations=Hole alle Orte vom Server rename=Umbenennen --- 10,14 ---- disconnect_from_server=Vom Server trennen createlocation=Neuer Referenzpunkt ! namelocation=Benenne Referenzpunkt fetchlocations=Hole alle Orte vom Server rename=Umbenennen *************** *** 62,66 **** connectionsproblemsreconnect=Verbindungsprobleme.\n\nMöchten Sie die Verbindung wiederherstellen? connectionproblems=Verbindungsprobleme ! retry=&Wiederholen yes=&Ja no=Nein --- 62,66 ---- connectionsproblemsreconnect=Verbindungsprobleme.\n\nMöchten Sie die Verbindung wiederherstellen? connectionproblems=Verbindungsprobleme ! retry=Wiederholen yes=&Ja no=Nein |
|
From: Andreas W. <an...@us...> - 2005-07-08 16:59:49
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25031/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: new icon for location rescanning part 2 Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MapPanel.java 12 Jun 2005 12:23:45 -0000 1.7 --- MapPanel.java 8 Jul 2005 16:59:40 -0000 1.8 *************** *** 29,32 **** --- 29,33 ---- import net.sf.magicmap.client.model.node.AccessPointNode; import net.sf.magicmap.client.model.node.ClientNode; + import net.sf.magicmap.client.model.node.LocationNode; import net.sf.magicmap.client.model.node.Node; import net.sf.magicmap.client.model.node.NodeModel; *************** *** 232,236 **** String r = selectedNode.getName(); if (r != null){ ! Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); } } --- 233,239 ---- String r = selectedNode.getName(); if (r != null){ ! selectedNode.setUpdate(true); ! Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); ! selectedNode.setUpdate(false); } } |
|
From: Florian L. <fle...@us...> - 2005-07-08 15:47:40
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21656/src/net/sf/magicmap/client/views Modified Files: MapView.java Log Message: new icon for location rescanning Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MapView.java 2 Jun 2005 00:13:12 -0000 1.7 --- MapView.java 8 Jul 2005 15:47:32 -0000 1.8 *************** *** 76,79 **** --- 76,80 ---- private Icon accessPointAnchorIcon; private Icon locationAnchorIcon; + private Icon locationRescanIcon; private DirectedSparseGraph graph; *************** *** 106,109 **** --- 107,111 ---- private boolean showClients = true; + /** * Erzeugt ein auf dem Model NodeModel aufbauenen *************** *** 128,131 **** --- 130,134 ---- this.accessPointAnchorIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_ACCESSPOINT_ANCHOR); this.locationAnchorIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_LOCATION_ANCHOR); + this.locationRescanIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_LOCATION_RESCAN); } *************** *** 164,170 **** return null; } ! if (node.isFix()) return locationAnchorIcon; ! else return locationIcon; default : --- 167,175 ---- return null; } ! if (node.isFix()){ ! if (((LocationNode)node).isUpdate()) ! return locationRescanIcon; return locationAnchorIcon; ! }else return locationIcon; default : |
|
From: Florian L. <fle...@us...> - 2005-07-08 15:47:40
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21656/src/net/sf/magicmap/client/gui/utils Modified Files: GUIConstants.java Log Message: new icon for location rescanning Index: GUIConstants.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIConstants.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GUIConstants.java 16 Jan 2005 16:01:29 -0000 1.1 --- GUIConstants.java 8 Jul 2005 15:47:32 -0000 1.2 *************** *** 50,53 **** --- 50,54 ---- public static final String ICON_ACCESSPOINT_ANCHOR = "custom/accesspoint_anchor.png"; public static final String ICON_LOCATION_ANCHOR = "custom/location_anchor.png"; + public static final String ICON_LOCATION_RESCAN = "custom/location_rescan.png"; } \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2005-07-08 15:27:01
|
Update of /cvsroot/magicmap/magicmapclient/res/toolBarButtonGraphics/custom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9702/res/toolBarButtonGraphics/custom Added Files: location_rescan.png Log Message: new icon for location rescanning --- NEW FILE: location_rescan.png --- (This appears to be a binary file; contents omitted.) |
|
From: Florian L. <fle...@us...> - 2005-06-21 23:38:27
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14561/src/net/sf/magicmap/client/views Modified Files: OutlineView.java Log Message: update icon on fixstate change of a node Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OutlineView.java 2 Jun 2005 00:13:12 -0000 1.2 --- OutlineView.java 21 Jun 2005 23:38:18 -0000 1.3 *************** *** 221,228 **** */ public void nodeUpdatedEvent(Node node, int type, Object data){ ! if (type == NodeModel.UPDATE_LABELCHANGED){ OutlineNode on = findOutlineNode(node); if (on != null){ ! //treemodel.nodeChanged(on); } else{ System.out.println("Node not found in tree view: " + node); --- 221,228 ---- */ public void nodeUpdatedEvent(Node node, int type, Object data){ ! if (type == NodeModel.UPDATE_LABELCHANGED || type == NodeModel.UPDATE_FIXSTATE){ OutlineNode on = findOutlineNode(node); if (on != null){ ! treemodel.nodeChanged(on); } else{ System.out.println("Node not found in tree view: " + node); |
|
From: Martin S. <sch...@us...> - 2005-06-12 12:26:20
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5835/src/net/sf/magicmap/server/facade Modified Files: PositionFacade.java Log Message: + add client to position on creation Index: PositionFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PositionFacade.java 11 May 2005 10:45:05 -0000 1.6 --- PositionFacade.java 12 Jun 2005 12:26:08 -0000 1.7 *************** *** 140,143 **** --- 140,144 ---- pos.setPosY(positionY); pos.setFixed(fixed); + pos.setClient(client); setNewSignalCharacter(character, pm, client, pos); |
|
From: Martin S. <sch...@us...> - 2005-06-12 12:24:00
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4686/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: + replaced deprecated methods + TODO: do not include client and time inside position name! + source formatted, make use of magicmapserver/codingconventions.xml Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MapPanel.java 11 Jun 2005 20:41:31 -0000 1.6 --- MapPanel.java 12 Jun 2005 12:23:45 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- import java.awt.Dimension; import java.awt.event.ActionEvent; + import java.text.SimpleDateFormat; import java.util.Date; *************** *** 30,33 **** --- 31,35 ---- import net.sf.magicmap.client.model.node.Node; import net.sf.magicmap.client.model.node.NodeModel; + import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.views.MapView; *************** *** 203,207 **** /** * Referenzpunkt mit aktuell gemessenen Werten anlegen. Dies ! * geschieht �ber den Controller, so dass dieser am Server * gespeichert werden kann. * --- 205,209 ---- /** * Referenzpunkt mit aktuell gemessenen Werten anlegen. Dies ! * geschieht über den Controller, so dass dieser am Server * gespeichert werden kann. * *************** *** 210,215 **** String r = JOptionPane.showInputDialog(this, GUIUtils.i18n("locationname")); if (r != null){ ! Date date = new Date(System.currentTimeMillis()); ! Controller.getInstance().createLocation(getLastX(), getLastY(), (r +" (" + Controller.getInstance().getClient().getName() + ") <" + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds() + " " + date.getDate() + "." + (date.getMonth()+1) + "." + (1900+date.getYear()) + ">"), true, this); } } --- 212,225 ---- String r = JOptionPane.showInputDialog(this, GUIUtils.i18n("locationname")); if (r != null){ ! Date date = new Date(); ! String timeAsString = new SimpleDateFormat(Settings.TIME_DATE_FORMAT).format(date); ! ! /*TODO: WORKAROUND, die Position hat alle nötigen Informationen (Client, der sie angelegt/verändert hat), Zeitpunkt der letzten Änderung, ! * daher sollte die Information über den Client und der Zeitpunkt des Anlegens einer Position !!!NICHT!!! in ihrem Namen gespeichert werden!!!! ! * ! * todo: Hier den Client und den Zeitpunkt aus dem Namen entfernen, Information nur beim Darstellen auf der Karte aus dem PositionDTO nehmen! ! */ ! Controller.getInstance().createLocation(getLastX(), getLastY(), ! (r + " (" + Controller.getInstance().getClient().getName() + ") <" + timeAsString + ">"), true, this); } } |
|
From: Martin S. <sch...@us...> - 2005-06-12 12:24:00
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4686/src/net/sf/magicmap/client/utils Modified Files: Settings.java Log Message: + replaced deprecated methods + TODO: do not include client and time inside position name! + source formatted, make use of magicmapserver/codingconventions.xml Index: Settings.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Settings.java 11 May 2005 10:51:31 -0000 1.5 --- Settings.java 12 Jun 2005 12:23:46 -0000 1.6 *************** *** 13,17 **** public static final int TIMEOUT = 15000; ! public static final int POLL_INTERVAL = 5000; public static final long POLL_DELAY = 500; public static String WEBSERVICE_PATH = "/magicmap/services/"; --- 13,17 ---- public static final int TIMEOUT = 15000; ! public static final int POLL_INTERVAL = 5000; public static final long POLL_DELAY = 500; public static String WEBSERVICE_PATH = "/magicmap/services/"; *************** *** 26,29 **** --- 26,31 ---- public static String hostname = "phl.informatik.hu-berlin.de"; public static int port = 80; + + public static final String TIME_DATE_FORMAT = "HH:mm:ss dd.MM.yyyy"; public static String getClientMAC(){ |
|
From: Andreas W. <an...@us...> - 2005-06-11 20:41:39
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26513/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: Timestamp at Location now shows the correct month. Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MapPanel.java 10 Jun 2005 16:31:36 -0000 1.5 --- MapPanel.java 11 Jun 2005 20:41:31 -0000 1.6 *************** *** 211,215 **** if (r != null){ Date date = new Date(System.currentTimeMillis()); ! Controller.getInstance().createLocation(getLastX(), getLastY(), (r +" (" + Controller.getInstance().getClient().getName() + ") <" + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds() + " " + date.getDate() + "." + date.getMonth() + "." + (1900+date.getYear()) + ">"), true, this); } } --- 211,215 ---- if (r != null){ Date date = new Date(System.currentTimeMillis()); ! Controller.getInstance().createLocation(getLastX(), getLastY(), (r +" (" + Controller.getInstance().getClient().getName() + ") <" + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds() + " " + date.getDate() + "." + (date.getMonth()+1) + "." + (1900+date.getYear()) + ">"), true, this); } } |
|
From: Florian L. <fle...@us...> - 2005-06-10 16:31:57
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15683/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: Timstamp for location added (ugly has to be changed later) Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MapPanel.java 11 May 2005 10:51:31 -0000 1.4 --- MapPanel.java 10 Jun 2005 16:31:36 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- import java.awt.Dimension; import java.awt.event.ActionEvent; + import java.util.Date; import javax.swing.AbstractAction; *************** *** 209,213 **** String r = JOptionPane.showInputDialog(this, GUIUtils.i18n("locationname")); if (r != null){ ! Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); } } --- 210,215 ---- String r = JOptionPane.showInputDialog(this, GUIUtils.i18n("locationname")); if (r != null){ ! Date date = new Date(System.currentTimeMillis()); ! Controller.getInstance().createLocation(getLastX(), getLastY(), (r +" (" + Controller.getInstance().getClient().getName() + ") <" + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds() + " " + date.getDate() + "." + date.getMonth() + "." + (1900+date.getYear()) + ">"), true, this); } } |
|
From: Florian L. <fle...@us...> - 2005-06-09 15:19:41
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28161/src/net/sf/magicmap/client/utils Modified Files: Version.java Log Message: Version updated Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Version.java 11 May 2005 16:13:37 -0000 1.11 --- Version.java 9 Jun 2005 15:19:29 -0000 1.12 *************** *** 15,19 **** public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 7; ! public static final String VERSION_FLAVOR = " unstable"; public static String getVersion(){ --- 15,19 ---- public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 7; ! public static final String VERSION_FLAVOR = ""; public static String getVersion(){ |
|
From: Florian L. <fle...@us...> - 2005-06-09 15:14:59
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25808/src/net/sf/magicmap/client/views Modified Files: MeasurementView.java Log Message: alphabetical sort-order for macaddresses in measurement-table added Index: MeasurementView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MeasurementView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MeasurementView.java 16 Jan 2005 16:01:32 -0000 1.1 --- MeasurementView.java 9 Jun 2005 15:14:42 -0000 1.2 *************** *** 126,130 **** Graphics2D g2 = (Graphics2D) g; ! // Farbverlauf von rot nach gelb nach grün GradientPaint p1 = new GradientPaint(0, 0, Color.RED, getWidth() / 2, getHeight(), Color.YELLOW); GradientPaint p2 = new GradientPaint(getWidth() / 2, 0, Color.YELLOW, getWidth(), getHeight(), Color.GREEN); --- 126,130 ---- Graphics2D g2 = (Graphics2D) g; ! // Farbverlauf von rot nach gelb nach gr�n GradientPaint p1 = new GradientPaint(0, 0, Color.RED, getWidth() / 2, getHeight(), Color.YELLOW); GradientPaint p2 = new GradientPaint(getWidth() / 2, 0, Color.YELLOW, getWidth(), getHeight(), Color.GREEN); *************** *** 152,160 **** */ public synchronized void seesAccessPoint(SeenAccessPoint ap){ ! tableModel.addRow(new Object[]{ap.getMac(), ap.isDead() ? "-" : "" + ap.getLastSignalLevel() + " dB", ! "" + (Math.round(ap.getAverageSignalLevel() * 10.0)) / 10.0 + " dB", ap, ap}); } ! /* (non-Javadoc) * @see net.sf.magicmap.client.interfaces.MeasurementModelListener#notseesAccessPoint(net.sf.magicmap.client.model.measurement.SeenAccessPoint) */ --- 152,174 ---- */ public synchronized void seesAccessPoint(SeenAccessPoint ap){ ! int index = getAlphabeticalIndex(ap); ! tableModel.insertRow(index, new Object[]{ap.getMac(), ap.isDead() ? "-" : "" + ap.getLastSignalLevel() + " dB", ! "" + (Math.round(ap.getAverageSignalLevel() * 10.0)) / 10.0 + " dB", ap, ap}); } ! /** ! * @param ap ! * @return ! */ ! private int getAlphabeticalIndex(SeenAccessPoint ap) { ! int index=0; ! while((tableModel.getRowCount() > index) && (ap.getMac().compareToIgnoreCase(tableModel.getValueAt(index,0).toString()) > 0)){ ! System.out.println("Compare: " + ap.getMac() + " with " + tableModel.getValueAt(index,0).toString()); ! ++index; ! } ! return index; ! } ! ! /* (non-Javadoc) * @see net.sf.magicmap.client.interfaces.MeasurementModelListener#notseesAccessPoint(net.sf.magicmap.client.model.measurement.SeenAccessPoint) */ *************** *** 202,206 **** public void clearAccessPoints(){ for (int i = tableModel.getRowCount() - 1; i >= 0; i--){ ! System.out.println("Lösche: " + tableModel.getValueAt(i, 0)); tableModel.removeRow(i); tableModel.fireTableRowsDeleted(i, i); --- 216,220 ---- public void clearAccessPoints(){ for (int i = tableModel.getRowCount() - 1; i >= 0; i--){ ! System.out.println("L�sche: " + tableModel.getValueAt(i, 0)); tableModel.removeRow(i); tableModel.fireTableRowsDeleted(i, i); |
|
From: Tobias H. <thu...@us...> - 2005-06-08 17:44:55
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4715/src/net/sf/magicmap/client/controller Modified Files: PollHandler.java Log Message: fixed missing position change on "clientnode fixation" (hopefully) Index: PollHandler.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PollHandler.java 2 Jun 2005 00:13:12 -0000 1.4 --- PollHandler.java 8 Jun 2005 17:44:40 -0000 1.5 *************** *** 252,255 **** --- 252,256 ---- // Client wurde fixiert client.setFix(true); + client.setPosition(position.getPosX().intValue(), position.getPosY().intValue()); } else{ client.setFix(false); |
1 message has been excluded from this view by a project administrator.
