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: Johannes Z. <jza...@us...> - 2006-02-28 11:23:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: added support for info objects and rfid antennas and tags Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MapPanel.java 23 Feb 2006 18:34:39 -0000 1.14 --- MapPanel.java 28 Feb 2006 11:23:16 -0000 1.15 *************** *** 19,22 **** --- 19,24 ---- import net.sf.magicmap.client.controller.Controller; import net.sf.magicmap.client.gui.dialogs.GeoPosDialog; + import net.sf.magicmap.client.gui.dialogs.InfoObjectDialog; + import net.sf.magicmap.client.gui.dialogs.RFIDAntennaDialog; import net.sf.magicmap.client.gui.utils.GUIBuilder; import net.sf.magicmap.client.gui.utils.GUIConstants; *************** *** 31,37 **** --- 33,41 ---- import net.sf.magicmap.client.model.node.ClientNode; import net.sf.magicmap.client.model.node.GeoPos; + import net.sf.magicmap.client.model.node.InfoObject; import net.sf.magicmap.client.model.node.LocationNode; import net.sf.magicmap.client.model.node.Node; import net.sf.magicmap.client.model.node.NodeModel; + import net.sf.magicmap.client.model.node.RFIDAntenna; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.views.MapView; *************** *** 65,68 **** --- 69,73 ---- private AbstractAction createInfoObjectAction; private AbstractAction createRFIDAntennaAction; + private AbstractAction createRFIDTagAction; private AbstractAction fetchLocationsAction; private MagicAction fixAction; *************** *** 142,145 **** --- 147,161 ---- } }; + + createRFIDTagAction = new AbstractAction(GUIUtils.i18n("createrfidtag")) { + /** + * serial version id + */ + private static final long serialVersionUID = 1L; + + public void actionPerformed(ActionEvent e){ + createRFIDTag(); + } + }; measureLocationAction = new AbstractAction(GUIUtils.i18n("measurelocation")) { *************** *** 232,237 **** menu.add(GUIBuilder.createMenuItem(createLocationAction)); menu.add(GUIBuilder.createMenuItem(createGeoPosAction)); ! // menu.add(GUIBuilder.createMenuItem(createInfoObjectAction)); ! // menu.add(GUIBuilder.createMenuItem(createRFIDAntennaAction)); menu.addSeparator(); menu.add(GUIBuilder.createMenuItem(fetchLocationsAction)); --- 248,253 ---- menu.add(GUIBuilder.createMenuItem(createLocationAction)); menu.add(GUIBuilder.createMenuItem(createGeoPosAction)); ! menu.add(GUIBuilder.createMenuItem(createInfoObjectAction)); ! menu.add(GUIBuilder.createMenuItem(createRFIDAntennaAction)); menu.addSeparator(); menu.add(GUIBuilder.createMenuItem(fetchLocationsAction)); *************** *** 345,360 **** */ void createInfoObject() { ! 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); } } --- 361,368 ---- */ void createInfoObject() { ! InfoObject infoObject = InfoObjectDialog.showDialog(MainGUI.getInstance()); ! if (infoObject != null) { ! Controller.getInstance().createInfoObject(getLastX(), getLastY(), infoObject, ! Controller.getInstance().getCurrentMap().name, true, this); } } *************** *** 366,369 **** --- 374,390 ---- */ void createRFIDAntenna() { + RFIDAntenna antenna = RFIDAntennaDialog.showDialog(MainGUI.getInstance()); + if (antenna != null) { + Controller.getInstance().createRFIDAntenna(getLastX(), getLastY(), antenna, + Controller.getInstance().getCurrentMap().name, true, this); + } + } + + + /** + * Create an info object for the current selected location + * + */ + void createRFIDTag() { String r = JOptionPane.showInputDialog(this, GUIUtils.i18n("locationname")); if (r != null){ |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:24
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/interfaces Modified Files: FetchPositionsCallback.java ServerPollerListener.java Log Message: added support for info objects and rfid antennas and tags Index: FetchPositionsCallback.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces/FetchPositionsCallback.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FetchPositionsCallback.java 26 Feb 2006 10:20:57 -0000 1.4 --- FetchPositionsCallback.java 28 Feb 2006 11:23:16 -0000 1.5 *************** *** 5,8 **** --- 5,10 ---- package net.sf.magicmap.client.interfaces; + import java.util.Collection; + import net.sf.magicmap.server.dto.GeoPointDTO; import net.sf.magicmap.server.dto.MapDTO; *************** *** 39,42 **** --- 41,61 ---- */ public void geoPointsFetches(GeoPointDTO[] geoPoses); + + + /** + * + * @param infoObjects + */ + public void infoPointsFetched(Collection infoObjects); + + /** + * @param rfidAntennas + */ + public void rfidAntennasFetched(Collection rfidAntennas); + + /** + * @param rfidTags + */ + public void rfidTagsFetched(Collection rfidTags); } \ No newline at end of file Index: ServerPollerListener.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ServerPollerListener.java 26 Feb 2006 10:20:57 -0000 1.4 --- ServerPollerListener.java 28 Feb 2006 11:23:16 -0000 1.5 *************** *** 5,8 **** --- 5,11 ---- package net.sf.magicmap.client.interfaces; + import net.sf.magicmap.client.model.node.InfoObject; + import net.sf.magicmap.client.model.node.RFIDAntenna; + import net.sf.magicmap.client.model.node.RFIDTag; import net.sf.magicmap.server.dto.GeoPointDTO; import net.sf.magicmap.server.dto.MapDTO; *************** *** 45,49 **** public void geoPosCreatedOrUpdatedOrDeleted(GeoPointDTO pointDTO); ! // public void geoPointCreatedOrUpdatedOrDeleted(GeoPointDTO geoPoint); } \ No newline at end of file --- 48,65 ---- public void geoPosCreatedOrUpdatedOrDeleted(GeoPointDTO pointDTO); ! /** ! * @param infoObject ! */ ! public void infoObjectCreatedorUpdatedOrDeleted(InfoObject infoObject); ! ! /** ! * @param antenna ! */ ! public void rfidAntennaCreatedOrUpdatedOrDeleted(RFIDAntenna antenna); ! ! /** ! * @param tag ! */ ! public void rfidTagCreatedOrUpdatedOrDeleted(RFIDTag tag); } \ No newline at end of file |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:22
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23808/src/net/sf/magicmap/client/delegate Modified Files: MapDelegate.java Log Message: added support for info objects and rfid antennas and tags Index: MapDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/MapDelegate.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MapDelegate.java 23 Feb 2006 17:01:43 -0000 1.6 --- MapDelegate.java 28 Feb 2006 11:23:16 -0000 1.7 *************** *** 13,18 **** --- 13,21 ---- import localhost.magicmap.services.MapFacade.MapFacadeServiceLocator; import localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub; + import net.sf.magicmap.client.controller.Controller; import net.sf.magicmap.client.delegate.exception.ExceptionHandler; import net.sf.magicmap.client.delegate.interfaces.MapFacadeInterface; + import net.sf.magicmap.client.model.node.InfoObject; + import net.sf.magicmap.client.model.node.RFIDAntenna; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.server.dto.GeoPointDTO; *************** *** 116,119 **** --- 119,137 ---- } } + + + /* (non-Javadoc) + * @see net.sf.magicmap.client.delegate.interfaces.MapFacadeInterface#createInfoObject(long, java.lang.String, int, int, java.lang.String, int) + */ + public void createInfoObject(long sessionId, String mapName, int x, int y, String url, int type) { + Controller.getInstance().getInfoObjects().add(new InfoObject(url, type, x, y, mapName)); + } + + /* (non-Javadoc) + * @see net.sf.magicmap.client.delegate.interfaces.MapFacadeInterface#createRFIDAntenna(long, java.lang.String, int, int, java.lang.String) + */ + public void createRFIDAntenna(long sessionId, String mapName, int x, int y, String url) { + Controller.getInstance().getRfidAntennas().add(new RFIDAntenna(url, x, y, mapName)); + } } \ No newline at end of file |
|
From: Johannes Z. <jza...@us...> - 2006-02-28 11:23:01
|
Update of /cvsroot/magicmap/magicmapclient/res/toolBarButtonGraphics/custom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23344/res/toolBarButtonGraphics/custom Added Files: rfid_antenna.png image.png rfid_tag.png info.png Log Message: added support for info objects and rfid antennas and tags --- NEW FILE: rfid_tag.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: info.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rfid_antenna.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: image.png --- (This appears to be a binary file; contents omitted.) |
|
From: Florian L. <fle...@us...> - 2006-02-27 20:20:09
|
Update of /cvsroot/magicmap/magicmapclient/inf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27729/inf Modified Files: PositionFacade.wsdl Log Message: Index: PositionFacade.wsdl =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/inf/PositionFacade.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PositionFacade.wsdl 8 Nov 2005 11:24:18 -0000 1.2 --- PositionFacade.wsdl 27 Feb 2006 20:19:58 -0000 1.3 *************** *** 35,38 **** --- 35,39 ---- <complexType name="AccessPointDTO"> <sequence> + <element name="hidden" type="xsd:boolean"/> <element name="id" nillable="true" type="soapenc:long"/> <element name="mac" nillable="true" type="soapenc:string"/> *************** *** 83,86 **** --- 84,103 ---- </wsdl:types> + <wsdl:message name="createOrUpdateAccessPositionResponse"> + + </wsdl:message> + + <wsdl:message name="getPositionsForMapSinceResponse"> + + <wsdl:part name="getPositionsForMapSinceReturn" type="impl:ArrayOf_tns2_PositionDTO"/> + + </wsdl:message> + + <wsdl:message name="SessionException"> + + <wsdl:part name="fault" type="tns1:SessionException"/> + + </wsdl:message> + <wsdl:message name="createOrUpdatePositionRequest"> *************** *** 101,137 **** </wsdl:message> ! <wsdl:message name="createOrUpdatePositionResponse"> ! ! </wsdl:message> ! ! <wsdl:message name="movePositionResponse"> </wsdl:message> ! <wsdl:message name="getPositionsForMapSinceResponse"> ! <wsdl:part name="getPositionsForMapSinceReturn" type="impl:ArrayOf_tns2_PositionDTO"/> ! </wsdl:message> ! <wsdl:message name="MapException"> ! <wsdl:part name="fault" type="tns1:MapException"/> ! </wsdl:message> ! <wsdl:message name="createOrUpdateClientPositionResponse"> </wsdl:message> ! <wsdl:message name="SessionException"> ! ! <wsdl:part name="fault" type="tns1:SessionException"/> </wsdl:message> ! <wsdl:message name="getPositionForClientOnMapResponse"> ! ! <wsdl:part name="getPositionForClientOnMapReturn" type="soapenc:string"/> </wsdl:message> --- 118,146 ---- </wsdl:message> ! <wsdl:message name="createOrUpdateClientPositionResponse"> </wsdl:message> ! <wsdl:message name="createOrUpdateAccessPositionRequest"> ! <wsdl:part name="sessionId" type="xsd:long"/> ! <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="positionX" type="xsd:int"/> ! <wsdl:part name="positionY" type="xsd:int"/> ! <wsdl:part name="accessPointMac" type="soapenc:string"/> ! <wsdl:part name="fixed" type="xsd:boolean"/> </wsdl:message> ! <wsdl:message name="setAccessPointHiddenStatusResponse"> </wsdl:message> ! <wsdl:message name="deletePositionResponse"> </wsdl:message> *************** *** 153,185 **** </wsdl:message> ! <wsdl:message name="createOrUpdateClientPositionRequest"> <wsdl:part name="sessionId" type="xsd:long"/> ! <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="positionX" type="xsd:int"/> ! <wsdl:part name="positionY" type="xsd:int"/> ! <wsdl:part name="character" type="tns2:SignalCharacterDTO"/> ! <wsdl:part name="clientMac" type="soapenc:string"/> ! <wsdl:part name="fixed" type="xsd:boolean"/> </wsdl:message> ! <wsdl:message name="deletePositionRequest"> <wsdl:part name="sessionId" type="xsd:long"/> ! <wsdl:part name="mapname" type="soapenc:string"/> ! <wsdl:part name="positionId" type="xsd:long"/> </wsdl:message> ! <wsdl:message name="getPositionsForMapSinceRequest"> <wsdl:part name="sessionId" type="xsd:long"/> --- 162,196 ---- </wsdl:message> ! <wsdl:message name="deletePositionRequest"> <wsdl:part name="sessionId" type="xsd:long"/> ! <wsdl:part name="mapname" type="soapenc:string"/> ! <wsdl:part name="positionId" type="xsd:long"/> ! </wsdl:message> ! <wsdl:message name="getPositionsForMapSinceRequest"> ! <wsdl:part name="sessionId" type="xsd:long"/> ! <wsdl:part name="mapName" type="soapenc:string"/> ! ! <wsdl:part name="timeStamp" type="xsd:long"/> </wsdl:message> ! <wsdl:message name="getPositionForClientOnMapRequest"> <wsdl:part name="sessionId" type="xsd:long"/> ! <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="clientMac" type="soapenc:string"/> </wsdl:message> ! <wsdl:message name="createOrUpdateClientPositionRequest"> <wsdl:part name="sessionId" type="xsd:long"/> *************** *** 187,199 **** <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="timeStamp" type="xsd:long"/> ! </wsdl:message> ! <wsdl:message name="deletePositionResponse"> </wsdl:message> ! <wsdl:message name="getPositionForClientOnMapRequest"> <wsdl:part name="sessionId" type="xsd:long"/> --- 198,214 ---- <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="positionX" type="xsd:int"/> ! <wsdl:part name="positionY" type="xsd:int"/> ! <wsdl:part name="character" type="tns2:SignalCharacterDTO"/> ! ! <wsdl:part name="clientMac" type="soapenc:string"/> ! ! <wsdl:part name="fixed" type="xsd:boolean"/> </wsdl:message> ! <wsdl:message name="setAccessPointHiddenStatusRequest"> <wsdl:part name="sessionId" type="xsd:long"/> *************** *** 201,225 **** <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="clientMac" type="soapenc:string"/> </wsdl:message> ! <wsdl:message name="createOrUpdateAccessPositionRequest"> ! <wsdl:part name="sessionId" type="xsd:long"/> ! <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="positionX" type="xsd:int"/> ! <wsdl:part name="positionY" type="xsd:int"/> ! <wsdl:part name="accessPointMac" type="soapenc:string"/> ! <wsdl:part name="fixed" type="xsd:boolean"/> </wsdl:message> ! <wsdl:message name="createOrUpdateAccessPositionResponse"> </wsdl:message> --- 216,242 ---- <wsdl:part name="mapName" type="soapenc:string"/> ! <wsdl:part name="accessPointMac" type="soapenc:string"/> ! ! <wsdl:part name="hidden" type="xsd:boolean"/> </wsdl:message> ! <wsdl:message name="createOrUpdatePositionResponse"> ! </wsdl:message> ! <wsdl:message name="MapException"> ! <wsdl:part name="fault" type="tns1:MapException"/> ! </wsdl:message> ! <wsdl:message name="getPositionForClientOnMapResponse"> ! <wsdl:part name="getPositionForClientOnMapReturn" type="soapenc:string"/> </wsdl:message> ! <wsdl:message name="movePositionResponse"> </wsdl:message> *************** *** 311,314 **** --- 328,343 ---- </wsdl:operation> + <wsdl:operation name="setAccessPointHiddenStatus" parameterOrder="sessionId mapName accessPointMac hidden"> + + <wsdl:input message="impl:setAccessPointHiddenStatusRequest" name="setAccessPointHiddenStatusRequest"/> + + <wsdl:output message="impl:setAccessPointHiddenStatusResponse" name="setAccessPointHiddenStatusResponse"/> + + <wsdl:fault message="impl:MapException" name="MapException"/> + + <wsdl:fault message="impl:SessionException" name="SessionException"/> + + </wsdl:operation> + </wsdl:portType> *************** *** 527,530 **** --- 556,589 ---- </wsdl:operation> + <wsdl:operation name="setAccessPointHiddenStatus"> + + <wsdlsoap:operation soapAction=""/> + + <wsdl:input name="setAccessPointHiddenStatusRequest"> + + <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> + + </wsdl:input> + + <wsdl:output name="setAccessPointHiddenStatusResponse"> + + <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://localhost:8080/magicmap/services/PositionFacade" use="encoded"/> + + </wsdl:output> + + <wsdl:fault name="MapException"> + + <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="MapException" namespace="http://localhost:8080/magicmap/services/PositionFacade" use="encoded"/> + + </wsdl:fault> + + <wsdl:fault name="SessionException"> + + <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="SessionException" namespace="http://localhost:8080/magicmap/services/PositionFacade" use="encoded"/> + + </wsdl:fault> + + </wsdl:operation> + </wsdl:binding> |
|
From: Johannes Z. <jza...@us...> - 2006-02-26 11:38:07
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830/src/net/sf/magicmap/client/model/node Modified Files: GeoPosNode.java Node.java MapNode.java NodeModel.java GeoPos.java Log Message: Bugfixes f. schnellen Kartenwechsel Geopositionen implementiert Index: MapNode.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/MapNode.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapNode.java 20 Feb 2006 08:50:09 -0000 1.3 --- MapNode.java 26 Feb 2006 10:20:57 -0000 1.4 *************** *** 6,9 **** --- 6,10 ---- import javax.swing.SwingUtilities; + import net.sf.magicmap.client.gui.MainGUI; import net.sf.magicmap.client.interfaces.MapCallback; import net.sf.magicmap.client.meta.MapInfo; *************** *** 40,43 **** --- 41,56 ---- return NodeModel.NODETYPE_MAP; } + + /** + * Sets the map info object + * @param mapDTO + */ + public void setMapInfo(MapDTO mapDTO) { + mapInfo = new MapInfo(); + mapInfo.height = mapDTO.getImageHeight().intValue(); + mapInfo.width = mapDTO.getImageWidth().intValue(); + mapInfo.name = mapDTO.getName(); + mapInfo.imageURL = mapDTO.getImageURL().toString(); + } /* (non-Javadoc) *************** *** 55,58 **** --- 68,72 ---- mapInfo.name = mapDTO.getName(); mapInfo.imageURL = mapDTO.getImageURL().toString(); + MainGUI.getInstance().loadMap(mapInfo); } }); Index: NodeModel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/NodeModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NodeModel.java 20 Feb 2006 08:50:20 -0000 1.3 --- NodeModel.java 26 Feb 2006 10:20:57 -0000 1.4 *************** *** 18,77 **** * * @author thuebner */ public class NodeModel { ! public static final int UPDATE_SEESACCESSPOINT = 0; ! public static final int UPDATE_NOTSEESACCESSPOINT = 1; ! public static final int UPDATE_LABELCHANGED = 2; ! public static final int UPDATE_FIXSTATE = 3; ! 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; ! public static final int NODETYPE_CLIENT = 2; ! public static final int NODETYPE_LOCATION = 3; ! // TODO: this does not really fulfil the concept, has to extended later ! public static final int NODETYPE_MAP = 4; ! private HashMap nodes; ! private HashMap accesspoints; ! private ArrayList listeners; ! /** ! * Erzeugt neues leeres Model ! * ! */ ! public NodeModel() { ! this.nodes = new HashMap(); ! this.accesspoints = new HashMap(); ! this.listeners = new ArrayList(); ! } ! public void addNode(Node node){ ! this.nodes.put(node.getName(), node); ! if (node.getType() == NODETYPE_ACCESSPOINT){ ! // Wenn AccessPoint, dann nach MAC-Adresse extra hashen ! this.accesspoints.put(((AccessPointNode) node).getMacAddress(), node); ! } ! Iterator it = listeners.iterator(); ! while (it.hasNext()){ ! NodeModelListener l = (NodeModelListener) it.next(); ! l.nodeAddedEvent(node); ! } ! } ! public void removeNode(Node node){ ! this.nodes.remove(node.getName()); ! if (node.getType() == NODETYPE_ACCESSPOINT){ ! // Wenn AccessPoint, dann nach MAC-Adresse extra hashen ! this.accesspoints.remove(((AccessPointNode) node).getMacAddress()); ! } ! Iterator it = listeners.iterator(); ! while (it.hasNext()){ ! NodeModelListener l = (NodeModelListener) it.next(); ! l.nodeRemovedEvent(node); ! } ! } public void fireSeesAccessPoint(Node node, AccessPointNode ap){ --- 18,92 ---- * * @author thuebner + * + * Extended to be also able to handle other nodes + * (maps (as a special case), geopoints, info objects, rfid antennas, etc.) + * + * @author Johannes Zapotoczky (joh...@za...) + * */ public class NodeModel { ! public static final int UPDATE_SEESACCESSPOINT = 0; ! public static final int UPDATE_NOTSEESACCESSPOINT = 1; ! public static final int UPDATE_LABELCHANGED = 2; ! public static final int UPDATE_FIXSTATE = 3; ! 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; ! public static final int NODETYPE_CLIENT = 2; ! public static final int NODETYPE_LOCATION = 3; ! public static final int NODETYPE_MAP = 4; ! public static final int NODETYPE_GEOPOS = 5; ! private HashMap nodes; ! private HashMap accesspoints; ! private ArrayList listeners; ! /** ! * Erzeugt neues leeres Model ! * ! */ ! public NodeModel() { ! this.nodes = new HashMap(); ! this.accesspoints = new HashMap(); ! this.listeners = new ArrayList(); ! } ! /** ! * Add a new node ! * @param node ! */ ! public void addNode(Node node) { ! this.nodes.put(node.getName(), node); ! // special handling for APs ! if (node.getType() == NODETYPE_ACCESSPOINT){ ! // Wenn AccessPoint, dann nach MAC-Adresse extra hashen ! this.accesspoints.put(((AccessPointNode) node).getMacAddress(), node); ! } ! Iterator it = listeners.iterator(); ! while (it.hasNext()){ ! NodeModelListener l = (NodeModelListener) it.next(); ! l.nodeAddedEvent(node); ! } ! } ! /** ! * Remove a node ! * @param node ! */ ! public void removeNode(Node node){ ! this.nodes.remove(node.getName()); ! if (node.getType() == NODETYPE_ACCESSPOINT){ ! // Wenn AccessPoint, dann nach MAC-Adresse extra hashen ! this.accesspoints.remove(((AccessPointNode) node).getMacAddress()); ! } ! Iterator it = listeners.iterator(); ! while (it.hasNext()) { ! NodeModelListener l = (NodeModelListener) it.next(); ! l.nodeRemovedEvent(node); ! } ! } public void fireSeesAccessPoint(Node node, AccessPointNode ap){ *************** *** 117,130 **** } ! public void addNodeModelListener(NodeModelListener l){ ! if (!listeners.contains(l)){ ! this.listeners.add(l); ! Iterator it = nodes.values().iterator(); ! while (it.hasNext()){ ! Node node = (Node) it.next(); ! l.nodeAddedEvent(node); ! } ! } ! } public void removeNodeModelListener(NodeModelListener l){ --- 132,146 ---- } ! ! public void addNodeModelListener(NodeModelListener nodeModelListener) { ! if (!listeners.contains(nodeModelListener)) { ! this.listeners.add(nodeModelListener); ! Iterator nodesIterator = nodes.values().iterator(); ! while (nodesIterator.hasNext()) { ! Node node = (Node) nodesIterator.next(); ! nodeModelListener.nodeAddedEvent(node); ! } ! } ! } public void removeNodeModelListener(NodeModelListener l){ Index: GeoPos.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/GeoPos.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GeoPos.java 23 Feb 2006 18:34:38 -0000 1.1 --- GeoPos.java 26 Feb 2006 10:20:57 -0000 1.2 *************** *** 180,197 **** public Integer getLongitudeDegrees() { ! return new Integer(longitude % GEO_MS2DEGREES_FACTOR); } public Integer getLongitudeMinutes() { ! return new Integer(longitude % (GEO_MS2DEGREES_FACTOR / 60)); } public Integer getLongitudeSeconds() { ! return new Integer(0); } public String toString() { return "longitude: " + this.longitude + ", latitude: " + --- 180,223 ---- public Integer getLongitudeDegrees() { ! return new Integer(longitude / GEO_MS2DEGREES_FACTOR); } public Integer getLongitudeMinutes() { ! int minutes = longitude % GEO_MS2DEGREES_FACTOR; ! return new Integer(minutes / 60 / GEO_M2N_FACTOR); ! } public Integer getLongitudeSeconds() { ! int minutes = longitude % GEO_MS2DEGREES_FACTOR; ! int seconds = minutes % 60000; ! //TODO: vernünftige Rundung einbauen!! ! return new Integer(seconds / GEO_M2N_FACTOR); } + public Integer getLatitudeDegrees() { + return new Integer(latitude / GEO_MS2DEGREES_FACTOR); + } + + + public Integer getLatitudeMinutes() { + int minutes = latitude % GEO_MS2DEGREES_FACTOR; + return new Integer(minutes / 60 / GEO_M2N_FACTOR); + + } + + + public Integer getLatitudeSeconds() { + int minutes = latitude % GEO_MS2DEGREES_FACTOR; + int seconds = minutes % 60000; + //TODO: vernünftige Rundung einbauen!! + return new Integer(seconds / GEO_M2N_FACTOR); + } + + + public String toString() { return "longitude: " + this.longitude + ", latitude: " + *************** *** 199,202 **** --- 225,237 ---- ", exactitude: " + this.exactitude; } + + public String getStringRepresentation() { + return getLongitudeDegrees().intValue() + "° " + + getLongitudeMinutes().intValue() + "' " + + getLongitudeSeconds().intValue() + "'' :: " + + getLatitudeDegrees().intValue() + "° " + + getLatitudeMinutes().intValue() + "' " + + getLatitudeSeconds().intValue() + "''"; + } public int getLatitude() { Index: Node.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/Node.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Node.java 8 Jul 2005 20:12:11 -0000 1.4 --- Node.java 26 Feb 2006 10:20:57 -0000 1.5 *************** *** 14,121 **** public abstract class Node { ! private static int counter = 0; ! private String name; // Beschreibung ! 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; ! private long id; ! private NodeModel model; ! /** ! * Erzeugt leeren Knoten. Ein Knoten muß über sein ! * NodeModel bescheid wissen, damit er verschiedene ! * Dinge abfragen kann. Nur so können beliebige Knotentypen ohne ! * Änderungen an NodeModel hinzugefügt werden. Siehe Methode ! * getNeighbors, welche vom Knotentyp abhängig mit Hilfe von NodeModel ! * potenzielle Nachbarknoten des Knoten sucht. ! * @param model ! */ ! public Node(NodeModel model) { ! this.model = model; ! counter++; ! // Eindeutigen Defaultnamen setzen ! this.internal = this.getClass().getName(); ! this.internal = internal.substring(this.internal.lastIndexOf('.') + 1) + counter; ! this.name = this.internal; ! this.id = -1; ! } ! public String getDisplayName(){ ! return this.name; ! } ! public boolean isUpdate(){ ! return update; ! } ! public void setUpdate(boolean newupdate){ ! this.update = newupdate; ! this.model.updateNode(this,NodeModel.UPDATE_RESCAN,null); ! } ! public boolean isFix(){ ! return fix; ! } ! public void setFix(boolean fix){ ! this.fix = fix; ! this.model.updateNode(this, NodeModel.UPDATE_FIXSTATE, null); ! } ! public String getName(){ ! return name; ! } ! public final void setName(String name){ ! String oldname = this.name; ! this.name = name; ! if (model.nodeExists(oldname)) ! model.rehashNode(this, oldname); ! } ! public int getX(){ ! return x; ! } ! public int getY(){ ! return y; ! } ! public void setPositionSilent(int x, int y){ ! this.x = x; ! this.y = y; ! } ! public void setPosition(int x, int y){ ! setPositionSilent(x, y); ! model.updateNode(this, NodeModel.UPDATE_POSITION, null); ! } ! public abstract ArrayList getNeighbors(); ! public NodeModel getModel(){ ! return model; ! } ! public abstract int getType(); ! public int hashCode(){ ! return internal.hashCode(); ! } ! public String toString(){ ! return internal; ! } ! public long getId(){ ! return id; ! } ! public void setId(long id){ ! this.id = id; ! } } \ No newline at end of file --- 14,123 ---- public abstract class Node { ! private static int counter = 0; ! ! private String name; // Beschreibung ! 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; ! private long id; ! private NodeModel model; ! ! /** ! * Erzeugt leeren Knoten. Ein Knoten muß über sein ! * NodeModel bescheid wissen, damit er verschiedene ! * Dinge abfragen kann. Nur so können beliebige Knotentypen ohne ! * Änderungen an NodeModel hinzugefügt werden. Siehe Methode ! * getNeighbors, welche vom Knotentyp abhängig mit Hilfe von NodeModel ! * potenzielle Nachbarknoten des Knoten sucht. ! * @param model ! */ ! public Node(NodeModel model) { ! this.model = model; ! counter++; ! // Eindeutigen Defaultnamen setzen ! this.internal = this.getClass().getName(); ! this.internal = internal.substring(this.internal.lastIndexOf('.') + 1) + counter; ! this.name = this.internal; ! this.id = -1; ! } ! public String getDisplayName(){ ! return this.name; ! } ! public boolean isUpdate(){ ! return update; ! } ! public void setUpdate(boolean newupdate){ ! this.update = newupdate; ! this.model.updateNode(this,NodeModel.UPDATE_RESCAN,null); ! } ! public boolean isFix(){ ! return fix; ! } ! public void setFix(boolean fix){ ! this.fix = fix; ! this.model.updateNode(this, NodeModel.UPDATE_FIXSTATE, null); ! } ! public String getName(){ ! return name; ! } ! public final void setName(String name){ ! String oldname = this.name; ! this.name = name; ! if (model.nodeExists(oldname)) ! model.rehashNode(this, oldname); ! } ! public int getX(){ ! return x; ! } ! public int getY(){ ! return y; ! } ! public void setPositionSilent(int x, int y){ ! this.x = x; ! this.y = y; ! } ! public void setPosition(int x, int y){ ! setPositionSilent(x, y); ! model.updateNode(this, NodeModel.UPDATE_POSITION, null); ! } ! public abstract ArrayList getNeighbors(); ! public NodeModel getModel(){ ! return model; ! } ! public abstract int getType(); ! public int hashCode(){ ! return internal.hashCode(); ! } ! public String toString(){ ! return internal; ! } ! public long getId(){ ! return id; ! } ! public void setId(long id){ ! this.id = id; ! } } \ No newline at end of file Index: GeoPosNode.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node/GeoPosNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GeoPosNode.java 23 Feb 2006 18:34:38 -0000 1.1 --- GeoPosNode.java 26 Feb 2006 10:20:57 -0000 1.2 *************** *** 11,14 **** --- 11,16 ---- */ public class GeoPosNode extends Node { + + private GeoPos geoPos; /** *************** *** 18,21 **** --- 20,41 ---- super(model); } + + public String getDisplayName() { + if (geoPos != null) { + return geoPos.getStringRepresentation(); + } else { + return super.getDisplayName(); + } + } + + + /** + * Set the internal geo pos object + * @param newGeoPos + */ + public void setGeoPos(GeoPos newGeoPos) { + this.geoPos = newGeoPos; + } + /* (non-Javadoc) *************** *** 33,38 **** @Override public int getType() { ! // TODO Auto-generated method stub ! return 0; } --- 53,57 ---- @Override public int getType() { ! return NodeModel.NODETYPE_GEOPOS; } |
|
From: Johannes Z. <jza...@us...> - 2006-02-26 11:38:01
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830/src/net/sf/magicmap/client/views Modified Files: MapView.java OutlineView.java Log Message: Bugfixes f. schnellen Kartenwechsel Geopositionen implementiert Index: OutlineView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/OutlineView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OutlineView.java 20 Feb 2006 08:49:59 -0000 1.6 --- OutlineView.java 26 Feb 2006 10:20:57 -0000 1.7 *************** *** 59,62 **** --- 59,63 ---- private OutlineNode nodeClients; private OutlineNode nodeLocations; + private OutlineNode nodeGeoPoints; *************** *** 84,87 **** --- 85,90 ---- nodeClients = new OutlineNode(GUIUtils.i18n("clients")); nodeLocations = new OutlineNode(GUIUtils.i18n("locations")); + //TODO internationalize + nodeGeoPoints = new OutlineNode("Geokoordinaten"); treeroot.add(nodeMaps); *************** *** 89,92 **** --- 92,96 ---- treeroot.add(nodeClients); treeroot.add(nodeLocations); + treeroot.add(nodeGeoPoints); tree = new JTree(treemodel); *************** *** 165,168 **** --- 169,175 ---- treemodel.insertNodeInto(on,nodeLocations,index); break; + case NodeModel.NODETYPE_GEOPOS : + index = getAlphabeticalIndex(nodeGeoPoints, on); + treemodel.insertNodeInto(on, nodeGeoPoints, index); } *************** *** 202,209 **** } } else if (type == NodeModel.UPDATE_CLEAR) { ! // this.nodeMaps.removeAllChildren(); this.nodeAccessPoints.removeAllChildren(); this.nodeClients.removeAllChildren(); this.nodeLocations.removeAllChildren(); treemodel.reload(); } --- 209,217 ---- } } else if (type == NodeModel.UPDATE_CLEAR) { ! this.nodeMaps.removeAllChildren(); this.nodeAccessPoints.removeAllChildren(); this.nodeClients.removeAllChildren(); this.nodeLocations.removeAllChildren(); + this.nodeGeoPoints.removeAllChildren(); treemodel.reload(); } *************** *** 228,237 **** * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent) */ ! public void valueChanged(TreeSelectionEvent e) { ! if(!((OutlineNode)e.getPath().getLastPathComponent()).getAllowsChildren()) { ! Node node = ((OutlineNode)e.getPath().getLastPathComponent()).getNode(); if (node instanceof MapNode) { ! if (((MapNode)node).getMapInfo() != null) { ! Controller.getInstance().setCurrentMap(((MapNode)node).getMapInfo()); } } else { --- 236,249 ---- * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent) */ ! public synchronized void valueChanged(TreeSelectionEvent tse) { ! if(!((OutlineNode)tse.getPath().getLastPathComponent()).getAllowsChildren()) { ! final Node node = ((OutlineNode)tse.getPath().getLastPathComponent()).getNode(); ! if (node instanceof MapNode) { ! MapNode mapNode = (MapNode) node; ! if (mapNode.getMapInfo() != null) { ! // if (!Controller.getInstance().getCurrentMap().equals(mapNode.getMapInfo())) { ! Controller.getInstance().retrieveMap(mapNode.getMapInfo().name, mapNode); ! // } } } else { *************** *** 281,284 **** --- 293,298 ---- case NodeModel.NODETYPE_LOCATION : return findOutlineNode(nodeLocations, node); + case NodeModel.NODETYPE_GEOPOS : + return findOutlineNode(nodeGeoPoints, node); default : return null; *************** *** 335,338 **** --- 349,354 ---- case NodeModel.NODETYPE_LOCATION : return getOutlineNodePath(nodeLocations, node); + case NodeModel.NODETYPE_GEOPOS : + return getOutlineNodePath(nodeGeoPoints, node); default : return null; Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** MapView.java 20 Feb 2006 08:49:58 -0000 1.15 --- MapView.java 26 Feb 2006 10:20:57 -0000 1.16 *************** *** 78,81 **** --- 78,82 ---- private Icon clientIcon; private Icon accessPointIcon; + private Icon geoPosIcon; private Icon locationIcon; private Icon clientAnchorIcon; *************** *** 134,137 **** --- 135,139 ---- this.clientIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_CLIENT); this.accessPointIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_ACCESSPOINT); + this.geoPosIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_GEOPOS); this.locationIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_LOCATION); this.clientAnchorIcon = GUIBuilder.getToolIcon(GUIConstants.ICON_CLIENT_ANCHOR); *************** *** 171,174 **** --- 173,178 ---- else return accessPointIcon; + case NodeModel.NODETYPE_GEOPOS : + return geoPosIcon; case NodeModel.NODETYPE_LOCATION : if (!showLocations){ *************** *** 763,767 **** v = addVertex(node); // Mehr ist nicht zuu tun, die Katen gehen vom Client aus. ! } if (v != null){ if (node.isFix()){ --- 767,774 ---- v = addVertex(node); // Mehr ist nicht zuu tun, die Katen gehen vom Client aus. ! } else if (node.getType() == NodeModel.NODETYPE_GEOPOS) { ! v = addVertex(node); ! // Mehr ist nicht zuu tun, die Katen gehen vom Client aus. ! } if (v != null){ if (node.isFix()){ |
|
From: Johannes Z. <jza...@us...> - 2006-02-26 11:37:54
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: Bugfixes f. schnellen Kartenwechsel Geopositionen implementiert Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MainGUI.java 23 Feb 2006 18:34:39 -0000 1.14 --- MainGUI.java 26 Feb 2006 10:20:57 -0000 1.15 *************** *** 73,79 **** LoadMapDialogListener { - //TODO: check whether it makes sense to implement everything through interfaces - // (IMO connnect/disconnect is enough - change rest) - /** * serial version id --- 73,76 ---- *************** *** 683,687 **** newMapAction.setEnabled(true); loadMapAction.setEnabled(true); ! Controller.getInstance().retrieveMapNames(MainGUI.this, false); } --- 680,684 ---- newMapAction.setEnabled(true); loadMapAction.setEnabled(true); ! // Controller.getInstance().retrieveMapNames(MainGUI.this, false); } *************** *** 788,792 **** * @see net.sf.magicmap.client.interfaces.LoadMapDialogListener#loadMap(net.sf.magicmap.client.meta.MapInfo) */ ! public void loadMap(MapInfo info) { Controller.getInstance().setCurrentMap(info); statusBar.setInvisible(Controller.getInstance().isInvisible()); --- 785,789 ---- * @see net.sf.magicmap.client.interfaces.LoadMapDialogListener#loadMap(net.sf.magicmap.client.meta.MapInfo) */ ! public synchronized void loadMap(MapInfo info) { Controller.getInstance().setCurrentMap(info); statusBar.setInvisible(Controller.getInstance().isInvisible()); |
|
From: Johannes Z. <jza...@us...> - 2006-02-26 11:37:22
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830/src/net/sf/magicmap/client/interfaces Modified Files: FetchPositionsCallback.java ServerPollerListener.java Log Message: Bugfixes f. schnellen Kartenwechsel Geopositionen implementiert Index: FetchPositionsCallback.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces/FetchPositionsCallback.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FetchPositionsCallback.java 11 May 2005 10:51:28 -0000 1.3 --- FetchPositionsCallback.java 26 Feb 2006 10:20:57 -0000 1.4 *************** *** 5,8 **** --- 5,10 ---- package net.sf.magicmap.client.interfaces; + import net.sf.magicmap.server.dto.GeoPointDTO; + import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.dto.PositionDTO; *************** *** 12,18 **** public interface FetchPositionsCallback { ! public void positionsFetched(PositionDTO[] positions); ! public void positionFetchError(Exception e); } \ No newline at end of file --- 14,42 ---- public interface FetchPositionsCallback { ! /** ! * Wird aufgerufen wenn neue Positionen übermittelt wurden. ! * @param positions - the neuen Positionen ! */ ! public void positionsFetched(PositionDTO[] positions); ! /** ! * Is called if new geo points have been transmitted ! * @param geoPoints ! */ ! // public void geoPointsFetched(GeoPointDTO[] geoPoints); ! ! public void positionFetchError(Exception e); ! ! /** ! * Is called, when the server has fetched the MapDTOs from the server ! * @param mapDTOs ! */ ! public void mapsFetched(MapDTO[] mapDTOs); ! ! /** ! * Is called when the server has fetched the GeoPointDTOs from the server ! * @param geoPoses ! */ ! public void geoPointsFetches(GeoPointDTO[] geoPoses); } \ No newline at end of file Index: ServerPollerListener.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ServerPollerListener.java 11 May 2005 10:51:28 -0000 1.3 --- ServerPollerListener.java 26 Feb 2006 10:20:57 -0000 1.4 *************** *** 5,8 **** --- 5,10 ---- package net.sf.magicmap.client.interfaces; + import net.sf.magicmap.server.dto.GeoPointDTO; + import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.dto.PositionDTO; *************** *** 29,34 **** public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException; */ ! public void positionCreatedOrUpdatedOrDeleted(PositionDTO position); } \ No newline at end of file --- 31,49 ---- public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException; */ + + public void positionCreatedOrUpdatedOrDeleted(PositionDTO position); ! /** ! * ! * @param mapDTO ! */ ! public void mapCreatedOrUpdatedOrDeleted(MapDTO mapDTO); ! ! /** ! * @param pointDTO ! */ ! public void geoPosCreatedOrUpdatedOrDeleted(GeoPointDTO pointDTO); ! ! // public void geoPointCreatedOrUpdatedOrDeleted(GeoPointDTO geoPoint); } \ No newline at end of file |
|
From: Johannes Z. <jza...@us...> - 2006-02-26 11:37:21
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830/src/net/sf/magicmap/client/gui/dialogs Modified Files: LoadMapDialog.java Log Message: Bugfixes f. schnellen Kartenwechsel Geopositionen implementiert Index: LoadMapDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/LoadMapDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LoadMapDialog.java 14 Feb 2005 12:51:14 -0000 1.3 --- LoadMapDialog.java 26 Feb 2006 10:20:57 -0000 1.4 *************** *** 38,41 **** --- 38,47 ---- public class LoadMapDialog extends JDialog implements ActionListener, MapCallback, ListSelectionListener { + /** + * serial version id + */ + private static final long serialVersionUID = -2877958199332251412L; + + private MapInfo info; private JPanel mainPanel; |
|
From: Florian L. <fle...@us...> - 2006-02-25 13:37:05
|
Update of /cvsroot/magicmap/magicmapclient/inf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24090/inf Modified Files: MapFacade.wsdl Log Message: Index: MapFacade.wsdl =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/inf/MapFacade.wsdl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MapFacade.wsdl 20 Feb 2006 15:14:47 -0000 1.4 --- MapFacade.wsdl 25 Feb 2006 13:36:54 -0000 1.5 *************** *** 1,4 **** <?xml version="1.0" encoding="UTF-8"?> ! <wsdl:definitions targetNamespace="http://localhost:8080/magicmap/services/MapFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost:8080/magicmap/services/MapFacade" xmlns:intf="http://localhost:8080/magicmap/services/MapFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:dto.server.magicmap.sf.net" xmlns:tns2="http://exception.server.magicmap.sf.net" xmlns:tns3="http://dto.server.magicmap.sf.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <!--WSDL created by Apache Axis version: 1.2 Built on May 03, 2005 (02:20:24 EDT)--> --- 1,4 ---- <?xml version="1.0" encoding="UTF-8"?> ! <wsdl:definitions targetNamespace="http://localhost:8080/magicmap/services/MapFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost:8080/magicmap/services/MapFacade" xmlns:intf="http://localhost:8080/magicmap/services/MapFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:dto.server.magicmap.sf.net" xmlns:tns2="http://exception.server.magicmap.sf.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <!--WSDL created by Apache Axis version: 1.2 Built on May 03, 2005 (02:20:24 EDT)--> *************** *** 7,11 **** <import namespace="http://exception.server.magicmap.sf.net"/> <import namespace="http://localhost:8080/magicmap/services/MapFacade"/> - <import namespace="http://dto.server.magicmap.sf.net"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="MapDTO"> --- 7,10 ---- *************** *** 38,46 **** </sequence> </complexType> </schema> <schema targetNamespace="http://exception.server.magicmap.sf.net" xmlns="http://www.w3.org/2001/XMLSchema"> <import namespace="http://localhost:8080/magicmap/services/MapFacade"/> <import namespace="urn:dto.server.magicmap.sf.net"/> - <import namespace="http://dto.server.magicmap.sf.net"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="MapException"> --- 37,54 ---- </sequence> </complexType> + <complexType name="GeoPointDTO"> + <sequence> + <element name="geoPointAlt" nillable="true" type="soapenc:int"/> + <element name="geoPointLat" nillable="true" type="soapenc:int"/> + <element name="geoPointLong" nillable="true" type="soapenc:int"/> + <element name="geoPointX" nillable="true" type="soapenc:int"/> + <element name="geoPointY" nillable="true" type="soapenc:int"/> + <element name="id" nillable="true" type="soapenc:long"/> + </sequence> + </complexType> </schema> <schema targetNamespace="http://exception.server.magicmap.sf.net" xmlns="http://www.w3.org/2001/XMLSchema"> <import namespace="http://localhost:8080/magicmap/services/MapFacade"/> <import namespace="urn:dto.server.magicmap.sf.net"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="MapException"> *************** *** 54,58 **** <import namespace="http://exception.server.magicmap.sf.net"/> <import namespace="urn:dto.server.magicmap.sf.net"/> - <import namespace="http://dto.server.magicmap.sf.net"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="ArrayOf_tns1_StringReplacementDTO"> --- 62,65 ---- *************** *** 63,90 **** </complexContent> </complexType> ! <complexType name="ArrayOf_tns3_GeoPointDTO"> <complexContent> <restriction base="soapenc:Array"> ! <attribute ref="soapenc:arrayType" wsdl:arrayType="tns3:GeoPointDTO[]"/> </restriction> </complexContent> </complexType> </schema> - <schema targetNamespace="http://dto.server.magicmap.sf.net" xmlns="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://exception.server.magicmap.sf.net"/> - <import namespace="http://localhost:8080/magicmap/services/MapFacade"/> - <import namespace="urn:dto.server.magicmap.sf.net"/> - <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> - <complexType name="GeoPointDTO"> - <sequence> - <element name="geoPointAlt" nillable="true" type="soapenc:int"/> - <element name="geoPointLat" nillable="true" type="soapenc:int"/> - <element name="geoPointLong" nillable="true" type="soapenc:int"/> - <element name="geoPointX" nillable="true" type="soapenc:int"/> - <element name="geoPointY" nillable="true" type="soapenc:int"/> - <element name="id" nillable="true" type="soapenc:long"/> - </sequence> - </complexType> - </schema> </wsdl:types> --- 70,81 ---- </complexContent> </complexType> ! <complexType name="ArrayOf_tns1_GeoPointDTO"> <complexContent> <restriction base="soapenc:Array"> ! <attribute ref="soapenc:arrayType" wsdl:arrayType="tns1:GeoPointDTO[]"/> </restriction> </complexContent> </complexType> </schema> </wsdl:types> *************** *** 159,163 **** <wsdl:message name="getGeoPointsForMapResponse"> ! <wsdl:part name="getGeoPointsForMapReturn" type="impl:ArrayOf_tns3_GeoPointDTO"/> </wsdl:message> --- 150,154 ---- <wsdl:message name="getGeoPointsForMapResponse"> ! <wsdl:part name="getGeoPointsForMapReturn" type="impl:ArrayOf_tns1_GeoPointDTO"/> </wsdl:message> |
|
From: Martin S. <sch...@us...> - 2006-02-23 22:53:48
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4506/src/net/sf/magicmap/server/dto Modified Files: MapDTO.java Log Message: - some comments - possible infinite loop in MapFacade! Index: MapDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/MapDTO.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MapDTO.java 17 Feb 2006 16:12:34 -0000 1.6 --- MapDTO.java 23 Feb 2006 22:53:37 -0000 1.7 *************** *** 20,25 **** private Integer imageHeight; private Integer imageWidth; ! ! // Geokoordinaten in Millisekunden private Integer geoPoint1X; private Integer geoPoint1Y; --- 20,46 ---- private Integer imageHeight; private Integer imageWidth; ! ! // Geokoordinaten in Millisekunden ! // MSC (ich nehme mir mal raus Anmwerkungen zu machen ;) - wenn jemand was dagegen hat, bescheid sagen! ): ! // - Warum gibt es genau drei geoPoints ! // - Statt der Werte X, Y, Lat, Long und Alt sollte die Klasse GeoPointDTO verwendet werden ! // Vorschlag: ! //public static final int NUMBER_OF_GEOPOINTS = 3; ! // private GeoPointDTO geoPoint[] = new GeoPointDTO[NUMBER_OF_GEOPOINTS]; ! // ! // public GeoPointDTO getGeoPoint(int position) { ! // checkRange(position); ! // return geoPoint[position]; ! // } ! // ! // public void setGeoPoint(int position, GeoPointDTO geoPointDTO) { ! // checkRange(position); ! // this.geoPoint[position] = geoPointDTO; ! // } ! // private void checkRange(int position) { ! // if (position < 0 || position >= NUMBER_OF_GEOPOINTS) { ! // throw new IllegalArgumentException("MapDTO has only " + NUMBER_OF_GEOPOINTS + " geoPonits - " + position); ! // } ! // } private Integer geoPoint1X; private Integer geoPoint1Y; *************** *** 36,40 **** private Integer geoPoint3Lat; private Integer geoPoint3Long; ! private Integer geoPoint3Alt; public MapDTO() {} --- 57,61 ---- private Integer geoPoint3Lat; private Integer geoPoint3Long; ! private Integer geoPoint3Alt; public MapDTO() {} *************** *** 59,123 **** return this.imageWidth; } ! public Integer getGeoPoint1X(){ ! return this.geoPoint1X; } ! public Integer getGeoPoint1Y(){ ! return this.geoPoint1Y; } ! public Integer getGeoPoint1Lat(){ ! return this.geoPoint1Lat; } ! public Integer getGeoPoint1Long(){ ! return this.geoPoint1Long; } ! public Integer getGeoPoint1Alt(){ ! return this.geoPoint1Alt; } public Integer getGeoPoint2X(){ ! return this.geoPoint2X; } ! public Integer getGeoPoint2Y(){ ! return this.geoPoint2Y; } ! public Integer getGeoPoint2Lat(){ ! return this.geoPoint2Lat; } ! public Integer getGeoPoint2Long(){ ! return this.geoPoint2Long; } ! public Integer getGeoPoint2Alt(){ ! return this.geoPoint2Alt; } ! public Integer getGeoPoint3X(){ ! return this.geoPoint3X; } ! public Integer getGeoPoint3Y(){ ! return this.geoPoint3Y; } ! public Integer getGeoPoint3Lat(){ ! return this.geoPoint3Lat; } ! public Integer getGeoPoint3Long(){ ! return this.geoPoint3Long; } ! public Integer getGeoPoint3Alt(){ ! return this.geoPoint3Alt; } - /** * @param id The id to set. --- 80,144 ---- return this.imageWidth; } ! public Integer getGeoPoint1X(){ ! return this.geoPoint1X; } ! public Integer getGeoPoint1Y(){ ! return this.geoPoint1Y; } ! public Integer getGeoPoint1Lat(){ ! return this.geoPoint1Lat; } ! public Integer getGeoPoint1Long(){ ! return this.geoPoint1Long; } ! public Integer getGeoPoint1Alt(){ ! return this.geoPoint1Alt; } + public Integer getGeoPoint2X(){ ! return this.geoPoint2X; } ! public Integer getGeoPoint2Y(){ ! return this.geoPoint2Y; } ! public Integer getGeoPoint2Lat(){ ! return this.geoPoint2Lat; } ! public Integer getGeoPoint2Long(){ ! return this.geoPoint2Long; } ! public Integer getGeoPoint2Alt(){ ! return this.geoPoint2Alt; } ! public Integer getGeoPoint3X(){ ! return this.geoPoint3X; } ! public Integer getGeoPoint3Y(){ ! return this.geoPoint3Y; } ! public Integer getGeoPoint3Lat(){ ! return this.geoPoint3Lat; } ! public Integer getGeoPoint3Long(){ ! return this.geoPoint3Long; } ! public Integer getGeoPoint3Alt(){ ! return this.geoPoint3Alt; } /** * @param id The id to set. *************** *** 154,260 **** this.name = name; } ! /** * @param geoPoint1X The X Coordinate for the first Georeferencepoint on the map */ public void setGeoPoint1X(Integer geoPoint1X){ ! this.geoPoint1X = geoPoint1X; } ! /** * @param geoPoint1Y The Y Coordinate for the first Georeferencepoint on the map */ public void setGeoPoint1Y(Integer geoPoint1Y){ ! this.geoPoint1Y = geoPoint1Y; } ! /** * @param geoPoint1Lat The Latitude for the first Georeferencepoint on the map */ public void setGeoPoint1Lat(Integer geoPoint1Lat){ ! this.geoPoint1Lat = geoPoint1Lat; } ! /** * @param geoPoint1Long The Longitude for the first Georeferencepoint on the map */ public void setGeoPoint1Long(Integer geoPoint1Long){ ! this.geoPoint1Long = geoPoint1Long; } ! /** * @param geoPoint1Alt The Altitude for the first Georeferencepoint on the map */ public void setGeoPoint1Alt(Integer geoPoint1Alt){ ! this.geoPoint1Alt = geoPoint1Alt; } ! /** * @param geoPoint2X The X Coordinate for the second Georeferencepoint on the map */ public void setGeoPoint2X(Integer geoPoint2X){ ! this.geoPoint2X = geoPoint2X; } ! /** * @param geoPoint2Y The Y Coordinate for the second Georeferencepoint on the map */ public void setGeoPoint2Y(Integer geoPoint2Y){ ! this.geoPoint2Y = geoPoint2Y; } ! /** * @param geoPoint2Lat The Latitude for the second Georeferencepoint on the map */ public void setGeoPoint2Lat(Integer geoPoint2Lat){ ! this.geoPoint2Lat = geoPoint2Lat; } ! /** * @param geoPoint2Long The Longitude for the second Georeferencepoint on the map */ public void setGeoPoint2Long(Integer geoPoint2Long){ ! this.geoPoint2Long = geoPoint2Long; } /** * @param geoPoint2Alt The Altitude for the second Georeferencepoint on the map */ public void setGeoPoint2Alt(Integer geoPoint2Alt){ ! this.geoPoint2Alt = geoPoint2Alt; } ! /** * @param geoPoint3X The X Coordinate for the third Georeferencepoint on the map */ public void setGeoPoint3X(Integer geoPoint3X){ ! this.geoPoint3X = geoPoint3X; } ! /** * @param geoPoint3Y The Y Coordinate for the third Georeferencepoint on the map */ public void setGeoPoint3Y(Integer geoPoint3Y){ ! this.geoPoint3Y = geoPoint3Y; } ! /** * @param geoPoint3Lat The Latitude for the third Georeferencepoint on the map */ public void setGeoPoint3Lat(Integer geoPoint3Lat){ ! this.geoPoint3Lat = geoPoint3Lat; } ! /** * @param geoPoint3Long The Longitude for the third Georeferencepoint on the map */ public void setGeoPoint3Long(Integer geoPoint3Long){ ! this.geoPoint3Long = geoPoint3Long; } /** * @param geoPoint3Alt The Altitude for the third Georeferencepoint on the map */ public void setGeoPoint3Alt(Integer geoPoint3Alt){ ! this.geoPoint3Alt = geoPoint3Alt; } ! } \ No newline at end of file --- 175,283 ---- this.name = name; } ! /** * @param geoPoint1X The X Coordinate for the first Georeferencepoint on the map */ public void setGeoPoint1X(Integer geoPoint1X){ ! this.geoPoint1X = geoPoint1X; } ! /** * @param geoPoint1Y The Y Coordinate for the first Georeferencepoint on the map */ public void setGeoPoint1Y(Integer geoPoint1Y){ ! this.geoPoint1Y = geoPoint1Y; } ! /** * @param geoPoint1Lat The Latitude for the first Georeferencepoint on the map */ public void setGeoPoint1Lat(Integer geoPoint1Lat){ ! this.geoPoint1Lat = geoPoint1Lat; } ! /** * @param geoPoint1Long The Longitude for the first Georeferencepoint on the map */ public void setGeoPoint1Long(Integer geoPoint1Long){ ! this.geoPoint1Long = geoPoint1Long; } ! /** * @param geoPoint1Alt The Altitude for the first Georeferencepoint on the map */ public void setGeoPoint1Alt(Integer geoPoint1Alt){ ! this.geoPoint1Alt = geoPoint1Alt; } ! /** * @param geoPoint2X The X Coordinate for the second Georeferencepoint on the map */ public void setGeoPoint2X(Integer geoPoint2X){ ! this.geoPoint2X = geoPoint2X; } ! /** * @param geoPoint2Y The Y Coordinate for the second Georeferencepoint on the map */ public void setGeoPoint2Y(Integer geoPoint2Y){ ! this.geoPoint2Y = geoPoint2Y; } ! /** * @param geoPoint2Lat The Latitude for the second Georeferencepoint on the map */ public void setGeoPoint2Lat(Integer geoPoint2Lat){ ! this.geoPoint2Lat = geoPoint2Lat; } ! /** * @param geoPoint2Long The Longitude for the second Georeferencepoint on the map */ public void setGeoPoint2Long(Integer geoPoint2Long){ ! this.geoPoint2Long = geoPoint2Long; } + /** * @param geoPoint2Alt The Altitude for the second Georeferencepoint on the map */ public void setGeoPoint2Alt(Integer geoPoint2Alt){ ! this.geoPoint2Alt = geoPoint2Alt; } ! /** * @param geoPoint3X The X Coordinate for the third Georeferencepoint on the map */ public void setGeoPoint3X(Integer geoPoint3X){ ! this.geoPoint3X = geoPoint3X; } ! /** * @param geoPoint3Y The Y Coordinate for the third Georeferencepoint on the map */ public void setGeoPoint3Y(Integer geoPoint3Y){ ! this.geoPoint3Y = geoPoint3Y; } ! /** * @param geoPoint3Lat The Latitude for the third Georeferencepoint on the map */ public void setGeoPoint3Lat(Integer geoPoint3Lat){ ! this.geoPoint3Lat = geoPoint3Lat; } ! /** * @param geoPoint3Long The Longitude for the third Georeferencepoint on the map */ public void setGeoPoint3Long(Integer geoPoint3Long){ ! this.geoPoint3Long = geoPoint3Long; } + /** * @param geoPoint3Alt The Altitude for the third Georeferencepoint on the map */ public void setGeoPoint3Alt(Integer geoPoint3Alt){ ! this.geoPoint3Alt = geoPoint3Alt; } ! } \ No newline at end of file |
|
From: Martin S. <sch...@us...> - 2006-02-23 22:53:48
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4506/src/net/sf/magicmap/server/facade Modified Files: MapFacade.java Log Message: - some comments - possible infinite loop in MapFacade! Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MapFacade.java 23 Feb 2006 22:18:27 -0000 1.13 --- MapFacade.java 23 Feb 2006 22:53:37 -0000 1.14 *************** *** 127,132 **** --- 127,142 ---- Collection geoPoints = map.getGeoPositions(); + + // MSC: der folgende Code sollte überarbeitet werden. Mit dem Vorschlag aus MapDTO ergibt sich folgendes: + // int i = 0; + // for (Iterator geoIt = geoPoints.iterator();geoIt.hasNext() && MapDTO.NUMBER_OF_GEOPOINTS<i;){ + // GeoPosition geoPosition = (GeoPosition) geoPoints.iterator().next(); + // GeoPointDTO geoPointDTO = new GeoPointDTO(); + // // TODO set long, lat,.... + // result.setGeoPoint(i, geoPointDTO); + // } int i = 1; while (geoPoints.iterator().hasNext()){ + // MSC: Diese Zeile dürfte Probleme machen, es wird jedes Mal ein neuer Iterator geholt => Endlosschleife! GeoPosition geoPosition = (GeoPosition) geoPoints.iterator().next(); switch (i) { |
|
From: Martin S. <sch...@us...> - 2006-02-23 22:51:00
|
Update of /cvsroot/magicmap/magicmapserver/.settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2849/.settings Modified Files: org.eclipse.jdt.core.prefs Added Files: org.eclipse.jdt.ui.prefs Log Message: Use codingconventions.xml in eclipse per project settings Index: org.eclipse.jdt.core.prefs =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/.settings/org.eclipse.jdt.core.prefs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.eclipse.jdt.core.prefs 2 Nov 2005 14:42:41 -0000 1.1 --- org.eclipse.jdt.core.prefs 23 Feb 2006 22:50:53 -0000 1.2 *************** *** 1,4 **** ! #Mon Oct 31 16:07:26 CET 2005 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 --- 1,13 ---- ! #Thu Feb 23 23:48:43 CET 2006 eclipse.preferences.version=1 + org.eclipse.jdt.core.codeComplete.argumentPrefixes= + org.eclipse.jdt.core.codeComplete.argumentSuffixes= + org.eclipse.jdt.core.codeComplete.fieldPrefixes= + org.eclipse.jdt.core.codeComplete.fieldSuffixes= + org.eclipse.jdt.core.codeComplete.localPrefixes= + org.eclipse.jdt.core.codeComplete.localSuffixes= + org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= + org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= + org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 *************** *** 6,7 **** --- 15,257 ---- org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.5 + org.eclipse.jdt.core.formatter.align_type_members_on_columns=true + org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 + org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 + org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 + org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 + org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 + org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 + org.eclipse.jdt.core.formatter.alignment_for_compact_if=52 + org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48 + org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 + org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 + org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 + org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 + org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 + org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 + org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64 + org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 + org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64 + org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 + org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 + org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 + org.eclipse.jdt.core.formatter.blank_lines_after_package=1 + org.eclipse.jdt.core.formatter.blank_lines_before_field=0 + org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 + org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 + org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 + org.eclipse.jdt.core.formatter.blank_lines_before_method=1 + org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0 + org.eclipse.jdt.core.formatter.blank_lines_before_package=1 + org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 + org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line + org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line + org.eclipse.jdt.core.formatter.comment.clear_blank_lines=true + org.eclipse.jdt.core.formatter.comment.format_comments=false + org.eclipse.jdt.core.formatter.comment.format_header=true + org.eclipse.jdt.core.formatter.comment.format_html=true + org.eclipse.jdt.core.formatter.comment.format_source_code=true + org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true + org.eclipse.jdt.core.formatter.comment.indent_root_tags=true + org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert + org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert + org.eclipse.jdt.core.formatter.comment.line_length=80 + org.eclipse.jdt.core.formatter.compact_else_if=true + org.eclipse.jdt.core.formatter.continuation_indentation=2 + org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 + org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false + org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true + org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true + org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true + org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true + org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true + org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true + org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true + org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true + org.eclipse.jdt.core.formatter.indentation.size=4 + org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert + org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert + org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert + org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert + org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert + org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert + org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert + org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert + org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert + org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert + org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert + org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert + org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert + org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert + org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert + org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert + org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert + org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert + org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert + org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert + org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert + org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert + org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert + org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert + org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert + org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert + org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert + org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert + org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert + org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert + org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert + org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert + org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert + org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert + org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false + org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false + org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true + org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false + org.eclipse.jdt.core.formatter.lineSplit=120 + org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 + org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 + org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false + org.eclipse.jdt.core.formatter.tabulation.char=space + org.eclipse.jdt.core.formatter.tabulation.size=2 + org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false --- NEW FILE: org.eclipse.jdt.ui.prefs --- #Thu Feb 23 23:48:43 CET 2006 eclipse.preferences.version=1 formatter_settings_version=8 internal.default.compliance=default org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=true org.eclipse.jdt.ui.javadoc=false org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.overrideannotation=true org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> |
|
From: Martin S. <sch...@us...> - 2006-02-23 22:18:32
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16729/src/net/sf/magicmap/server/cache Modified Files: PositionCache.java Log Message: some cleanup Index: PositionCache.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache/PositionCache.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PositionCache.java 7 Feb 2006 16:05:37 -0000 1.10 --- PositionCache.java 23 Feb 2006 22:18:26 -0000 1.11 *************** *** 8,16 **** import java.util.Date; import java.util.Enumeration; - import java.util.HashMap; - import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; - import java.util.SortedMap; import java.util.TreeMap; --- 8,13 ---- *************** *** 19,26 **** import javax.jdo.Query; import javax.jdo.Transaction; - import javax.servlet.ServletContextEvent; - import javax.servlet.ServletContextListener; - - import com.sun.org.apache.xml.internal.utils.SuballocatedByteVector; import net.sf.magicmap.db.AccessPoint; --- 16,19 ---- *************** *** 29,33 **** import net.sf.magicmap.db.Position; import net.sf.magicmap.db.ScanResult; - import net.sf.magicmap.db.Session; import net.sf.magicmap.server.dto.AccessPointDTO; import net.sf.magicmap.server.dto.ClientDTO; --- 22,25 ---- *************** *** 35,51 **** import net.sf.magicmap.server.dto.SignalCharacterDTO; import net.sf.magicmap.server.dto.SimpleScanResultDTO; - import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.exception.MapException; - import net.sf.magicmap.server.exception.SessionException; - import net.sf.magicmap.server.facade.PositionFacade; import net.sf.magicmap.server.utils.JDOUtil; public class PositionCache extends Hashtable<String, PositionCacheEntry> { // Sigleton Hashtable ! private static PositionCache single_positionCache = null; ! public static PositionCache getPositionCache(){ ! if (single_positionCache == null) single_positionCache = new PositionCache(); return single_positionCache; } --- 27,43 ---- import net.sf.magicmap.server.dto.SignalCharacterDTO; import net.sf.magicmap.server.dto.SimpleScanResultDTO; import net.sf.magicmap.server.exception.MapException; import net.sf.magicmap.server.utils.JDOUtil; public class PositionCache extends Hashtable<String, PositionCacheEntry> { + /** + * + */ + private static final long serialVersionUID = 1L; // Sigleton Hashtable ! private static final PositionCache single_positionCache = new PositionCache(); ! public static PositionCache getPositionCache() { return single_positionCache; } *************** *** 55,60 **** } ! ! private Map checkMap(String mapName, PersistenceManager pm) throws MapException{ Map result = null; Collection results; --- 47,51 ---- } ! private Map checkMap(String mapName, PersistenceManager pm) throws MapException { Map result = null; Collection results; *************** *** 63,69 **** query.declareParameters("java.lang.String myName"); results = (Collection) query.execute(mapName); ! if (results != null && !results.isEmpty()){ result = (Map) results.iterator().next(); ! } else{ pm.currentTransaction().rollback(); throw new MapException("Karte mit dem namen:" + mapName + " existiert nicht"); --- 54,60 ---- query.declareParameters("java.lang.String myName"); results = (Collection) query.execute(mapName); ! if (results != null && !results.isEmpty()) { result = (Map) results.iterator().next(); ! } else { pm.currentTransaction().rollback(); throw new MapException("Karte mit dem namen:" + mapName + " existiert nicht"); *************** *** 72,76 **** } ! private Position checkPosition(String positionName, Map map, PersistenceManager pm){ Position result = null; Collection results; --- 63,67 ---- } ! private Position checkPosition(String positionName, Map map, PersistenceManager pm) { Position result = null; Collection results; *************** *** 80,84 **** query.declareImports("import java.lang.String; import net.sf.magicmap.db.Map;"); results = (Collection) query.execute(positionName, map); ! if (results != null && !results.isEmpty()){ result = (Position) results.iterator().next(); } --- 71,75 ---- query.declareImports("import java.lang.String; import net.sf.magicmap.db.Map;"); results = (Collection) query.execute(positionName, map); ! if (results != null && !results.isEmpty()) { result = (Position) results.iterator().next(); } *************** *** 87,92 **** } ! private Client checkClient(String mac, PersistenceManager pm) throws MapException{ ! if (mac == null || "".equals(mac)){ pm.currentTransaction().rollback(); throw new MapException("Client mac darf nicht leer sein"); --- 78,83 ---- } ! private Client checkClient(String mac, PersistenceManager pm) throws MapException { ! if (mac == null || "".equals(mac)) { pm.currentTransaction().rollback(); throw new MapException("Client mac darf nicht leer sein"); *************** *** 98,104 **** query.declareParameters("java.lang.String myMac"); results = (Collection) query.execute(mac); ! if (results != null && !results.isEmpty()){ result = (Client) results.iterator().next(); ! } else{ pm.currentTransaction().rollback(); throw new MapException("Client mit der mac-adresse:" + mac + " existiert nicht"); --- 89,95 ---- query.declareParameters("java.lang.String myMac"); results = (Collection) query.execute(mac); ! if (results != null && !results.isEmpty()) { result = (Client) results.iterator().next(); ! } else { pm.currentTransaction().rollback(); throw new MapException("Client mit der mac-adresse:" + mac + " existiert nicht"); *************** *** 108,113 **** } ! private AccessPoint findOrCreateAccessPoint(String macAP, PersistenceManager pm) throws MapException{ ! try{ AccessPoint result = null; Collection results; --- 99,104 ---- } ! private AccessPoint findOrCreateAccessPoint(String macAP, PersistenceManager pm) throws MapException { ! try { AccessPoint result = null; Collection results; *************** *** 117,128 **** query.declareImports("import java.lang.String;"); results = (Collection) query.execute(macAP); ! if (results != null && !results.isEmpty()){ result = (AccessPoint) results.iterator().next(); ! } else{ result = new AccessPoint(macAP); pm.makePersistent(result); } return result; ! } catch (Exception e){ pm.currentTransaction().rollback(); throw new MapException("", e); --- 108,119 ---- query.declareImports("import java.lang.String;"); results = (Collection) query.execute(macAP); ! if (results != null && !results.isEmpty()) { result = (AccessPoint) results.iterator().next(); ! } else { result = new AccessPoint(macAP); pm.makePersistent(result); } return result; ! } catch (Exception e) { pm.currentTransaction().rollback(); throw new MapException("", e); *************** *** 131,143 **** private void setNewSignalCharacter(PositionDTO dto, PersistenceManager pm, Client client, Position pos) ! throws MapException{ // alle Scanresults dieser Position löschen pm.deletePersistentAll(pos.getScanResults()); SimpleScanResultDTO[] dtos = dto.getCharacter().getSimpleScanResults(); ! if (dtos != null){ ! for (int i = 0; i < dtos.length; i++){ AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm); //@TODO think about? ap.setSsid(dtos[i].getSsid()); ! ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), new Timestamp(dto.getLastModified())); pm.makePersistent(sr); sr.setPosition(pos); --- 122,135 ---- private void setNewSignalCharacter(PositionDTO dto, PersistenceManager pm, Client client, Position pos) ! throws MapException { // alle Scanresults dieser Position löschen pm.deletePersistentAll(pos.getScanResults()); SimpleScanResultDTO[] dtos = dto.getCharacter().getSimpleScanResults(); ! if (dtos != null) { ! for (int i = 0; i < dtos.length; i++) { AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm); //@TODO think about? ap.setSsid(dtos[i].getSsid()); ! ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), new Timestamp(dto ! .getLastModified())); pm.makePersistent(sr); sr.setPosition(pos); *************** *** 146,154 **** } ! private void writePositionToDB(String mapName, PositionDTO position){ System.out.println("Finalize:writePositionToDB()"); PersistenceManager pm = null; Transaction tx = null; ! try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); --- 138,146 ---- } ! private void writePositionToDB(String mapName, PositionDTO position) { System.out.println("Finalize:writePositionToDB()"); PersistenceManager pm = null; Transaction tx = null; ! try { pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); *************** *** 156,160 **** Map map = checkMap(mapName, pm); Position pos = checkPosition(position.getName(), map, pm); ! if (pos == null){ pos = new Position(map, position.getPosX(), position.getPosY(), position.getName()); pm.makePersistent(pos); --- 148,152 ---- Map map = checkMap(mapName, pm); Position pos = checkPosition(position.getName(), map, pm); ! if (pos == null) { pos = new Position(map, position.getPosX(), position.getPosY(), position.getName()); pm.makePersistent(pos); *************** *** 165,184 **** pos.setFixed(position.isFixed()); ! if (position.getClient() != null){ Client client = checkClient(position.getClient().getMac(), pm); ! if (client != null){ pos.setClient(client); setNewSignalCharacter(position, pm, client, pos); } } ! if (position.getAccessPoint() != null){ AccessPoint ap = findOrCreateAccessPoint(position.getAccessPoint().getMac(), pm); pos.setAccessPoint(ap); } ! JDOUtil.commit(tx);; ! } catch (Exception e){ e.printStackTrace(); ! } finally{ ! if (tx.isActive()){ tx.rollback(); } --- 157,176 ---- pos.setFixed(position.isFixed()); ! if (position.getClient() != null) { Client client = checkClient(position.getClient().getMac(), pm); ! if (client != null) { pos.setClient(client); setNewSignalCharacter(position, pm, client, pos); } } ! if (position.getAccessPoint() != null) { AccessPoint ap = findOrCreateAccessPoint(position.getAccessPoint().getMac(), pm); pos.setAccessPoint(ap); } ! JDOUtil.commit(tx); ! } catch (Exception e) { e.printStackTrace(); ! } finally { ! if (tx.isActive()) { tx.rollback(); } *************** *** 188,211 **** } ! /** ! * @param sessionId ! * @param mapName ! * @param positionX ! * @param positionY ! * @param character ! * @param positionName ! * @param pm ! * @param tx ! * @throws SessionException ! * @throws MapException ! */ ! private void createOrUpdatePositionInternal(long sessionId, String mapName, int positionX, int positionY, ! SignalCharacterDTO character, String positionName, boolean fixed, PersistenceManager pm, Transaction tx) ! throws SessionException, MapException{} ! ! private void getDataFromDB(){ PersistenceManager pm = null; Transaction tx = null; ! try{ pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); --- 180,187 ---- } ! private void getDataFromDB() { PersistenceManager pm = null; Transaction tx = null; ! try { pm = JDOUtil.pmfactory.getPersistenceManager(); tx = pm.currentTransaction(); *************** *** 214,224 **** Query query = pm.newQuery(e); Collection mapResults = (Collection) query.execute(); ! if (mapResults != null){ Iterator it1 = mapResults.iterator(); ! while (it1.hasNext()){ Map map = (Map) it1.next(); addMapHashtable(map); // Positionsdaten für map aus der Datenbank holen ! try{ Extent extent = pm.getExtent(Position.class, true); Query posQuery = pm.newQuery(extent, "map == myMap && deleted == 0"); --- 190,200 ---- Query query = pm.newQuery(e); Collection mapResults = (Collection) query.execute(); ! if (mapResults != null) { Iterator it1 = mapResults.iterator(); ! while (it1.hasNext()) { Map map = (Map) it1.next(); addMapHashtable(map); // Positionsdaten für map aus der Datenbank holen ! try { Extent extent = pm.getExtent(Position.class, true); Query posQuery = pm.newQuery(extent, "map == myMap && deleted == 0"); *************** *** 226,236 **** posQuery.declareImports("import net.sf.magicmap.db.Map"); Collection PositionResults = (Collection) posQuery.execute(map); ! if (PositionResults != null){ Iterator it2 = PositionResults.iterator(); ! while (it2.hasNext()){ Position pos = (Position) it2.next(); PositionDTO dto = new PositionDTO(); AccessPoint ap = pos.getAccessPoint(); ! if (ap != null){ AccessPointDTO apDTO = new AccessPointDTO(); apDTO.setMac(ap.getMac()); --- 202,212 ---- posQuery.declareImports("import net.sf.magicmap.db.Map"); Collection PositionResults = (Collection) posQuery.execute(map); ! if (PositionResults != null) { Iterator it2 = PositionResults.iterator(); ! while (it2.hasNext()) { Position pos = (Position) it2.next(); PositionDTO dto = new PositionDTO(); AccessPoint ap = pos.getAccessPoint(); ! if (ap != null) { AccessPointDTO apDTO = new AccessPointDTO(); apDTO.setMac(ap.getMac()); *************** *** 240,244 **** } Client client = pos.getClient(); ! if (client != null){ ClientDTO clientDTO = new ClientDTO(); clientDTO.setMac(client.getMac()); --- 216,220 ---- } Client client = pos.getClient(); ! if (client != null) { ClientDTO clientDTO = new ClientDTO(); clientDTO.setMac(client.getMac()); *************** *** 257,267 **** // Scanresults holen Collection scanResults = pos.getScanResults(); ! if (scanResults != null){ Iterator scanIt = scanResults.iterator(); ! while (scanIt.hasNext()){ ScanResult sr = (ScanResult) scanIt.next(); Date lastSeen = null; ! if (sr.getScantime() != null){ lastSeen = new Date(sr.getScantime().getTime()); } --- 233,243 ---- // Scanresults holen Collection scanResults = pos.getScanResults(); ! if (scanResults != null) { Iterator scanIt = scanResults.iterator(); ! while (scanIt.hasNext()) { ScanResult sr = (ScanResult) scanIt.next(); Date lastSeen = null; ! if (sr.getScantime() != null) { lastSeen = new Date(sr.getScantime().getTime()); } *************** *** 277,283 **** ArrayList list; ! if (dto.getCharacter().getSimpleScanResults() == null){ list = new ArrayList(); ! } else{ list = new ArrayList(Arrays.asList(dto.getCharacter().getSimpleScanResults())); } --- 253,259 ---- ArrayList list; ! if (dto.getCharacter().getSimpleScanResults() == null) { list = new ArrayList(); ! } else { list = new ArrayList(Arrays.asList(dto.getCharacter().getSimpleScanResults())); } *************** *** 291,295 **** } } ! } catch (Exception ex){ ex.printStackTrace(); } --- 267,271 ---- } } ! } catch (Exception ex) { ex.printStackTrace(); } *************** *** 297,327 **** } JDOUtil.commit(tx); ! } finally{ JDOUtil.closePM(pm); } } ! private String getMapString(Map map){ return map.getName() + "#" + map.getImageURL() + "#" + map.getImageHeight().toString() + "#" + map.getImageWidth().toString(); } ! private void addMapHashtable(Map map){ this.put(getMapString(map), new PositionCacheEntry()); } ! private boolean existsMapHashtable(Map map){ return this.containsKey(getMapString(map)); } ! private PositionCacheEntry getMapHashtable(Map map){ return this.get(getMapString(map)); } ! public void createOrUpdatePosition(Map map, PositionDTO position){ System.out.println("enter createOrUpdatePosition()"); if (!existsMapHashtable(map)) addMapHashtable(map); ! if (getMapHashtable(map).existsPosition(position.getName())){ getMapHashtable(map).deletePosition(position.getName()); } --- 273,303 ---- } JDOUtil.commit(tx); ! } finally { JDOUtil.closePM(pm); } } ! private String getMapString(Map map) { return map.getName() + "#" + map.getImageURL() + "#" + map.getImageHeight().toString() + "#" + map.getImageWidth().toString(); } ! private void addMapHashtable(Map map) { this.put(getMapString(map), new PositionCacheEntry()); } ! private boolean existsMapHashtable(Map map) { return this.containsKey(getMapString(map)); } ! private PositionCacheEntry getMapHashtable(Map map) { return this.get(getMapString(map)); } ! public void createOrUpdatePosition(Map map, PositionDTO position) { System.out.println("enter createOrUpdatePosition()"); if (!existsMapHashtable(map)) addMapHashtable(map); ! if (getMapHashtable(map).existsPosition(position.getName())) { getMapHashtable(map).deletePosition(position.getName()); } *************** *** 329,338 **** } ! public PositionDTO[] getPositionsForMapSince(Map map, Long time){ if (!existsMapHashtable(map)) return new PositionDTO[0]; return getMapHashtable(map).getPositionsSince(time); } ! public PositionDTO getPositionForClientOnMap(Map map, String name){ if (!existsMapHashtable(map)) return null; return getMapHashtable(map).getPosition(name); --- 305,314 ---- } ! public PositionDTO[] getPositionsForMapSince(Map map, Long time) { if (!existsMapHashtable(map)) return new PositionDTO[0]; return getMapHashtable(map).getPositionsSince(time); } ! public PositionDTO getPositionForClientOnMap(Map map, String name) { if (!existsMapHashtable(map)) return null; return getMapHashtable(map).getPosition(name); *************** *** 340,376 **** } ! public void movePosition(Map map, Long id, int x, int y, boolean fixed){ ! if (existsMapHashtable(map)){ getMapHashtable(map).movePosition(id, x, y, fixed); } } ! public void removePosition(Map map, Long id){ ! if (existsMapHashtable(map)){ getMapHashtable(map).removePosition(id); } } ! public void removePosition(Map map, String name){ ! if (existsMapHashtable(map)){ getMapHashtable(map).removePosition(name); } } ! public void writeCacheDataToDB(){ System.out.println("Begin Schreiben in Datenbank"); ! Enumeration<String> mapNames = this.keys(); ! while (mapNames.hasMoreElements()){ ! String currentMap = mapNames.nextElement(); PositionCacheEntry posCache = this.get(currentMap); ! currentMap = currentMap.substring(0,currentMap.indexOf('#')); ! if(posCache != null){ PositionDTO[] positions = posCache.getPositionsSince(Long.valueOf(-1)); ! for (int i = 0; i < positions.length; ++i){ writePositionToDB(currentMap, positions[i]); } - } } - System.out.println("Schreiben in Datenbank beendet"); } --- 316,350 ---- } ! public void movePosition(Map map, Long id, int x, int y, boolean fixed) { ! if (existsMapHashtable(map)) { getMapHashtable(map).movePosition(id, x, y, fixed); } } ! public void removePosition(Map map, Long id) { ! if (existsMapHashtable(map)) { getMapHashtable(map).removePosition(id); } } ! public void removePosition(Map map, String name) { ! if (existsMapHashtable(map)) { getMapHashtable(map).removePosition(name); } } ! public void writeCacheDataToDB() { System.out.println("Begin Schreiben in Datenbank"); ! ! for (String currentMap : this.keySet()) { PositionCacheEntry posCache = this.get(currentMap); ! currentMap = currentMap.substring(0, currentMap.indexOf('#')); ! if (posCache != null) { PositionDTO[] positions = posCache.getPositionsSince(Long.valueOf(-1)); ! for (int i = 0; i < positions.length; ++i) { writePositionToDB(currentMap, positions[i]); + } } } System.out.println("Schreiben in Datenbank beendet"); } *************** *** 392,400 **** } ! protected void removePosition(Long id){ PositionDTO pos = getPosition(id); pos.setDeleted(true); Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)){ ++time; } --- 366,374 ---- } ! protected void removePosition(Long id) { PositionDTO pos = getPosition(id); pos.setDeleted(true); Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)) { ++time; } *************** *** 403,412 **** } ! protected void removePosition(String name){ PositionDTO pos = getPosition(name); pos.setDeleted(true); Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)){ ++time; } --- 377,386 ---- } ! protected void removePosition(String name) { PositionDTO pos = getPosition(name); pos.setDeleted(true); Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)) { ++time; } *************** *** 415,421 **** } ! protected void addPosition(PositionDTO position){ Long id = new Long(1); ! while (idHash.containsKey(id)){ ++id; } --- 389,395 ---- } ! protected void addPosition(PositionDTO position) { Long id = new Long(1); ! while (idHash.containsKey(id)) { ++id; } *************** *** 423,427 **** Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)){ ++time; } --- 397,401 ---- Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)) { ++time; } *************** *** 433,438 **** } ! protected void movePosition(Long id, int x, int y, boolean fixed){ ! if (!idHash.containsKey(id)){ return; } --- 407,412 ---- } ! protected void movePosition(Long id, int x, int y, boolean fixed) { ! if (!idHash.containsKey(id)) { return; } *************** *** 442,446 **** pos.setFixed(fixed); Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)){ ++time; } --- 416,420 ---- pos.setFixed(fixed); Long time = System.currentTimeMillis(); ! while (timeMap.containsKey(time)) { ++time; } *************** *** 449,470 **** } ! private void updateTime(Long oldTime, Long time){ timeMap.put(time, timeMap.get(oldTime)); timeMap.remove(oldTime); } ! protected boolean existsPosition(String name){ return positionHash.containsKey(name); } ! protected PositionDTO getPosition(String name){ return positionHash.get(name); } ! protected PositionDTO getPosition(Long id){ return positionHash.get(idHash.get(id)); } ! protected void deletePosition(String name){ timeMap.remove(positionHash.get(name).getLastModified()); idHash.remove(positionHash.get(name).getId()); --- 423,444 ---- } ! private void updateTime(Long oldTime, Long time) { timeMap.put(time, timeMap.get(oldTime)); timeMap.remove(oldTime); } ! protected boolean existsPosition(String name) { return positionHash.containsKey(name); } ! protected PositionDTO getPosition(String name) { return positionHash.get(name); } ! protected PositionDTO getPosition(Long id) { return positionHash.get(idHash.get(id)); } ! protected void deletePosition(String name) { timeMap.remove(positionHash.get(name).getLastModified()); idHash.remove(positionHash.get(name).getId()); *************** *** 472,476 **** } ! protected void deletePosition(Long id){ timeMap.remove(idHash.get(id)); positionHash.remove(idHash.get(id)); --- 446,450 ---- } ! protected void deletePosition(Long id) { timeMap.remove(idHash.get(id)); positionHash.remove(idHash.get(id)); *************** *** 478,482 **** } ! protected PositionDTO[] getPositionsSince(Long time){ System.out.println("enter getPositionsSince()"); Collection<String> newPositions = timeMap.tailMap(time).values(); --- 452,456 ---- } ! protected PositionDTO[] getPositionsSince(Long time) { System.out.println("enter getPositionsSince()"); Collection<String> newPositions = timeMap.tailMap(time).values(); *************** *** 486,490 **** Iterator it = newPositions.iterator(); int i = 0; ! while (it.hasNext()){ positions[i++] = getPosition((String) it.next()); } --- 460,464 ---- Iterator it = newPositions.iterator(); int i = 0; ! while (it.hasNext()) { positions[i++] = getPosition((String) it.next()); } |
|
From: Martin S. <sch...@us...> - 2006-02-23 22:18:32
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16729/src/net/sf/magicmap/server/facade Modified Files: MapFacade.java PositionFacade.java Log Message: some cleanup Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MapFacade.java 23 Feb 2006 21:40:34 -0000 1.12 --- MapFacade.java 23 Feb 2006 22:18:27 -0000 1.13 *************** *** 14,22 **** import net.sf.magicmap.db.GeoPosition; import net.sf.magicmap.db.Map; - import net.sf.magicmap.db.Position; import net.sf.magicmap.db.Session; import net.sf.magicmap.server.dto.GeoPointDTO; - import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.exception.MapException; import net.sf.magicmap.server.exception.SessionException; --- 14,21 ---- import net.sf.magicmap.db.GeoPosition; import net.sf.magicmap.db.Map; import net.sf.magicmap.db.Session; import net.sf.magicmap.server.dto.GeoPointDTO; import net.sf.magicmap.server.dto.MapDTO; + import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.exception.MapException; import net.sf.magicmap.server.exception.SessionException; Index: PositionFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PositionFacade.java 23 Feb 2006 21:40:34 -0000 1.12 --- PositionFacade.java 23 Feb 2006 22:18:27 -0000 1.13 *************** *** 21,25 **** import net.sf.magicmap.db.ScanResult; import net.sf.magicmap.db.Session; - import net.sf.magicmap.server.cache.PositionCache; import net.sf.magicmap.server.dto.AccessPointDTO; import net.sf.magicmap.server.dto.ClientDTO; --- 21,24 ---- |
|
From: Martin S. <sch...@us...> - 2006-02-23 22:18:32
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16729/src/net/sf/magicmap/server/interfaces Modified Files: MapFacadeInterface.java Log Message: some cleanup Index: MapFacadeInterface.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces/MapFacadeInterface.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapFacadeInterface.java 20 Feb 2006 15:21:47 -0000 1.3 --- MapFacadeInterface.java 23 Feb 2006 22:18:26 -0000 1.4 *************** *** 3,21 **** import java.rmi.RemoteException; - import java.util.Collection; - - import javax.jdo.Extent; - import javax.jdo.PersistenceManager; - import javax.jdo.Query; - import javax.jdo.Transaction; - import net.sf.magicmap.db.GeoPosition; - import net.sf.magicmap.db.Map; import net.sf.magicmap.server.dto.GeoPointDTO; - import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.exception.MapException; import net.sf.magicmap.server.exception.SessionException; - import net.sf.magicmap.server.utils.JDOUtil; /** --- 3,12 ---- import java.rmi.RemoteException; import net.sf.magicmap.server.dto.GeoPointDTO; import net.sf.magicmap.server.dto.MapDTO; + import net.sf.magicmap.server.dto.StringReplacementDTO; import net.sf.magicmap.server.exception.MapException; import net.sf.magicmap.server.exception.SessionException; /** |
|
From: Florian L. <fle...@us...> - 2006-02-23 21:40:45
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27319/src/net/sf/magicmap/server/dto Modified Files: AccessPointDTO.java Log Message: geoposition fixed Index: AccessPointDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/AccessPointDTO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AccessPointDTO.java 11 May 2005 10:45:05 -0000 1.2 --- AccessPointDTO.java 23 Feb 2006 21:40:35 -0000 1.3 *************** *** 20,23 **** --- 20,39 ---- private String mac; private String ssid; + private boolean hidden; + + /** + * @return Returns the hidden. + */ + public boolean isHidden(){ + return hidden; + } + + + /** + * @param hidden The hidden to set. + */ + public void setHidden(boolean hidden){ + this.hidden = hidden; + } /** |
|
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 |
|
From: Florian L. <fle...@us...> - 2006-02-23 21:40:45
|
Update of /cvsroot/magicmap/magicmapserver/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27319/web/WEB-INF Modified Files: server-config.wsdd deploy_db.wsdd deploy_caches.wsdd Log Message: geoposition fixed Index: deploy_db.wsdd =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/deploy_db.wsdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** deploy_db.wsdd 25 Nov 2005 15:04:15 -0000 1.1 --- deploy_db.wsdd 23 Feb 2006 21:40:34 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- <beanMapping qname="myNS:StringReplacementDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.StringReplacementDTO"/> <beanMapping qname="myNS:MapDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.MapDTO"/> + <beanMapping qname="myNS:GeoPointDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.GeoPointDTO"/> </service> <service name="PositionFacade" provider="java:RPC"> Index: server-config.wsdd =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/server-config.wsdd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** server-config.wsdd 30 Nov 2005 17:57:13 -0000 1.7 --- server-config.wsdd 23 Feb 2006 21:40:34 -0000 1.8 *************** *** 43,56 **** <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.StringReplacementDTO" qname="ns1:StringReplacementDTO" xmlns:ns1="urn:dto.server.magicmap.sf.net"/> <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.MapDTO" qname="ns2:MapDTO" xmlns:ns2="urn:dto.server.magicmap.sf.net"/> </service> <service name="PositionFacade" provider="java:RPC"> <parameter name="allowedMethods" value="*"/> <parameter name="className" value="net.sf.magicmap.server.facade.PositionFacade2"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns3:SignalCharacterDTO" xmlns:ns3="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SimpleScanResultDTO" qname="ns4:SimpleScanResultDTO" xmlns:ns4="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns5:SignalCharacterDTO" xmlns:ns5="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.AccessPointDTO" qname="ns6:AccessPointDTO" xmlns:ns6="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.ClientDTO" qname="ns7:ClientDTO" xmlns:ns7="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.PositionDTO" qname="ns8:PositionDTO" xmlns:ns8="urn:dto.server.magicmap.sf.net"/> </service> <transport name="http"> --- 43,57 ---- <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.StringReplacementDTO" qname="ns1:StringReplacementDTO" xmlns:ns1="urn:dto.server.magicmap.sf.net"/> <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.MapDTO" qname="ns2:MapDTO" xmlns:ns2="urn:dto.server.magicmap.sf.net"/> + <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.GeoPointDTO" qname="ns3:GeoPointDTO" xmlns:ns3="urn:dto.server.magicmap.sf.net"/> </service> <service name="PositionFacade" provider="java:RPC"> <parameter name="allowedMethods" value="*"/> <parameter name="className" value="net.sf.magicmap.server.facade.PositionFacade2"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns4:SignalCharacterDTO" xmlns:ns4="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SimpleScanResultDTO" qname="ns5:SimpleScanResultDTO" xmlns:ns5="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO" qname="ns6:SignalCharacterDTO" xmlns:ns6="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.AccessPointDTO" qname="ns7:AccessPointDTO" xmlns:ns7="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.ClientDTO" qname="ns8:ClientDTO" xmlns:ns8="urn:dto.server.magicmap.sf.net"/> ! <beanMapping languageSpecificType="java:net.sf.magicmap.server.dto.PositionDTO" qname="ns9:PositionDTO" xmlns:ns9="urn:dto.server.magicmap.sf.net"/> </service> <transport name="http"> Index: deploy_caches.wsdd =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/deploy_caches.wsdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** deploy_caches.wsdd 25 Nov 2005 15:04:15 -0000 1.1 --- deploy_caches.wsdd 23 Feb 2006 21:40:34 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- <beanMapping qname="myNS:StringReplacementDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.StringReplacementDTO"/> <beanMapping qname="myNS:MapDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.MapDTO"/> + <beanMapping qname="myNS:GeoPointDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.GeoPointDTO"/> </service> <service name="PositionFacade" provider="java:RPC"> |
|
From: Florian L. <fle...@us...> - 2006-02-23 21:40:45
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27319/src/net/sf/magicmap/server/interfaces Modified Files: PositionFacadeInterface.java Log Message: geoposition fixed Index: PositionFacadeInterface.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces/PositionFacadeInterface.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PositionFacadeInterface.java 8 Nov 2005 10:29:13 -0000 1.4 --- PositionFacadeInterface.java 23 Feb 2006 21:40:35 -0000 1.5 *************** *** 120,123 **** --- 120,138 ---- public abstract String getPositionForClientOnMap(long sessionId, String mapName, String clientMac) throws MapException, SessionException, RemoteException; + + + /** + * Ändert den BerechnungsStatus eines AccessPoints + * + * @param sessionId + * @param mapName + * @param accessPointMac + * @param hidden + * @throws MapException + * @throws SessionException + * @throws RemoteException + */ + public abstract void setAccessPointHiddenStatus(long sessionId, String mapName, String accessPointMac, boolean hidden) + throws MapException, SessionException, RemoteException; } \ No newline at end of file |
|
From: Johannes Z. <jza...@us...> - 2006-02-23 18:35:20
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4028/src/net/sf/magicmap/client/controller Modified Files: Controller.java VirtualServerManager.java ServerManager.java SOAPServerManager.java Log Message: implemented routines for geo positions Index: VirtualServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/VirtualServerManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** VirtualServerManager.java 20 Feb 2006 08:49:14 -0000 1.5 --- VirtualServerManager.java 23 Feb 2006 18:34:38 -0000 1.6 *************** *** 19,22 **** --- 19,23 ---- import net.sf.magicmap.client.interfaces.ServerDisconnectCallback; import net.sf.magicmap.client.meta.MapInfo; + import net.sf.magicmap.client.model.node.GeoPos; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.utils.Version; *************** *** 234,237 **** --- 235,270 ---- } + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int, int, boolean, net.sf.magicmap.client.model.node.GeoPos, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) + */ + public void createGeoPos(final int x, final int y, final boolean fixed, + final GeoPos geoPos, final String name, final CreatePositionCallback callback) { + + if (isConnected()) { + // final SignalCharacterDTO signalCharacter = currentSignalCharacter(); + // final GeoPointDTO geoPoint = + // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); + + Thread createPositionThread = new Thread() { + + public void run(){ + synchronized (mutex){ + try { + // VirtualServerManager.this.mapDelegate.createGeoPoint( + // sessionId, name, x, y, geoPos.getLongitude(), + // geoPos.getLatitude(), geoPos.getAltitude()); + // TODO: Zusätzliche Parameter zur Position + callback.positionCreated(); + } catch (Exception e){ + callback.positionCreationError(e); + } + } + } + }; + createPositionThread.start(); + } + } + + /* * (non-Javadoc) Index: Controller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Controller.java 20 Feb 2006 08:49:14 -0000 1.8 --- Controller.java 23 Feb 2006 18:34:38 -0000 1.9 *************** *** 31,34 **** --- 31,35 ---- import net.sf.magicmap.client.model.node.AccessPointSeerNode; import net.sf.magicmap.client.model.node.ClientNode; + import net.sf.magicmap.client.model.node.GeoPos; import net.sf.magicmap.client.model.node.Node; import net.sf.magicmap.client.model.node.NodeModel; *************** *** 445,448 **** --- 446,462 ---- } } + + + /** + * Erzeugt einen Referenzpunkt auf der aktuellen Karte mit den aktuellen + * Messwerten des Clients mit den angegebenen Koordinaten. + */ + public void createGeoPos(int x, int y, GeoPos geoPos, String name, boolean fixed, CreatePositionCallback callback){ + if (!isConnected() || !isMapLoaded()) { + callback.positionCreationError(new Exception("Nicht verbunden oder keine Karte geladen.")); + } else{ + serverManager.createGeoPos(x, y, fixed, geoPos, name, callback); + } + } Index: ServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ServerManager.java 20 Feb 2006 08:49:14 -0000 1.9 --- ServerManager.java 23 Feb 2006 18:34:38 -0000 1.10 *************** *** 26,29 **** --- 26,30 ---- import net.sf.magicmap.client.interfaces.ServerDisconnectCallback; import net.sf.magicmap.client.model.measurement.SeenAccessPoint; + import net.sf.magicmap.client.model.node.GeoPos; import net.sf.magicmap.server.dto.PositionDTO; import net.sf.magicmap.server.dto.SignalCharacterDTO; *************** *** 141,144 **** --- 142,153 ---- public abstract void createLocation(final int x, final int y, final boolean fixed, final String name, final CreatePositionCallback callback); + + /** + * Erzeugt eine Geokoordinate auf dem Server + * @param node + * @param callback + */ + public abstract void createGeoPos(final int x, final int y, final boolean fixed, final GeoPos geoPos, final String name, + final CreatePositionCallback callback); /** Index: SOAPServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/SOAPServerManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SOAPServerManager.java 20 Feb 2006 08:49:14 -0000 1.5 --- SOAPServerManager.java 23 Feb 2006 18:34:38 -0000 1.6 *************** *** 25,30 **** --- 25,32 ---- import net.sf.magicmap.client.interfaces.ServerDisconnectCallback; import net.sf.magicmap.client.meta.MapInfo; + import net.sf.magicmap.client.model.node.GeoPos; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.utils.Version; + import net.sf.magicmap.server.dto.GeoPointDTO; import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.dto.PositionDTO; *************** *** 228,231 **** --- 230,264 ---- } + /* (non-Javadoc) + * @see net.sf.magicmap.client.controller.ServerManager#createGeoPos(int, int, boolean, net.sf.magicmap.client.model.node.GeoPos, java.lang.String, net.sf.magicmap.client.interfaces.CreatePositionCallback) + */ + public void createGeoPos(final int x, final int y, final boolean fixed, + final GeoPos geoPos, final String name, final CreatePositionCallback callback) { + + if (isConnected()) { + // final SignalCharacterDTO signalCharacter = currentSignalCharacter(); + // final GeoPointDTO geoPoint = + // new GeoPointDTO(geoPos.getAltitude(), geoPos.getLatitude(), geoPos.getLongitude(), x, y, (long) -1); + + Thread createPositionThread = new Thread() { + + public void run(){ + synchronized (mutex){ + try { + SOAPServerManager.this.mapDelegate.createGeoPoint( + sessionId, name, x, y, geoPos.getLongitude(), + geoPos.getLatitude(), geoPos.getAltitude()); + // TODO: Zusätzliche Parameter zur Position + callback.positionCreated(); + } catch (Exception e){ + callback.positionCreationError(e); + } + } + } + }; + createPositionThread.start(); + } + } + /** * Entfernt einen Referenzpunkt oder die Positionierung eines |
|
From: Johannes Z. <jza...@us...> - 2006-02-23 18:35:16
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4028/src/net/sf/magicmap/client/gui/utils Modified Files: GUIConstants.java Log Message: implemented routines for geo positions Index: GUIConstants.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils/GUIConstants.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GUIConstants.java 29 Sep 2005 14:48:19 -0000 1.3 --- GUIConstants.java 23 Feb 2006 18:34:39 -0000 1.4 *************** *** 46,49 **** --- 46,51 ---- public static final String ICON_CLIENT = "custom/client.png"; public static final String ICON_ACCESSPOINT = "custom/accesspoint.png"; + public static final String ICON_GEOPOS = "custom/geopos.png"; + public static final String ICON_GEOPOS_BIG = "custom/geopos_big.png"; public static final String ICON_LOCATION = "custom/location.png"; public static final String ICON_CLIENT_ANCHOR = "custom/client_anchor.png"; |
|
From: Johannes Z. <jza...@us...> - 2006-02-23 18:34:51
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4028/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java MapPanel.java Log Message: implemented routines for geo positions Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MainGUI.java 20 Feb 2006 08:49:27 -0000 1.13 --- MainGUI.java 23 Feb 2006 18:34:39 -0000 1.14 *************** *** 160,165 **** toolBar = new JToolBar(); toolBar.setRollover(true); ! toolBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE); ! menuBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE); addMainToolBarButtons(toolBar); --- 160,165 ---- toolBar = new JToolBar(); toolBar.setRollover(true); ! // toolBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE); ! // menuBar.putClientProperty(com.jgoodies.plaf.plastic.PlasticLookAndFeel.IS_3D_KEY, Boolean.TRUE); addMainToolBarButtons(toolBar); Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MapPanel.java 8 Nov 2005 11:24:19 -0000 1.13 --- MapPanel.java 23 Feb 2006 18:34:39 -0000 1.14 *************** *** 18,21 **** --- 18,22 ---- import net.sf.magicmap.client.controller.Controller; + import net.sf.magicmap.client.gui.dialogs.GeoPosDialog; import net.sf.magicmap.client.gui.utils.GUIBuilder; import net.sf.magicmap.client.gui.utils.GUIConstants; *************** *** 29,32 **** --- 30,34 ---- import net.sf.magicmap.client.model.node.AccessPointNode; import net.sf.magicmap.client.model.node.ClientNode; + import net.sf.magicmap.client.model.node.GeoPos; import net.sf.magicmap.client.model.node.LocationNode; import net.sf.magicmap.client.model.node.Node; *************** *** 37,228 **** /** * Komponente des Programmes, welches die Karte verwaltet und ! *auf das NodeModel gesteuert durch Benutzeraktionen zugreift. * * @author thuebner */ ! public class MapPanel extends JPanel ! implements ! MapViewListener, ! CreatePositionCallback, ! DeletePositionCallback, ! PositionCallback, ! MovePositionCallback { ! private MapView mapView; ! private JPopupMenu mapMenu; ! private int lastX; ! private int lastY; ! Node selectedNode; ! private AbstractAction createLocationAction; ! private AbstractAction fetchLocationsAction; ! private MagicAction fixAction; ! private AbstractAction deleteAction; ! private AbstractAction renameAction; ! private AbstractAction propertiesAction; ! private AbstractAction measureLocationAction; ! public Node getSelectedNode(){ ! return selectedNode; ! } ! public MapPanel() { ! super(); ! buildActions(); ! this.setLayout(new BorderLayout()); ! this.setPreferredSize(new Dimension(-1, 450)); ! this.mapView = null; ! this.mapMenu = buildMapMenu(); ! } ! private void buildActions(){ ! createLocationAction = new AbstractAction(GUIUtils.i18n("createlocation")) { ! public void actionPerformed(ActionEvent e){ ! createLocation(); ! } ! }; ! measureLocationAction = new AbstractAction(GUIUtils.i18n("measurelocation")) { ! public void actionPerformed(ActionEvent e){ ! measureLocation(); ! } ! }; ! fetchLocationsAction = new AbstractAction(GUIUtils.i18n("fetchlocations")) { ! public void actionPerformed(ActionEvent e){ ! fetchLocations(); ! } ! }; ! fixAction = new MagicAction("fixated") { ! public void actionPerformed(ActionEvent e){ ! //selectedNode.setFix(!selectedNode.isFix()); ! setFix(!selectedNode.isFix()); ! } ! }; ! deleteAction = new AbstractAction(GUIUtils.i18n("delete"), GUIBuilder.getToolIcon(GUIConstants.ICON_DELETE)) { ! public void actionPerformed(ActionEvent e){ ! //assert (selectedNode != null); ! deleteNode(); ! } ! }; ! renameAction = new AbstractAction(GUIUtils.i18n("rename"), GUIBuilder.getToolIcon(GUIConstants.ICON_RENAME)) { ! public void actionPerformed(ActionEvent e){ ! renameNode(); ! } ! }; ! propertiesAction = new AbstractAction(GUIUtils.i18n("properties"), GUIBuilder ! .getToolIcon(GUIConstants.ICON_PROPERTIES)) { ! public void actionPerformed(ActionEvent e){ ! // TODO Auto-generated method stub ! } ! }; ! } ! private JMenu buildTestMenu(){ ! JMenu menu = new JMenu(GUIUtils.i18n("test")); ! return menu; ! } ! private JPopupMenu buildMapMenu(){ ! JPopupMenu menu = new JPopupMenu(); ! menu.add(buildTestMenu()); ! menu.addSeparator(); ! menu.add(GUIBuilder.createMenuItem(createLocationAction)); ! menu.addSeparator(); ! menu.add(GUIBuilder.createMenuItem(fetchLocationsAction)); ! return menu; ! } ! private JPopupMenu buildNodeMenu(Node node){ ! JPopupMenu menu = new JPopupMenu(); ! // +++++++ TEST +++++++++ ! //menu.add(buildNodeNeighborMenu(node)); ! //menu.add(buildNodeNonNeighborMenu(node)); ! if (node.getType() == NodeModel.NODETYPE_LOCATION) menu.add(GUIBuilder.createMenuItem(measureLocationAction)); ! menu.add(GUIBuilder.createCheckBoxMenuItem(fixAction, node.isFix())); ! menu.addSeparator(); ! // ------- TEST --------- ! menu.add(GUIBuilder.createMenuItem(renameAction)); ! menu.add(GUIBuilder.createMenuItem(deleteAction)); ! menu.addSeparator(); ! menu.add(GUIBuilder.createMenuItem(propertiesAction)); ! deleteAction.setEnabled(node.getType() == NodeModel.NODETYPE_LOCATION); ! renameAction.setEnabled(false); ! propertiesAction.setEnabled(false); ! return menu; ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapListener#vertexRightClicked(edu.uci.ics.jung.graph.Vertex, int, int) ! */ ! public void nodeRightClicked(Node node, int x, int y){ ! lastX = x; ! lastY = y; ! selectedNode = node; ! selectedNode.setPositionSilent(x, y); ! int ox = mapView.getGraphOffsetX(); ! int oy = mapView.getGraphOffsetY(); ! buildNodeMenu(node).show(this, x + ox, y + oy); ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapListener#rightClicked(int, int) ! */ ! public void rightClicked(int x, int y){ ! lastX = x; ! lastY = y; ! selectedNode = null; ! int ox = mapView.getGraphOffsetX(); ! int oy = mapView.getGraphOffsetY(); ! mapMenu.show(this, x + ox, y + oy); ! } ! public int getLastX(){ ! return lastX; ! } ! public int getLastY(){ ! return lastY; ! } ! /** ! * Referenzpunkt mit aktuell gemessenen Werten anlegen. Dies ! * geschieht über den Controller, so dass dieser am Server ! * gespeichert werden kann. ! * ! */ ! void createLocation(){ ! 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); ! } ! } /** --- 39,384 ---- /** * Komponente des Programmes, welches die Karte verwaltet und ! * auf das NodeModel gesteuert durch Benutzeraktionen zugreift. * * @author thuebner */ ! public class MapPanel extends JPanel implements ! MapViewListener, ! CreatePositionCallback, ! DeletePositionCallback, ! PositionCallback, ! MovePositionCallback { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = -2121613388654392917L; ! ! private MapView mapView; ! private JPopupMenu mapMenu; ! private int lastX; ! private int lastY; ! Node selectedNode; ! private AbstractAction createLocationAction; ! private AbstractAction createGeoPosAction; ! private AbstractAction createInfoObjectAction; ! private AbstractAction createRFIDAntennaAction; ! private AbstractAction fetchLocationsAction; ! private MagicAction fixAction; ! private AbstractAction deleteAction; ! private AbstractAction renameAction; ! private AbstractAction propertiesAction; ! private AbstractAction measureLocationAction; ! ! /** ! * Getter for selected node ! * @return the selected node ! */ ! public Node getSelectedNode(){ ! return selectedNode; ! } ! /** ! * Constructor ! */ ! public MapPanel() { ! super(); ! buildActions(); ! this.setLayout(new BorderLayout()); ! this.setPreferredSize(new Dimension(-1, 450)); ! this.mapView = null; ! this.mapMenu = buildMapMenu(); ! } ! ! /** ! * The action building method ! */ ! private void buildActions() { ! ! createLocationAction = new AbstractAction(GUIUtils.i18n("createlocation")) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = -5950182498648593271L; ! public void actionPerformed(ActionEvent e){ ! createLocation(); ! } ! }; ! ! createGeoPosAction = new AbstractAction(GUIUtils.i18n("creategeopos")) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = 1L; ! public void actionPerformed(ActionEvent e){ ! createGeoPos(); ! } ! }; ! ! createInfoObjectAction = new AbstractAction(GUIUtils.i18n("createinfoobject")) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = 1L; ! public void actionPerformed(ActionEvent e){ ! createInfoObject(); ! } ! }; ! ! createRFIDAntennaAction = new AbstractAction(GUIUtils.i18n("createrfidantenna")) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = 1L; ! public void actionPerformed(ActionEvent e){ ! createRFIDAntenna(); ! } ! }; ! measureLocationAction = new AbstractAction(GUIUtils.i18n("measurelocation")) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = 7431846299555207166L; ! public void actionPerformed(ActionEvent e){ ! measureLocation(); ! } ! }; ! fetchLocationsAction = new AbstractAction(GUIUtils.i18n("fetchlocations")) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = -3428721448067681186L; ! public void actionPerformed(ActionEvent e){ ! fetchLocations(); ! } ! }; ! fixAction = new MagicAction("fixated") { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = 2039840191048447633L; ! public void actionPerformed(ActionEvent e){ ! //selectedNode.setFix(!selectedNode.isFix()); ! setFix(!selectedNode.isFix()); ! } ! }; ! deleteAction = new AbstractAction(GUIUtils.i18n("delete"), GUIBuilder.getToolIcon(GUIConstants.ICON_DELETE)) { ! /** ! * serial version ! */ ! private static final long serialVersionUID = 6412040207867763736L; ! public void actionPerformed(ActionEvent e){ ! //assert (selectedNode != null); ! deleteNode(); ! } ! }; ! renameAction = new AbstractAction(GUIUtils.i18n("rename"), GUIBuilder.getToolIcon(GUIConstants.ICON_RENAME)) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = 8740256818963533442L; ! public void actionPerformed(ActionEvent e){ ! renameNode(); ! } ! }; ! propertiesAction = new AbstractAction(GUIUtils.i18n("properties"), GUIBuilder.getToolIcon(GUIConstants.ICON_PROPERTIES)) { ! /** ! * serial version id ! */ ! private static final long serialVersionUID = -8194784366560052071L; ! public void actionPerformed(ActionEvent e){ ! // TODO Auto-generated method stub ! } ! }; ! } ! /** ! * @deprecated ! * @return ! */ ! private JMenu buildTestMenu() { ! JMenu menu = new JMenu(GUIUtils.i18n("test")); ! return menu; ! } ! ! /** ! * ! * @return ! */ ! private JPopupMenu buildMapMenu() { ! JPopupMenu menu = new JPopupMenu(); ! menu.add(buildTestMenu()); ! menu.addSeparator(); ! menu.add(GUIBuilder.createMenuItem(createLocationAction)); ! menu.add(GUIBuilder.createMenuItem(createGeoPosAction)); ! // menu.add(GUIBuilder.createMenuItem(createInfoObjectAction)); ! // menu.add(GUIBuilder.createMenuItem(createRFIDAntennaAction)); ! menu.addSeparator(); ! menu.add(GUIBuilder.createMenuItem(fetchLocationsAction)); ! return menu; ! } ! /** ! * ! * @param node ! * @return ! */ ! private JPopupMenu buildNodeMenu(Node node) { ! JPopupMenu menu = new JPopupMenu(); ! // +++++++ TEST +++++++++ ! //menu.add(buildNodeNeighborMenu(node)); ! //menu.add(buildNodeNonNeighborMenu(node)); ! if (node.getType() == NodeModel.NODETYPE_LOCATION) menu.add(GUIBuilder.createMenuItem(measureLocationAction)); ! menu.add(GUIBuilder.createCheckBoxMenuItem(fixAction, node.isFix())); ! menu.addSeparator(); ! // ------- TEST --------- ! menu.add(GUIBuilder.createMenuItem(renameAction)); ! menu.add(GUIBuilder.createMenuItem(deleteAction)); ! menu.addSeparator(); ! menu.add(GUIBuilder.createMenuItem(propertiesAction)); ! deleteAction.setEnabled(node.getType() == NodeModel.NODETYPE_LOCATION); ! renameAction.setEnabled(false); ! propertiesAction.setEnabled(false); ! return menu; ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapListener#vertexRightClicked(edu.uci.ics.jung.graph.Vertex, int, int) ! */ ! public void nodeRightClicked(Node node, int x, int y){ ! lastX = x; ! lastY = y; ! selectedNode = node; ! selectedNode.setPositionSilent(x, y); ! int ox = mapView.getGraphOffsetX(); ! int oy = mapView.getGraphOffsetY(); ! buildNodeMenu(node).show(this, x + ox, y + oy); ! } ! /* (non-Javadoc) ! * @see net.sf.magicmap.client.interfaces.MapListener#rightClicked(int, int) ! */ ! public void rightClicked(int x, int y){ ! lastX = x; ! lastY = y; ! selectedNode = null; ! int ox = mapView.getGraphOffsetX(); ! int oy = mapView.getGraphOffsetY(); ! mapMenu.show(this, x + ox, y + oy); ! } ! /** ! * ! * @return ! */ ! public int getLastX(){ ! return lastX; ! } ! /** ! * ! * @return ! */ ! public int getLastY(){ ! return lastY; ! } ! /** ! * Referenzpunkt mit aktuell gemessenen Werten anlegen. Dies ! * geschieht über den Controller, so dass dieser am Server ! * gespeichert werden kann. ! * ! */ ! void createLocation() { ! 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); ! } ! } ! /** ! * Create a geo pos for the current selected location ! * ! */ ! void createGeoPos() { ! GeoPos geoPos = GeoPosDialog.showDialog(MainGUI.getInstance()); ! if (geoPos != null) { ! Controller.getInstance().createGeoPos(getLastX(), getLastY(), geoPos, ! Controller.getInstance().getCurrentMap().name, true, this); ! } ! } ! ! /** ! * Create an info object for the current selected location ! * ! */ ! void createInfoObject() { ! 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); ! } ! } ! ! ! /** ! * Create an info object for the current selected location ! * ! */ ! void createRFIDAntenna() { ! 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: Johannes Z. <jza...@us...> - 2006-02-23 18:34:50
|
Update of /cvsroot/magicmap/magicmapclient/res/toolBarButtonGraphics/custom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4028/res/toolBarButtonGraphics/custom Added Files: geopos.png geopos_big.png Log Message: implemented routines for geo positions --- NEW FILE: geopos_big.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: geopos.png --- (This appears to be a binary file; contents omitted.) |
1 message has been excluded from this view by a project administrator.
