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: Martin S. <sch...@us...> - 2005-05-11 15:44:42
|
Update of /cvsroot/magicmap/magicmapclient/lib-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14250/lib-dev Added Files: axis-ant.jar Log Message: + wsdl2java via ant-task + string[] replaced +axis 1.2 (final) --- NEW FILE: axis-ant.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:44:37
|
Update of /cvsroot/magicmap/magicmapclient/lib-dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14229/lib-dev Log Message: Directory /cvsroot/magicmap/magicmapclient/lib-dev added to the repository |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:44:13
|
Update of /cvsroot/magicmap/magicmapclient/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13829/lib Modified Files: commons-logging.jar commons-discovery.jar jaxrpc.jar saaj.jar wsdl4j.jar axis.jar Log Message: +axis 1.2 (final) Index: commons-logging.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/lib/commons-logging.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsI2NtMJ and /tmp/cvshOUVUA differ Index: commons-discovery.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/lib/commons-discovery.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsPISwaM and /tmp/cvsofEIkD differ Index: axis.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/lib/axis.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs7CLwEM and /tmp/cvszYOW1D differ Index: saaj.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/lib/saaj.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsyvvo47 and /tmp/cvsqMoNyZ differ Index: jaxrpc.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/lib/jaxrpc.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsLdrRfa and /tmp/cvsdy4NL1 differ Index: wsdl4j.jar =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/lib/wsdl4j.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsfKHu5c and /tmp/cvsAv8UD4 differ |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:42:59
|
Update of /cvsroot/magicmap/magicmapclient/inf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13710/inf Added Files: PositionFacade.wsdl MapFacade.wsdl SessionFacade.wsdl Log Message: + wsdl2java via ant-task + string[] replaced --- NEW FILE: MapFacade.wsdl --- <?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)--> <wsdl:types> <schema targetNamespace="urn: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="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="MapDTO"> <sequence> <element name="id" nillable="true" type="soapenc:long"/> <element name="imageHeight" nillable="true" type="soapenc:int"/> <element name="imageURL" nillable="true" type="soapenc:string"/> <element name="imageWidth" nillable="true" type="soapenc:int"/> <element name="name" nillable="true" type="soapenc:string"/> </sequence> </complexType> <complexType name="StringReplacementDTO"> <sequence> <element name="wrappedString" nillable="true" type="soapenc:string"/> </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"> <sequence/> </complexType> <complexType name="SessionException"> <sequence/> </complexType> </schema> <schema targetNamespace="http://localhost:8080/magicmap/services/MapFacade" xmlns="http://www.w3.org/2001/XMLSchema"> <import namespace="http://exception.server.magicmap.sf.net"/> <import namespace="urn:dto.server.magicmap.sf.net"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="ArrayOf_tns1_StringReplacementDTO"> <complexContent> <restriction base="soapenc:Array"> <attribute ref="soapenc:arrayType" wsdl:arrayType="tns1:StringReplacementDTO[]"/> </restriction> </complexContent> </complexType> </schema> </wsdl:types> <wsdl:message name="getMapNamesResponse"> <wsdl:part name="getMapNamesReturn" type="impl:ArrayOf_tns1_StringReplacementDTO"/> </wsdl:message> <wsdl:message name="createNewMapRequest"> <wsdl:part name="sessionId" type="xsd:long"/> <wsdl:part name="name" type="soapenc:string"/> <wsdl:part name="URL" type="soapenc:string"/> <wsdl:part name="width" type="xsd:int"/> <wsdl:part name="height" type="xsd:int"/> </wsdl:message> <wsdl:message name="getMapRequest"> <wsdl:part name="name" type="soapenc:string"/> </wsdl:message> <wsdl:message name="getMapNamesRequest"> </wsdl:message> <wsdl:message name="createNewMapResponse"> <wsdl:part name="createNewMapReturn" type="tns1:MapDTO"/> </wsdl:message> <wsdl:message name="SessionException"> <wsdl:part name="fault" type="tns2:SessionException"/> </wsdl:message> <wsdl:message name="MapException"> <wsdl:part name="fault" type="tns2:MapException"/> </wsdl:message> <wsdl:message name="getMapResponse"> <wsdl:part name="getMapReturn" type="tns1:MapDTO"/> </wsdl:message> <wsdl:portType name="MapFacade"> <wsdl:operation name="getMap" parameterOrder="name"> <wsdl:input message="impl:getMapRequest" name="getMapRequest"/> <wsdl:output message="impl:getMapResponse" name="getMapResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> </wsdl:operation> <wsdl:operation name="getMapNames"> <wsdl:input message="impl:getMapNamesRequest" name="getMapNamesRequest"/> <wsdl:output message="impl:getMapNamesResponse" name="getMapNamesResponse"/> </wsdl:operation> <wsdl:operation name="createNewMap" parameterOrder="sessionId name URL width height"> <wsdl:input message="impl:createNewMapRequest" name="createNewMapRequest"/> <wsdl:output message="impl:createNewMapResponse" name="createNewMapResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> <wsdl:fault message="impl:SessionException" name="SessionException"/> </wsdl:operation> </wsdl:portType> <wsdl:binding name="MapFacadeSoapBinding" type="impl:MapFacade"> <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> <wsdl:operation name="getMap"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="getMapRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="getMapResponse"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://localhost:8080/magicmap/services/MapFacade" 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/MapFacade" use="encoded"/> </wsdl:fault> </wsdl:operation> <wsdl:operation name="getMapNames"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="getMapNamesRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="getMapNamesResponse"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://localhost:8080/magicmap/services/MapFacade" use="encoded"/> </wsdl:output> </wsdl:operation> <wsdl:operation name="createNewMap"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="createNewMapRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="createNewMapResponse"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://localhost:8080/magicmap/services/MapFacade" 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/MapFacade" 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/MapFacade" use="encoded"/> </wsdl:fault> </wsdl:operation> </wsdl:binding> <wsdl:service name="MapFacadeService"> <wsdl:port binding="impl:MapFacadeSoapBinding" name="MapFacade"> <wsdlsoap:address location="http://localhost:8080/magicmap/services/MapFacade"/> </wsdl:port> </wsdl:service> </wsdl:definitions> --- NEW FILE: SessionFacade.wsdl --- <?xml version="1.0" encoding="UTF-8"?> <wsdl:definitions targetNamespace="http://localhost:8080/magicmap/services/SessionFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost:8080/magicmap/services/SessionFacade" xmlns:intf="http://localhost:8080/magicmap/services/SessionFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="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)--> <wsdl:types> <schema targetNamespace="http://exception.server.magicmap.sf.net" xmlns="http://www.w3.org/2001/XMLSchema"> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="AuthenticationException"> <sequence/> </complexType> </schema> </wsdl:types> <wsdl:message name="AuthenticationException"> <wsdl:part name="fault" type="tns1:AuthenticationException"/> </wsdl:message> <wsdl:message name="disconnectRequest"> <wsdl:part name="name" type="soapenc:string"/> <wsdl:part name="mac" type="soapenc:string"/> <wsdl:part name="passwd" type="soapenc:string"/> <wsdl:part name="sessionId" type="xsd:long"/> </wsdl:message> <wsdl:message name="connectRequest"> <wsdl:part name="name" type="soapenc:string"/> <wsdl:part name="mac" type="soapenc:string"/> <wsdl:part name="passwd" type="soapenc:string"/> <wsdl:part name="version" type="soapenc:string"/> </wsdl:message> <wsdl:message name="connectResponse"> <wsdl:part name="connectReturn" type="xsd:long"/> </wsdl:message> <wsdl:message name="disconnectResponse"> </wsdl:message> <wsdl:portType name="SessionFacade"> <wsdl:operation name="connect" parameterOrder="name mac passwd version"> <wsdl:input message="impl:connectRequest" name="connectRequest"/> <wsdl:output message="impl:connectResponse" name="connectResponse"/> <wsdl:fault message="impl:AuthenticationException" name="AuthenticationException"/> </wsdl:operation> <wsdl:operation name="disconnect" parameterOrder="name mac passwd sessionId"> <wsdl:input message="impl:disconnectRequest" name="disconnectRequest"/> <wsdl:output message="impl:disconnectResponse" name="disconnectResponse"/> <wsdl:fault message="impl:AuthenticationException" name="AuthenticationException"/> </wsdl:operation> </wsdl:portType> <wsdl:binding name="SessionFacadeSoapBinding" type="impl:SessionFacade"> <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> <wsdl:operation name="connect"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="connectRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="connectResponse"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://localhost:8080/magicmap/services/SessionFacade" use="encoded"/> </wsdl:output> <wsdl:fault name="AuthenticationException"> <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="AuthenticationException" namespace="http://localhost:8080/magicmap/services/SessionFacade" use="encoded"/> </wsdl:fault> </wsdl:operation> <wsdl:operation name="disconnect"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="disconnectRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="disconnectResponse"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://localhost:8080/magicmap/services/SessionFacade" use="encoded"/> </wsdl:output> <wsdl:fault name="AuthenticationException"> <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="AuthenticationException" namespace="http://localhost:8080/magicmap/services/SessionFacade" use="encoded"/> </wsdl:fault> </wsdl:operation> </wsdl:binding> <wsdl:service name="SessionFacadeService"> <wsdl:port binding="impl:SessionFacadeSoapBinding" name="SessionFacade"> <wsdlsoap:address location="http://localhost:8080/magicmap/services/SessionFacade"/> </wsdl:port> </wsdl:service> </wsdl:definitions> --- NEW FILE: PositionFacade.wsdl --- <?xml version="1.0" encoding="UTF-8"?> <wsdl:definitions targetNamespace="http://localhost:8080/magicmap/services/PositionFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://localhost:8080/magicmap/services/PositionFacade" xmlns:intf="http://localhost:8080/magicmap/services/PositionFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="http://exception.server.magicmap.sf.net" xmlns:tns2="urn: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)--> <wsdl:types> <schema targetNamespace="http://exception.server.magicmap.sf.net" xmlns="http://www.w3.org/2001/XMLSchema"> <import namespace="urn:dto.server.magicmap.sf.net"/> <import namespace="http://localhost:8080/magicmap/services/PositionFacade"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="SessionException"> <sequence/> </complexType> <complexType name="MapException"> <sequence/> </complexType> </schema> <schema targetNamespace="urn: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/PositionFacade"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="SimpleScanResultDTO"> <sequence> <element name="lastSeen" nillable="true" type="xsd:dateTime"/> <element name="macAP" nillable="true" type="soapenc:string"/> <element name="noise" nillable="true" type="soapenc:double"/> <element name="signalLevel" nillable="true" type="soapenc:double"/> <element name="ssid" nillable="true" type="soapenc:string"/> </sequence> </complexType> <complexType name="SignalCharacterDTO"> <sequence> <element name="simpleScanResults" nillable="true" type="impl:ArrayOf_tns2_SimpleScanResultDTO"/> </sequence> </complexType> <complexType name="AccessPointDTO"> <sequence> <element name="id" nillable="true" type="soapenc:long"/> <element name="mac" nillable="true" type="soapenc:string"/> <element name="ssid" nillable="true" type="soapenc:string"/> </sequence> </complexType> <complexType name="ClientDTO"> <sequence> <element name="id" nillable="true" type="soapenc:long"/> <element name="mac" nillable="true" type="soapenc:string"/> <element name="name" nillable="true" type="soapenc:string"/> </sequence> </complexType> <complexType name="PositionDTO"> <sequence> <element name="accessPoint" nillable="true" type="tns2:AccessPointDTO"/> <element name="character" nillable="true" type="tns2:SignalCharacterDTO"/> <element name="client" nillable="true" type="tns2:ClientDTO"/> <element name="deleted" type="xsd:boolean"/> <element name="fixed" type="xsd:boolean"/> <element name="id" nillable="true" type="soapenc:long"/> <element name="lastModified" nillable="true" type="soapenc:long"/> <element name="name" nillable="true" type="soapenc:string"/> <element name="posX" nillable="true" type="soapenc:int"/> <element name="posY" nillable="true" type="soapenc:int"/> </sequence> </complexType> </schema> <schema targetNamespace="http://localhost:8080/magicmap/services/PositionFacade" xmlns="http://www.w3.org/2001/XMLSchema"> <import namespace="http://exception.server.magicmap.sf.net"/> <import namespace="urn:dto.server.magicmap.sf.net"/> <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> <complexType name="ArrayOf_tns2_SimpleScanResultDTO"> <complexContent> <restriction base="soapenc:Array"> <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:SimpleScanResultDTO[]"/> </restriction> </complexContent> </complexType> <complexType name="ArrayOf_tns2_PositionDTO"> <complexContent> <restriction base="soapenc:Array"> <attribute ref="soapenc:arrayType" wsdl:arrayType="tns2:PositionDTO[]"/> </restriction> </complexContent> </complexType> </schema> </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"> <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="positionName" type="soapenc:string"/> <wsdl:part name="fixed" type="xsd:boolean"/> </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="deletePositionResponse"> </wsdl:message> <wsdl:message name="movePositionRequest"> <wsdl:part name="sessionId" type="xsd:long"/> <wsdl:part name="positionId" type="xsd:long"/> <wsdl:part name="newPositionX" type="xsd:int"/> <wsdl:part name="newPositionY" type="xsd:int"/> <wsdl:part name="fixed" type="xsd:boolean"/> </wsdl:message> <wsdl:message name="deletePositionRequest"> <wsdl:part name="sessionId" type="xsd:long"/> <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="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="createOrUpdatePositionResponse"> </wsdl:message> <wsdl:message name="MapException"> <wsdl:part name="fault" type="tns1:MapException"/> </wsdl:message> <wsdl:message name="movePositionResponse"> </wsdl:message> <wsdl:portType name="PositionFacade"> <wsdl:operation name="movePosition" parameterOrder="sessionId positionId newPositionX newPositionY fixed"> <wsdl:input message="impl:movePositionRequest" name="movePositionRequest"/> <wsdl:output message="impl:movePositionResponse" name="movePositionResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> <wsdl:fault message="impl:SessionException" name="SessionException"/> </wsdl:operation> <wsdl:operation name="createOrUpdatePosition" parameterOrder="sessionId mapName positionX positionY character positionName fixed"> <wsdl:input message="impl:createOrUpdatePositionRequest" name="createOrUpdatePositionRequest"/> <wsdl:output message="impl:createOrUpdatePositionResponse" name="createOrUpdatePositionResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> <wsdl:fault message="impl:SessionException" name="SessionException"/> </wsdl:operation> <wsdl:operation name="createOrUpdateClientPosition" parameterOrder="sessionId mapName positionX positionY character clientMac fixed"> <wsdl:input message="impl:createOrUpdateClientPositionRequest" name="createOrUpdateClientPositionRequest"/> <wsdl:output message="impl:createOrUpdateClientPositionResponse" name="createOrUpdateClientPositionResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> <wsdl:fault message="impl:SessionException" name="SessionException"/> </wsdl:operation> <wsdl:operation name="createOrUpdateAccessPosition" parameterOrder="sessionId mapName positionX positionY accessPointMac fixed"> <wsdl:input message="impl:createOrUpdateAccessPositionRequest" name="createOrUpdateAccessPositionRequest"/> <wsdl:output message="impl:createOrUpdateAccessPositionResponse" name="createOrUpdateAccessPositionResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> <wsdl:fault message="impl:SessionException" name="SessionException"/> </wsdl:operation> <wsdl:operation name="deletePosition" parameterOrder="sessionId positionId"> <wsdl:input message="impl:deletePositionRequest" name="deletePositionRequest"/> <wsdl:output message="impl:deletePositionResponse" name="deletePositionResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> <wsdl:fault message="impl:SessionException" name="SessionException"/> </wsdl:operation> <wsdl:operation name="getPositionsForMapSince" parameterOrder="sessionId mapName timeStamp"> <wsdl:input message="impl:getPositionsForMapSinceRequest" name="getPositionsForMapSinceRequest"/> <wsdl:output message="impl:getPositionsForMapSinceResponse" name="getPositionsForMapSinceResponse"/> <wsdl:fault message="impl:MapException" name="MapException"/> <wsdl:fault message="impl:SessionException" name="SessionException"/> </wsdl:operation> </wsdl:portType> <wsdl:binding name="PositionFacadeSoapBinding" type="impl:PositionFacade"> <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> <wsdl:operation name="movePosition"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="movePositionRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="movePositionResponse"> <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:operation name="createOrUpdatePosition"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="createOrUpdatePositionRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="createOrUpdatePositionResponse"> <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:operation name="createOrUpdateClientPosition"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="createOrUpdateClientPositionRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="createOrUpdateClientPositionResponse"> <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:operation name="createOrUpdateAccessPosition"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="createOrUpdateAccessPositionRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="createOrUpdateAccessPositionResponse"> <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:operation name="deletePosition"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="deletePositionRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="deletePositionResponse"> <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:operation name="getPositionsForMapSince"> <wsdlsoap:operation soapAction=""/> <wsdl:input name="getPositionsForMapSinceRequest"> <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> </wsdl:input> <wsdl:output name="getPositionsForMapSinceResponse"> <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> <wsdl:service name="PositionFacadeService"> <wsdl:port binding="impl:PositionFacadeSoapBinding" name="PositionFacade"> <wsdlsoap:address location="http://localhost:8080/magicmap/services/PositionFacade"/> </wsdl:port> </wsdl:service> </wsdl:definitions> |
|
From: Martin S. <sch...@us...> - 2005-05-11 15:42:59
|
Update of /cvsroot/magicmap/magicmapclient/inf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13686/inf Log Message: Directory /cvsroot/magicmap/magicmapclient/inf added to the repository |
|
From: Tobias H. <thu...@us...> - 2005-05-11 11:51:58
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26697/src/net/sf/magicmap/client/utils Modified Files: Version.java Log Message: Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Version.java 11 May 2005 10:59:29 -0000 1.8 --- Version.java 11 May 2005 11:51:22 -0000 1.9 *************** *** 14,19 **** public static final String PROTOCOL_VERSION = "0.3"; public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 5; ! public static final String VERSION_FLAVOR = " stable"; public static String getVersion(){ --- 14,19 ---- public static final String PROTOCOL_VERSION = "0.3"; public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 6; ! public static final String VERSION_FLAVOR = " unstable"; public static String getVersion(){ |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:59:38
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15269/src/net/sf/magicmap/client/utils Modified Files: Version.java Log Message: Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Version.java 11 May 2005 10:56:34 -0000 1.7 --- Version.java 11 May 2005 10:59:29 -0000 1.8 *************** *** 15,19 **** public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 5; ! public static final String VERSION_FLAVOR = "stable"; public static String getVersion(){ --- 15,19 ---- public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 5; ! public static final String VERSION_FLAVOR = " stable"; public static String getVersion(){ |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:56:42
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14539/src/net/sf/magicmap/client/utils Modified Files: Version.java Log Message: Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Version.java 11 May 2005 10:51:31 -0000 1.6 --- Version.java 11 May 2005 10:56:34 -0000 1.7 *************** *** 15,19 **** public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 5; ! public static final String VERSION_FLAVOR = "alpha"; public static String getVersion(){ --- 15,19 ---- public static final int VERSION_MAJOR = 0; public static final int VERSION_MINOR = 5; ! public static final String VERSION_FLAVOR = "stable"; public static String getVersion(){ |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:54:03
|
Update of /cvsroot/magicmap/magicmapclient/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13470/webstart Modified Files: magicmap.jnlp Log Message: Index: magicmap.jnlp =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/webstart/magicmap.jnlp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** magicmap.jnlp 13 Feb 2005 14:49:19 -0000 1.1 --- magicmap.jnlp 11 May 2005 10:53:54 -0000 1.2 *************** *** 17,20 **** --- 17,24 ---- <j2se href="http://java.sun.com/products/autodl/j2se" version="1.5+" /> <jar href="magicmap_20050213_0_3.jar" main="true"/> + <jar href="jars/magicmap-server.jar"/> + <jar href="jars/derby.jar"/> + <jar href="jars/log4j-1.2.8.jar"/> + <jar href="jars/jpox-20041204.032009.jar"/> <jar href="jars/activation.jar"/> <jar href="jars/axis.jar"/> |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:53:49
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13258 Modified Files: .project .cvsignore build.xml .classpath Log Message: + Client is usable without server Index: .cvsignore =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 14 Feb 2005 12:51:13 -0000 1.1 --- .cvsignore 11 May 2005 10:53:35 -0000 1.2 *************** *** 1,2 **** --- 1,4 ---- build dist + magicmap + derby.log Index: .project =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .project 14 Feb 2005 15:14:53 -0000 1.2 --- .project 11 May 2005 10:53:35 -0000 1.3 *************** *** 1,7 **** <?xml version="1.0" encoding="UTF-8"?> <projectDescription> ! <name>MagicMapClient</name> <comment></comment> <projects> </projects> <buildSpec> --- 1,8 ---- <?xml version="1.0" encoding="UTF-8"?> <projectDescription> ! <name>magicmapclient</name> <comment></comment> <projects> + <project>magicmapserver</project> </projects> <buildSpec> Index: build.xml =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 14 Feb 2005 15:39:52 -0000 1.3 --- build.xml 11 May 2005 10:53:35 -0000 1.4 *************** *** 5,8 **** --- 5,9 ---- + <property name="server" value="../magicmapserver"/> <property name="build" value="build"/> <property name="dist" value="dist"/> *************** *** 17,20 **** --- 18,25 ---- <include name="*.jar"/> </fileset> + <!-- use server classes --> + <fileset dir="${server}/dist"> + <include name="*.jar"/> + </fileset> </path> Index: .classpath =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 14 Feb 2005 12:51:13 -0000 1.2 --- .classpath 11 May 2005 10:53:35 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="res"/> + <classpathentry sourcepath="/magicmapserver/src" kind="lib" path="/magicmapserver/dist/magicmap-server.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/colt.jar"/> *************** *** 22,25 **** --- 23,29 ---- <classpathentry kind="lib" path="lib/axis.jar"/> <classpathentry kind="lib" path="lib/jung-1.5.2.jar"/> + <classpathentry kind="lib" path="lib/derby.jar"/> + <classpathentry kind="lib" path="lib/jpox-20041204.032009.jar"/> + <classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:52:09
|
Update of /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/MapFacade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/localhost/magicmap/services/MapFacade Modified Files: MapFacade.java MapFacadeServiceLocator.java MapFacadeService.java MapFacadeSoapBindingStub.java Log Message: + Client is usable without server Index: MapFacadeService.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/MapFacade/MapFacadeService.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapFacadeService.java 12 Feb 2005 16:00:28 -0000 1.1 --- MapFacadeService.java 11 May 2005 10:51:29 -0000 1.2 *************** *** 9,16 **** public interface MapFacadeService extends javax.xml.rpc.Service { - public java.lang.String getMapFacadeAddress(); ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade() throws javax.xml.rpc.ServiceException; ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; ! } --- 9,18 ---- public interface MapFacadeService extends javax.xml.rpc.Service { ! public java.lang.String getMapFacadeAddress(); ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade() throws javax.xml.rpc.ServiceException; ! ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade(java.net.URL portAddress) ! throws javax.xml.rpc.ServiceException; ! } \ No newline at end of file Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/MapFacade/MapFacade.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapFacade.java 12 Feb 2005 16:00:28 -0000 1.1 --- MapFacade.java 11 May 2005 10:51:29 -0000 1.2 *************** *** 9,14 **** public interface MapFacade extends java.rmi.Remote { ! public net.sf.magicmap.server.dto.MapDTO getMap(java.lang.String name) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException; ! public java.lang.String[] getMapNames() throws java.rmi.RemoteException; ! public net.sf.magicmap.server.dto.MapDTO createNewMap(long sessionId, java.lang.String name, java.lang.String URL, int width, int height) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! } --- 9,20 ---- public interface MapFacade extends java.rmi.Remote { ! ! public net.sf.magicmap.server.dto.MapDTO getMap(java.lang.String name) throws java.rmi.RemoteException, ! net.sf.magicmap.server.exception.MapException; ! ! public java.lang.String[] getMapNames() throws java.rmi.RemoteException; ! ! public net.sf.magicmap.server.dto.MapDTO createNewMap(long sessionId, java.lang.String name, java.lang.String URL, ! int width, int height) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException; ! } \ No newline at end of file Index: MapFacadeSoapBindingStub.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/MapFacade/MapFacadeSoapBindingStub.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapFacadeSoapBindingStub.java 12 Feb 2005 16:00:28 -0000 1.1 --- MapFacadeSoapBindingStub.java 11 May 2005 10:51:29 -0000 1.2 *************** *** 8,275 **** package localhost.magicmap.services.MapFacade; ! public class MapFacadeSoapBindingStub extends org.apache.axis.client.Stub implements localhost.magicmap.services.MapFacade.MapFacade { ! private java.util.Vector cachedSerClasses = new java.util.Vector(); ! private java.util.Vector cachedSerQNames = new java.util.Vector(); ! private java.util.Vector cachedSerFactories = new java.util.Vector(); ! private java.util.Vector cachedDeserFactories = new java.util.Vector(); ! static org.apache.axis.description.OperationDesc [] _operations; ! static { ! _operations = new org.apache.axis.description.OperationDesc[3]; ! _initOperationDesc1(); ! } ! private static void _initOperationDesc1(){ ! org.apache.axis.description.OperationDesc oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("getMap"); ! oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "MapDTO")); ! oper.setReturnClass(net.sf.magicmap.server.dto.MapDTO.class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "getMapReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! _operations[0] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("getMapNames"); ! oper.setReturnType(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "ArrayOf_soapenc_string")); ! oper.setReturnClass(java.lang.String[].class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "getMapNamesReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! _operations[1] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createNewMap"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "URL"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "width"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "height"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "MapDTO")); ! oper.setReturnClass(net.sf.magicmap.server.dto.MapDTO.class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "createNewMapReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"), ! true ! )); ! _operations[2] = oper; ! } ! public MapFacadeSoapBindingStub() throws org.apache.axis.AxisFault { ! this(null); ! } ! public MapFacadeSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { ! this(service); ! super.cachedEndpoint = endpointURL; ! } ! public MapFacadeSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { ! if (service == null) { ! super.service = new org.apache.axis.client.Service(); ! } else { ! super.service = service; ! } ! java.lang.Class cls; ! javax.xml.namespace.QName qName; ! java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; ! java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; ! java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; ! java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; ! java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; ! java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; ! java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; ! java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; ! java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class; ! java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class; ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.MapException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "MapDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.MapDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "ArrayOf_soapenc_string"); ! cachedSerQNames.add(qName); ! cls = java.lang.String[].class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(arraysf); ! cachedDeserFactories.add(arraydf); ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.SessionException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! } ! protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { ! try { ! org.apache.axis.client.Call _call = ! (org.apache.axis.client.Call) super.service.createCall(); ! if (super.maintainSessionSet) { ! _call.setMaintainSession(super.maintainSession); ! } ! if (super.cachedUsername != null) { ! _call.setUsername(super.cachedUsername); ! } ! if (super.cachedPassword != null) { ! _call.setPassword(super.cachedPassword); ! } ! if (super.cachedEndpoint != null) { ! _call.setTargetEndpointAddress(super.cachedEndpoint); ! } ! if (super.cachedTimeout != null) { ! _call.setTimeout(super.cachedTimeout); ! } ! if (super.cachedPortName != null) { ! _call.setPortName(super.cachedPortName); ! } ! java.util.Enumeration keys = super.cachedProperties.keys(); ! while (keys.hasMoreElements()) { ! java.lang.String key = (java.lang.String) keys.nextElement(); ! _call.setProperty(key, super.cachedProperties.get(key)); ! } ! // All the type mapping information is registered ! // when the first call is made. ! // The type mapping information is actually registered in ! // the TypeMappingRegistry of the service, which ! // is the reason why registration is only needed for the first call. ! synchronized (this) { ! if (firstCall()) { ! // must set encoding style before registering serializers ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC); ! for (int i = 0; i < cachedSerFactories.size(); ++i) { ! java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i); ! javax.xml.namespace.QName qName = ! (javax.xml.namespace.QName) cachedSerQNames.get(i); ! java.lang.Class sf = (java.lang.Class) ! cachedSerFactories.get(i); ! java.lang.Class df = (java.lang.Class) ! cachedDeserFactories.get(i); ! _call.registerTypeMapping(cls, qName, sf, df, false); ! } ! } ! } ! return _call; ! } ! catch (java.lang.Throwable _t) { ! throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); } } ! public net.sf.magicmap.server.dto.MapDTO getMap(java.lang.String name) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[0]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "getMap")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {name}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! else { ! extractAttachments(_call); ! try { ! return (net.sf.magicmap.server.dto.MapDTO) _resp; ! } catch (java.lang.Exception _exception) { ! return (net.sf.magicmap.server.dto.MapDTO) org.apache.axis.utils.JavaUtils.convert(_resp, net.sf.magicmap.server.dto.MapDTO.class); ! } ! } } ! public java.lang.String[] getMapNames() throws java.rmi.RemoteException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[1]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "getMapNames")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! else { ! extractAttachments(_call); ! try { ! return (java.lang.String[]) _resp; ! } catch (java.lang.Exception _exception) { ! return (java.lang.String[]) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.String[].class); ! } ! } } ! public net.sf.magicmap.server.dto.MapDTO createNewMap(long sessionId, java.lang.String name, java.lang.String URL, int width, int height) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[2]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "createNewMap")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(sessionId), name, URL, new java.lang.Integer(width), new java.lang.Integer(height)}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! else { ! extractAttachments(_call); ! try { ! return (net.sf.magicmap.server.dto.MapDTO) _resp; ! } catch (java.lang.Exception _exception) { ! return (net.sf.magicmap.server.dto.MapDTO) org.apache.axis.utils.JavaUtils.convert(_resp, net.sf.magicmap.server.dto.MapDTO.class); ! } ! } } ! } --- 8,282 ---- package localhost.magicmap.services.MapFacade; ! public class MapFacadeSoapBindingStub extends org.apache.axis.client.Stub ! implements ! localhost.magicmap.services.MapFacade.MapFacade { ! private java.util.Vector cachedSerClasses = new java.util.Vector(); ! private java.util.Vector cachedSerQNames = new java.util.Vector(); ! private java.util.Vector cachedSerFactories = new java.util.Vector(); ! private java.util.Vector cachedDeserFactories = new java.util.Vector(); ! static org.apache.axis.description.OperationDesc [] _operations; ! static{ ! _operations = new org.apache.axis.description.OperationDesc[3]; ! _initOperationDesc1(); ! } ! private static void _initOperationDesc1(){ ! org.apache.axis.description.OperationDesc oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("getMap"); ! oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "MapDTO")); ! oper.setReturnClass(net.sf.magicmap.server.dto.MapDTO.class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "getMapReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/MapFacade", "fault"), "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), true)); ! _operations[0] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("getMapNames"); ! oper.setReturnType(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", ! "ArrayOf_soapenc_string")); ! oper.setReturnClass(java.lang.String[].class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "getMapNamesReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! _operations[1] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createNewMap"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "URL"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "width"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "height"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.setReturnType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "MapDTO")); ! oper.setReturnClass(net.sf.magicmap.server.dto.MapDTO.class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "createNewMapReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/MapFacade", "fault"), "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), true)); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/MapFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "SessionException"), true)); ! _operations[2] = oper; ! } ! public MapFacadeSoapBindingStub() throws org.apache.axis.AxisFault { ! this(null); ! } ! public MapFacadeSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) ! throws org.apache.axis.AxisFault { ! this(service); ! super.cachedEndpoint = endpointURL; ! } ! public MapFacadeSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { ! if (service == null){ ! super.service = new org.apache.axis.client.Service(); ! } else{ ! super.service = service; ! } ! java.lang.Class cls; ! javax.xml.namespace.QName qName; ! java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; ! java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; ! java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; ! java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; ! java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; ! java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; ! java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; ! java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; ! java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class; ! java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class; ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.MapException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "MapDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.MapDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "ArrayOf_soapenc_string"); ! cachedSerQNames.add(qName); ! cls = java.lang.String[].class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(arraysf); ! cachedDeserFactories.add(arraydf); ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.SessionException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! } ! ! protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException{ ! try{ ! org.apache.axis.client.Call _call = (org.apache.axis.client.Call) super.service.createCall(); ! if (super.maintainSessionSet){ ! _call.setMaintainSession(super.maintainSession); ! } ! if (super.cachedUsername != null){ ! _call.setUsername(super.cachedUsername); ! } ! if (super.cachedPassword != null){ ! _call.setPassword(super.cachedPassword); ! } ! if (super.cachedEndpoint != null){ ! _call.setTargetEndpointAddress(super.cachedEndpoint); ! } ! if (super.cachedTimeout != null){ ! _call.setTimeout(super.cachedTimeout); ! } ! if (super.cachedPortName != null){ ! _call.setPortName(super.cachedPortName); ! } ! java.util.Enumeration keys = super.cachedProperties.keys(); ! while (keys.hasMoreElements()){ ! java.lang.String key = (java.lang.String) keys.nextElement(); ! _call.setProperty(key, super.cachedProperties.get(key)); ! } ! // All the type mapping information is registered ! // when the first call is made. ! // The type mapping information is actually registered in ! // the TypeMappingRegistry of the service, which ! // is the reason why registration is only needed for the first call. ! synchronized (this){ ! if (firstCall()){ ! // must set encoding style before registering serializers ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC); ! for (int i = 0; i < cachedSerFactories.size(); ++i){ ! java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i); ! javax.xml.namespace.QName qName = (javax.xml.namespace.QName) cachedSerQNames.get(i); ! java.lang.Class sf = (java.lang.Class) cachedSerFactories.get(i); ! java.lang.Class df = (java.lang.Class) cachedDeserFactories.get(i); ! _call.registerTypeMapping(cls, qName, sf, df, false); ! } } + } + return _call; + } catch (java.lang.Throwable _t){ + throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); } + } ! public net.sf.magicmap.server.dto.MapDTO getMap(java.lang.String name) throws java.rmi.RemoteException, ! net.sf.magicmap.server.exception.MapException{ ! if (super.cachedEndpoint == null){ ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[0]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "getMap")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[]{name}); ! if (_resp instanceof java.rmi.RemoteException){ ! throw (java.rmi.RemoteException) _resp; ! } else{ ! extractAttachments(_call); ! try{ ! return (net.sf.magicmap.server.dto.MapDTO) _resp; ! } catch (java.lang.Exception _exception){ ! return (net.sf.magicmap.server.dto.MapDTO) org.apache.axis.utils.JavaUtils.convert(_resp, ! net.sf.magicmap.server.dto.MapDTO.class); ! } } + } ! public java.lang.String[] getMapNames() throws java.rmi.RemoteException{ ! if (super.cachedEndpoint == null){ ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[1]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "getMapNames")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[]{}); ! if (_resp instanceof java.rmi.RemoteException){ ! throw (java.rmi.RemoteException) _resp; ! } else{ ! extractAttachments(_call); ! try{ ! return (java.lang.String[]) _resp; ! } catch (java.lang.Exception _exception){ ! return (java.lang.String[]) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.String[].class); ! } } + } ! public net.sf.magicmap.server.dto.MapDTO createNewMap(long sessionId, java.lang.String name, java.lang.String URL, ! int width, int height) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException{ ! if (super.cachedEndpoint == null){ ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[2]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "createNewMap")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[]{new java.lang.Long(sessionId), name, URL, ! new java.lang.Integer(width), new java.lang.Integer(height)}); ! if (_resp instanceof java.rmi.RemoteException){ ! throw (java.rmi.RemoteException) _resp; ! } else{ ! extractAttachments(_call); ! try{ ! return (net.sf.magicmap.server.dto.MapDTO) _resp; ! } catch (java.lang.Exception _exception){ ! return (net.sf.magicmap.server.dto.MapDTO) org.apache.axis.utils.JavaUtils.convert(_resp, ! net.sf.magicmap.server.dto.MapDTO.class); ! } } + } ! } \ No newline at end of file Index: MapFacadeServiceLocator.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/MapFacade/MapFacadeServiceLocator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapFacadeServiceLocator.java 12 Feb 2005 16:00:28 -0000 1.1 --- MapFacadeServiceLocator.java 11 May 2005 10:51:29 -0000 1.2 *************** *** 8,136 **** package localhost.magicmap.services.MapFacade; ! public class MapFacadeServiceLocator extends org.apache.axis.client.Service implements localhost.magicmap.services.MapFacade.MapFacadeService { ! public MapFacadeServiceLocator() { ! } ! public MapFacadeServiceLocator(org.apache.axis.EngineConfiguration config) { ! super(config); ! } ! // Use to get a proxy class for MapFacade ! private java.lang.String MapFacade_address = "http://localhost:8080/magicmap/services/MapFacade"; ! public java.lang.String getMapFacadeAddress() { ! return MapFacade_address; ! } ! // The WSDD service name defaults to the port name. ! private java.lang.String MapFacadeWSDDServiceName = "MapFacade"; ! public java.lang.String getMapFacadeWSDDServiceName() { ! return MapFacadeWSDDServiceName; ! } ! public void setMapFacadeWSDDServiceName(java.lang.String name) { ! MapFacadeWSDDServiceName = name; } ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade() throws javax.xml.rpc.ServiceException { ! java.net.URL endpoint; ! try { ! endpoint = new java.net.URL(MapFacade_address); ! } ! catch (java.net.MalformedURLException e) { ! throw new javax.xml.rpc.ServiceException(e); ! } ! return getMapFacade(endpoint); } ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { ! try { ! localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub _stub = new localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub(portAddress, this); ! _stub.setPortName(getMapFacadeWSDDServiceName()); ! return _stub; ! } ! catch (org.apache.axis.AxisFault e) { ! return null; ! } ! } ! public void setMapFacadeEndpointAddress(java.lang.String address) { ! MapFacade_address = address; } ! /** ! * For the given interface, get the stub implementation. ! * If this service has no port for the given interface, ! * then ServiceException is thrown. ! */ ! public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { ! try { ! if (localhost.magicmap.services.MapFacade.MapFacade.class.isAssignableFrom(serviceEndpointInterface)) { ! localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub _stub = new localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub(new java.net.URL(MapFacade_address), this); ! _stub.setPortName(getMapFacadeWSDDServiceName()); ! return _stub; ! } ! } ! catch (java.lang.Throwable t) { ! throw new javax.xml.rpc.ServiceException(t); ! } ! throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); } ! ! /** ! * For the given interface, get the stub implementation. ! * If this service has no port for the given interface, ! * then ServiceException is thrown. ! */ ! public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { ! if (portName == null) { ! return getPort(serviceEndpointInterface); ! } ! java.lang.String inputPortName = portName.getLocalPart(); ! if ("MapFacade".equals(inputPortName)) { ! return getMapFacade(); ! } ! else { ! java.rmi.Remote _stub = getPort(serviceEndpointInterface); ! ((org.apache.axis.client.Stub) _stub).setPortName(portName); ! return _stub; ! } } ! public javax.xml.namespace.QName getServiceName() { ! return new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "MapFacadeService"); ! } ! private java.util.HashSet ports = null; ! public java.util.Iterator getPorts() { ! if (ports == null) { ! ports = new java.util.HashSet(); ! ports.add(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "MapFacade")); ! } ! return ports.iterator(); } ! /** ! * Set the endpoint address for the specified port name. ! */ ! public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException { ! if ("MapFacade".equals(portName)) { ! setMapFacadeEndpointAddress(address); ! } ! else { // Unknown Port Name ! throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); ! } } ! /** ! * Set the endpoint address for the specified port name. ! */ ! public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException { ! setEndpointAddress(portName.getLocalPart(), address); ! } ! } --- 8,138 ---- package localhost.magicmap.services.MapFacade; ! public class MapFacadeServiceLocator extends org.apache.axis.client.Service ! implements ! localhost.magicmap.services.MapFacade.MapFacadeService { ! public MapFacadeServiceLocator() {} + public MapFacadeServiceLocator(org.apache.axis.EngineConfiguration config) { + super(config); + } ! // Use to get a proxy class for MapFacade ! private java.lang.String MapFacade_address = "http://localhost:8080/magicmap/services/MapFacade"; ! public java.lang.String getMapFacadeAddress(){ ! return MapFacade_address; ! } ! // The WSDD service name defaults to the port name. ! private java.lang.String MapFacadeWSDDServiceName = "MapFacade"; ! public java.lang.String getMapFacadeWSDDServiceName(){ ! return MapFacadeWSDDServiceName; ! } ! public void setMapFacadeWSDDServiceName(java.lang.String name){ ! MapFacadeWSDDServiceName = name; ! } ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade() throws javax.xml.rpc.ServiceException{ ! java.net.URL endpoint; ! try{ ! endpoint = new java.net.URL(MapFacade_address); ! } catch (java.net.MalformedURLException e){ ! throw new javax.xml.rpc.ServiceException(e); } + return getMapFacade(endpoint); + } ! public localhost.magicmap.services.MapFacade.MapFacade getMapFacade(java.net.URL portAddress) ! throws javax.xml.rpc.ServiceException{ ! try{ ! localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub _stub = new localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub( ! portAddress, this); ! _stub.setPortName(getMapFacadeWSDDServiceName()); ! return _stub; ! } catch (org.apache.axis.AxisFault e){ ! return null; } + } ! public void setMapFacadeEndpointAddress(java.lang.String address){ ! MapFacade_address = address; ! } ! /** ! * For the given interface, get the stub implementation. ! * If this service has no port for the given interface, ! * then ServiceException is thrown. ! */ ! public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException{ ! try{ ! if (localhost.magicmap.services.MapFacade.MapFacade.class.isAssignableFrom(serviceEndpointInterface)){ ! localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub _stub = new localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub( ! new java.net.URL(MapFacade_address), this); ! _stub.setPortName(getMapFacadeWSDDServiceName()); ! return _stub; ! } ! } catch (java.lang.Throwable t){ ! throw new javax.xml.rpc.ServiceException(t); } + throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); + } ! /** ! * For the given interface, get the stub implementation. ! * If this service has no port for the given interface, ! * then ServiceException is thrown. ! */ ! public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) ! throws javax.xml.rpc.ServiceException{ ! if (portName == null){ ! return getPort(serviceEndpointInterface); } ! java.lang.String inputPortName = portName.getLocalPart(); ! if ("MapFacade".equals(inputPortName)){ ! return getMapFacade(); ! } else{ ! java.rmi.Remote _stub = getPort(serviceEndpointInterface); ! ((org.apache.axis.client.Stub) _stub).setPortName(portName); ! return _stub; } + } ! public javax.xml.namespace.QName getServiceName(){ ! return new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "MapFacadeService"); ! } ! private java.util.HashSet ports = null; ! public java.util.Iterator getPorts(){ ! if (ports == null){ ! ports = new java.util.HashSet(); ! ports.add(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/MapFacade", "MapFacade")); } + return ports.iterator(); + } ! /** ! * Set the endpoint address for the specified port name. ! */ ! public void setEndpointAddress(java.lang.String portName, java.lang.String address) ! throws javax.xml.rpc.ServiceException{ ! if ("MapFacade".equals(portName)){ ! setMapFacadeEndpointAddress(address); ! } else{ // Unknown Port Name ! throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); } + } ! /** ! * Set the endpoint address for the specified port name. ! */ ! public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) ! throws javax.xml.rpc.ServiceException{ ! setEndpointAddress(portName.getLocalPart(), address); ! } ! } \ No newline at end of file |
Update of /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/PositionFacade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/localhost/magicmap/services/PositionFacade Modified Files: PositionFacadeService.java PositionFacadeSoapBindingStub.java PositionFacade.java PositionFacadeServiceLocator.java Log Message: + Client is usable without server Index: PositionFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/PositionFacade/PositionFacade.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PositionFacade.java 12 Feb 2005 16:00:28 -0000 1.1 --- PositionFacade.java 11 May 2005 10:51:29 -0000 1.2 *************** *** 9,17 **** public interface PositionFacade extends java.rmi.Remote { ! public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! public void createOrUpdatePosition(long sessionId, java.lang.String mapName, int positionX, int positionY, net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String positionName, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! public void createOrUpdateClientPosition(long sessionId, java.lang.String mapName, int positionX, int positionY, net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String clientMac, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! public void createOrUpdateAccessPosition(long sessionId, java.lang.String mapName, int positionX, int positionY, java.lang.String accessPointMac, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! public void deletePosition(long sessionId, long positionId) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! public net.sf.magicmap.server.dto.PositionDTO[] getPositionsForMapSince(long sessionId, java.lang.String mapName, long timeStamp) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! } --- 9,36 ---- public interface PositionFacade extends java.rmi.Remote { ! ! public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY, boolean fixed) ! throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException; ! ! public void createOrUpdatePosition(long sessionId, java.lang.String mapName, int positionX, int positionY, ! net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String positionName, boolean fixed) ! throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException; ! ! public void createOrUpdateClientPosition(long sessionId, java.lang.String mapName, int positionX, int positionY, ! net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String clientMac, boolean fixed) ! throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException; ! ! public void createOrUpdateAccessPosition(long sessionId, java.lang.String mapName, int positionX, int positionY, ! java.lang.String accessPointMac, boolean fixed) throws java.rmi.RemoteException, ! net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! ! public void deletePosition(long sessionId, long positionId) throws java.rmi.RemoteException, ! net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException; ! ! public net.sf.magicmap.server.dto.PositionDTO[] getPositionsForMapSince(long sessionId, java.lang.String mapName, ! long timeStamp) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException; ! } \ No newline at end of file Index: PositionFacadeSoapBindingStub.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/PositionFacade/PositionFacadeSoapBindingStub.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PositionFacadeSoapBindingStub.java 16 Feb 2005 09:02:19 -0000 1.3 --- PositionFacadeSoapBindingStub.java 11 May 2005 10:51:29 -0000 1.4 *************** *** 8,454 **** package localhost.magicmap.services.PositionFacade; ! public class PositionFacadeSoapBindingStub extends org.apache.axis.client.Stub implements localhost.magicmap.services.PositionFacade.PositionFacade { ! private java.util.Vector cachedSerClasses = new java.util.Vector(); ! private java.util.Vector cachedSerQNames = new java.util.Vector(); ! private java.util.Vector cachedSerFactories = new java.util.Vector(); ! private java.util.Vector cachedDeserFactories = new java.util.Vector(); ! static org.apache.axis.description.OperationDesc [] _operations; ! static { ! _operations = new org.apache.axis.description.OperationDesc[6]; ! _initOperationDesc1(); ! } ! private static void _initOperationDesc1(){ ! org.apache.axis.description.OperationDesc oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("movePosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "newPositionX"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "newPositionY"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"), ! true ! )); ! _operations[0] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createOrUpdatePosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionX"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionY"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "character"), new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"), net.sf.magicmap.server.dto.SignalCharacterDTO.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionName"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"), ! true ! )); ! _operations[1] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createOrUpdateClientPosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionX"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionY"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "character"), new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"), net.sf.magicmap.server.dto.SignalCharacterDTO.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "clientMac"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"), ! true ! )); ! _operations[2] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createOrUpdateAccessPosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionX"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionY"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "accessPointMac"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"), ! true ! )); ! _operations[3] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("deletePosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"), ! true ! )); ! _operations[4] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("getPositionsForMapSince"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "timeStamp"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.setReturnType(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "ArrayOf_tns2_PositionDTO")); ! oper.setReturnClass(net.sf.magicmap.server.dto.PositionDTO[].class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "getPositionsForMapSinceReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"), ! true ! )); ! oper.addFault(new org.apache.axis.description.FaultDesc( ! new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", ! new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"), ! true ! )); ! _operations[5] = oper; ! } ! public PositionFacadeSoapBindingStub() throws org.apache.axis.AxisFault { ! this(null); ! } ! public PositionFacadeSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { ! this(service); ! super.cachedEndpoint = endpointURL; ! } ! public PositionFacadeSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { ! if (service == null) { ! super.service = new org.apache.axis.client.Service(); ! } else { ! super.service = service; ! } ! java.lang.Class cls; ! javax.xml.namespace.QName qName; ! java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; ! java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; ! java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; ! java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; ! java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; ! java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; ! java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; ! java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; ! java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class; ! java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class; ! qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "ArrayOf_tns2_PositionDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.PositionDTO[].class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(arraysf); ! cachedDeserFactories.add(arraydf); ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.MapException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.SessionException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.ClientDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "ArrayOf_tns2_SimpleScanResultDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.SimpleScanResultDTO[].class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(arraysf); ! cachedDeserFactories.add(arraydf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.PositionDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SimpleScanResultDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.SimpleScanResultDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.SignalCharacterDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.AccessPointDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! } ! protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { ! try { ! org.apache.axis.client.Call _call = ! (org.apache.axis.client.Call) super.service.createCall(); ! if (super.maintainSessionSet) { ! _call.setMaintainSession(super.maintainSession); ! } ! if (super.cachedUsername != null) { ! _call.setUsername(super.cachedUsername); ! } ! if (super.cachedPassword != null) { ! _call.setPassword(super.cachedPassword); ! } ! if (super.cachedEndpoint != null) { ! _call.setTargetEndpointAddress(super.cachedEndpoint); ! } ! if (super.cachedTimeout != null) { ! _call.setTimeout(super.cachedTimeout); ! } ! if (super.cachedPortName != null) { ! _call.setPortName(super.cachedPortName); ! } ! java.util.Enumeration keys = super.cachedProperties.keys(); ! while (keys.hasMoreElements()) { ! java.lang.String key = (java.lang.String) keys.nextElement(); ! _call.setProperty(key, super.cachedProperties.get(key)); ! } ! // All the type mapping information is registered ! // when the first call is made. ! // The type mapping information is actually registered in ! // the TypeMappingRegistry of the service, which ! // is the reason why registration is only needed for the first call. ! synchronized (this) { ! if (firstCall()) { ! // must set encoding style before registering serializers ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC); ! for (int i = 0; i < cachedSerFactories.size(); ++i) { ! java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i); ! javax.xml.namespace.QName qName = ! (javax.xml.namespace.QName) cachedSerQNames.get(i); ! java.lang.Class sf = (java.lang.Class) ! cachedSerFactories.get(i); ! java.lang.Class df = (java.lang.Class) ! cachedDeserFactories.get(i); ! _call.registerTypeMapping(cls, qName, sf, df, false); ! } ! } ! } ! return _call; ! } ! catch (java.lang.Throwable _t) { ! throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); } } ! public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[0]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "movePosition")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(sessionId), new java.lang.Long(positionId), new java.lang.Integer(newPositionX), new java.lang.Integer(newPositionY), new java.lang.Boolean(fixed)}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! extractAttachments(_call); } ! public void createOrUpdatePosition(long sessionId, java.lang.String mapName, int positionX, int positionY, net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String positionName, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[1]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "createOrUpdatePosition")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(sessionId), mapName, new java.lang.Integer(positionX), new java.lang.Integer(positionY), character, positionName, new java.lang.Boolean(fixed)}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! extractAttachments(_call); } ! public void createOrUpdateClientPosition(long sessionId, java.lang.String mapName, int positionX, int positionY, net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String clientMac, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[2]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "createOrUpdateClientPosition")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(sessionId), mapName, new java.lang.Integer(positionX), new java.lang.Integer(positionY), character, clientMac, new java.lang.Boolean(fixed)}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! extractAttachments(_call); } ! public void createOrUpdateAccessPosition(long sessionId, java.lang.String mapName, int positionX, int positionY, java.lang.String accessPointMac, boolean fixed) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[3]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "createOrUpdateAccessPosition")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(sessionId), mapName, new java.lang.Integer(positionX), new java.lang.Integer(positionY), accessPointMac, new java.lang.Boolean(fixed)}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! extractAttachments(_call); } ! public void deletePosition(long sessionId, long positionId) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[4]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "deletePosition")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(sessionId), new java.lang.Long(positionId)}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! extractAttachments(_call); } ! public net.sf.magicmap.server.dto.PositionDTO[] getPositionsForMapSince(long sessionId, java.lang.String mapName, long timeStamp) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, net.sf.magicmap.server.exception.SessionException { ! if (super.cachedEndpoint == null) { ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[5]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "getPositionsForMapSince")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Long(sessionId), mapName, new java.lang.Long(timeStamp)}); ! if (_resp instanceof java.rmi.RemoteException) { ! throw (java.rmi.RemoteException)_resp; ! } ! else { ! extractAttachments(_call); ! try { ! return (net.sf.magicmap.server.dto.PositionDTO[]) _resp; ! } catch (java.lang.Exception _exception) { ! return (net.sf.magicmap.server.dto.PositionDTO[]) org.apache.axis.utils.JavaUtils.convert(_resp, net.sf.magicmap.server.dto.PositionDTO[].class); ! } ! } } ! } --- 8,519 ---- package localhost.magicmap.services.PositionFacade; ! public class PositionFacadeSoapBindingStub extends org.apache.axis.client.Stub ! implements ! localhost.magicmap.services.PositionFacade.PositionFacade { ! private java.util.Vector cachedSerClasses = new java.util.Vector(); ! private java.util.Vector cachedSerQNames = new java.util.Vector(); ! private java.util.Vector cachedSerFactories = new java.util.Vector(); ! private java.util.Vector cachedDeserFactories = new java.util.Vector(); ! static org.apache.axis.description.OperationDesc [] _operations; ! static{ ! _operations = new org.apache.axis.description.OperationDesc[6]; ! _initOperationDesc1(); ! } ! private static void _initOperationDesc1(){ ! org.apache.axis.description.OperationDesc oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("movePosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "newPositionX"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "newPositionY"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, ! false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "MapException"), true)); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "SessionException"), true)); ! _operations[0] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createOrUpdatePosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionX"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionY"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "character"), new javax.xml.namespace.QName( ! "urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"), net.sf.magicmap.server.dto.SignalCharacterDTO.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionName"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, ! false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "MapException"), true)); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "SessionException"), true)); ! _operations[1] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createOrUpdateClientPosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionX"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionY"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "character"), new javax.xml.namespace.QName( ! "urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"), net.sf.magicmap.server.dto.SignalCharacterDTO.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "clientMac"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, ! false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "MapException"), true)); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "SessionException"), true)); ! _operations[2] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("createOrUpdateAccessPosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionX"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionY"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "int"), int.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "accessPointMac"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "fixed"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class, org.apache.axis.description.ParameterDesc.IN, ! false, false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "MapException"), true)); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "SessionException"), true)); ! _operations[3] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("deletePosition"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "positionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "MapException"), true)); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "SessionException"), true)); ! _operations[4] = oper; ! oper = new org.apache.axis.description.OperationDesc(); ! oper.setName("getPositionsForMapSince"); ! oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.addParameter(new javax.xml.namespace.QName("", "mapName"), new javax.xml.namespace.QName( ! "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, ! org.apache.axis.description.ParameterDesc.IN, false, false); ! oper.addParameter(new javax.xml.namespace.QName("", "timeStamp"), new javax.xml.namespace.QName( ! "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, ! false); ! oper.setReturnType(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", ! "ArrayOf_tns2_PositionDTO")); ! oper.setReturnClass(net.sf.magicmap.server.dto.PositionDTO[].class); ! oper.setReturnQName(new javax.xml.namespace.QName("", "getPositionsForMapSinceReturn")); ! oper.setStyle(org.apache.axis.constants.Style.RPC); ! oper.setUse(org.apache.axis.constants.Use.ENCODED); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.MapException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "MapException"), true)); ! oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName( ! "http://localhost:8080/magicmap/services/PositionFacade", "fault"), ! "net.sf.magicmap.server.exception.SessionException", new javax.xml.namespace.QName( ! "http://exception.server.magicmap.sf.net", "SessionException"), true)); ! _operations[5] = oper; ! } ! public PositionFacadeSoapBindingStub() throws org.apache.axis.AxisFault { ! this(null); ! } ! public PositionFacadeSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) ! throws org.apache.axis.AxisFault { ! this(service); ! super.cachedEndpoint = endpointURL; ! } ! public PositionFacadeSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { ! if (service == null){ ! super.service = new org.apache.axis.client.Service(); ! } else{ ! super.service = service; ! } ! java.lang.Class cls; ! javax.xml.namespace.QName qName; ! java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; ! java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; ! java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; ! java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; ! java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; ! java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; ! java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; ! java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; ! java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class; ! java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class; ! qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", ! "ArrayOf_tns2_PositionDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.PositionDTO[].class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(arraysf); ! cachedDeserFactories.add(arraydf); ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.MapException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.exception.SessionException.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.ClientDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", ! "ArrayOf_tns2_SimpleScanResultDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.SimpleScanResultDTO[].class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(arraysf); ! cachedDeserFactories.add(arraydf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.PositionDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SimpleScanResultDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.SimpleScanResultDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.SignalCharacterDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO"); ! cachedSerQNames.add(qName); ! cls = net.sf.magicmap.server.dto.AccessPointDTO.class; ! cachedSerClasses.add(cls); ! cachedSerFactories.add(beansf); ! cachedDeserFactories.add(beandf); ! } ! ! protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException{ ! try{ ! org.apache.axis.client.Call _call = (org.apache.axis.client.Call) super.service.createCall(); ! if (super.maintainSessionSet){ ! _call.setMaintainSession(super.maintainSession); ! } ! if (super.cachedUsername != null){ ! _call.setUsername(super.cachedUsername); ! } ! if (super.cachedPassword != null){ ! _call.setPassword(super.cachedPassword); ! } ! if (super.cachedEndpoint != null){ ! _call.setTargetEndpointAddress(super.cachedEndpoint); ! } ! if (super.cachedTimeout != null){ ! _call.setTimeout(super.cachedTimeout); ! } ! if (super.cachedPortName != null){ ! _call.setPortName(super.cachedPortName); ! } ! java.util.Enumeration keys = super.cachedProperties.keys(); ! while (keys.hasMoreElements()){ ! java.lang.String key = (java.lang.String) keys.nextElement(); ! _call.setProperty(key, super.cachedProperties.get(key)); ! } ! // All the type mapping information is registered ! // when the first call is made. ! // The type mapping information is actually registered in ! // the TypeMappingRegistry of the service, which ! // is the reason why registration is only needed for the first call. ! synchronized (this){ ! if (firstCall()){ ! // must set encoding style before registering serializers ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC); ! for (int i = 0; i < cachedSerFactories.size(); ++i){ ! java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i); ! javax.xml.namespace.QName qName = (javax.xml.namespace.QName) cachedSerQNames.get(i); ! java.lang.Class sf = (java.lang.Class) cachedSerFactories.get(i); ! java.lang.Class df = (java.lang.Class) cachedDeserFactories.get(i); ! _call.registerTypeMapping(cls, qName, sf, df, false); ! } } + } + return _call; + } catch (java.lang.Throwable _t){ + throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); } + } ! public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY, boolean fixed) ! throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException{ ! if (super.cachedEndpoint == null){ ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[0]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "movePosition")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[]{new java.lang.Long(sessionId), ! new java.lang.Long(positionId), new java.lang.Integer(newPositionX), new java.lang.Integer(newPositionY), ! new java.lang.Boolean(fixed)}); ! if (_resp instanceof java.rmi.RemoteException){ ! throw (java.rmi.RemoteException) _resp; } + extractAttachments(_call); + } ! public void createOrUpdatePosition(long sessionId, java.lang.String mapName, int positionX, int positionY, ! net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String positionName, boolean fixed) ! throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.magicmap.server.exception.SessionException{ ! if (super.cachedEndpoint == null){ ! throw new org.apache.axis.NoEndPointException(); ! } ! org.apache.axis.client.Call _call = createCall(); ! _call.setOperation(_operations[1]); ! _call.setUseSOAPAction(true); ! _call.setSOAPActionURI(""); ! _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); ! _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", ! "createOrUpdatePosition")); ! setRequestHeaders(_call); ! setAttachments(_call); ! java.lang.Object _resp = _call.invoke(new java.lang.Object[]{new java.lang.Long(sessionId), mapName, ! new java.lang.Integer(positionX), new java.lang.Integer(positionY), character, positionName, ! new java.lang.Boolean(fixed)}); ! if (_resp instanceof java.rmi.RemoteException){ ! throw (java.rmi.RemoteException) _resp; } + extractAttachments(_call); + } ! public void createOrUpdateClientPosition(long sessionId, java.lang.String mapName, int positionX, int positionY, ! net.sf.magicmap.server.dto.SignalCharacterDTO character, java.lang.String clientMac, boolean fixed) ! throws java.rmi.RemoteException, net.sf.magicmap.server.exception.MapException, ! net.sf.ma... [truncated message content] |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:52:08
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/views Modified Files: MapView.java Log Message: + Client is usable without server Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MapView.java 18 Feb 2005 09:23:46 -0000 1.4 --- MapView.java 11 May 2005 10:51:29 -0000 1.5 *************** *** 98,108 **** int lcc = 0; ! boolean showEdges = true; ! private boolean showAccessPoints = true ; ! private boolean showLocations = true; ! private boolean showClients = true; /** --- 98,108 ---- int lcc = 0; ! boolean showEdges = true; ! private boolean showAccessPoints = true; ! private boolean showLocations = true; ! private boolean showClients = true; /** *************** *** 145,149 **** switch (node.getType()) { case NodeModel.NODETYPE_CLIENT : ! if (!showClients) { return null; } --- 145,149 ---- switch (node.getType()) { case NodeModel.NODETYPE_CLIENT : ! if (!showClients){ return null; } *************** *** 153,157 **** return clientIcon; case NodeModel.NODETYPE_ACCESSPOINT : ! if (!showAccessPoints) { return null; } --- 153,157 ---- return clientIcon; case NodeModel.NODETYPE_ACCESSPOINT : ! if (!showAccessPoints){ return null; } *************** *** 161,165 **** return accessPointIcon; case NodeModel.NODETYPE_LOCATION : ! if (!showLocations) { return null; } --- 161,165 ---- return accessPointIcon; case NodeModel.NODETYPE_LOCATION : ! if (!showLocations){ return null; } *************** *** 172,191 **** } } ! public Color getFgColorForNode(Node node){ if (node == null) return null; switch (node.getType()) { case NodeModel.NODETYPE_CLIENT : ! if (!showClients) { return null; } return Color.BLACK; case NodeModel.NODETYPE_ACCESSPOINT : ! if (!showAccessPoints) { return null; } return Color.BLACK; case NodeModel.NODETYPE_LOCATION : ! if (!showLocations) { return null; } --- 172,191 ---- } } ! public Color getFgColorForNode(Node node){ if (node == null) return null; switch (node.getType()) { case NodeModel.NODETYPE_CLIENT : ! if (!showClients){ return null; } return Color.BLACK; case NodeModel.NODETYPE_ACCESSPOINT : ! if (!showAccessPoints){ return null; } return Color.BLACK; case NodeModel.NODETYPE_LOCATION : ! if (!showLocations){ return null; } *************** *** 195,204 **** } } ! public Color getBgColorForNode(Node node){ if (node == null) return null; switch (node.getType()) { case NodeModel.NODETYPE_CLIENT : ! if (!showClients) { return null; } --- 195,204 ---- } } ! public Color getBgColorForNode(Node node){ if (node == null) return null; switch (node.getType()) { case NodeModel.NODETYPE_CLIENT : ! if (!showClients){ return null; } *************** *** 208,212 **** return Color.BLACK; case NodeModel.NODETYPE_ACCESSPOINT : ! if (!showAccessPoints) { return null; } --- 208,212 ---- return Color.BLACK; case NodeModel.NODETYPE_ACCESSPOINT : ! if (!showAccessPoints){ return null; } *************** *** 216,220 **** return Color.BLACK; case NodeModel.NODETYPE_LOCATION : ! if (!showLocations) { return null; } --- 216,220 ---- return Color.BLACK; case NodeModel.NODETYPE_LOCATION : ! if (!showLocations){ return null; } *************** *** 227,232 **** } } - - public void resumeGraph(){ --- 227,230 ---- *************** *** 467,470 **** --- 465,469 ---- } } + } else{ desiredLen /= CALIBRATION_FACTOR_AP; *************** *** 487,495 **** if (!showEdgesBetweenLocations) return result = null; } ! if (t1 == NodeModel.NODETYPE_ACCESSPOINT || t2 == NodeModel.NODETYPE_ACCESSPOINT){ if (!showAccessPoints) return result = null; } ! if (t1 == NodeModel.NODETYPE_CLIENT || t2 == NodeModel.NODETYPE_CLIENT){ if (!showClients) return result = null; --- 486,494 ---- if (!showEdgesBetweenLocations) return result = null; } ! if (t1 == NodeModel.NODETYPE_ACCESSPOINT || t2 == NodeModel.NODETYPE_ACCESSPOINT){ if (!showAccessPoints) return result = null; } ! if (t1 == NodeModel.NODETYPE_CLIENT || t2 == NodeModel.NODETYPE_CLIENT){ if (!showClients) return result = null; *************** *** 499,503 **** if (!showLocations) return result = null; } ! return result; } --- 498,502 ---- if (!showLocations) return result = null; } ! return result; } *************** *** 1055,1064 **** this.showEdgesBetweenLocations = showEdgesBetweenLocations; } ! /** * @param showEdges */ public void setShowEdges(boolean showEdges){ ! this.showEdges = showEdges; } --- 1054,1063 ---- this.showEdgesBetweenLocations = showEdgesBetweenLocations; } ! /** * @param showEdges */ public void setShowEdges(boolean showEdges){ ! this.showEdges = showEdges; } *************** *** 1075,1086 **** } Node node = findNode(v); ! if (node != null && (node.getType() == NodeModel.NODETYPE_LOCATION || node.getType() == NodeModel.NODETYPE_CLIENT)) { ! if (node != Controller.getInstance().getClient()) { Controller.getInstance().setMeasurementViewLocal(false); Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) node); ! } ! Controller.getInstance().getMeasurementView().setTitle(GUIUtils.i18n("measurementfor") + " " + node.getDisplayName()); ! ! } else{ Controller.getInstance().setMeasurementViewLocal(true); --- 1074,1085 ---- } Node node = findNode(v); ! if (node != null && (node.getType() == NodeModel.NODETYPE_LOCATION || node.getType() == NodeModel.NODETYPE_CLIENT)){ ! if (node != Controller.getInstance().getClient()){ Controller.getInstance().setMeasurementViewLocal(false); Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) node); ! } ! Controller.getInstance().getMeasurementView().setTitle( ! GUIUtils.i18n("measurementfor") + " " + node.getDisplayName()); ! } else{ Controller.getInstance().setMeasurementViewLocal(true); *************** *** 1094,1098 **** public void setShowAccessPoints(boolean b){ this.showAccessPoints = b; ! } --- 1093,1097 ---- public void setShowAccessPoints(boolean b){ this.showAccessPoints = b; ! } *************** *** 1102,1106 **** public void setShowLocations(boolean b){ this.showLocations = b; ! } --- 1101,1105 ---- public void setShowLocations(boolean b){ this.showLocations = b; ! } *************** *** 1110,1116 **** public void setShowClients(boolean b){ this.showClients = b; - - } } \ No newline at end of file --- 1109,1114 ---- public void setShowClients(boolean b){ this.showClients = b; + } } \ No newline at end of file |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:52:08
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/meta In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/meta Modified Files: MapInfo.java ServerConnectionInfo.java Log Message: + Client is usable without server Index: ServerConnectionInfo.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/meta/ServerConnectionInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ServerConnectionInfo.java 16 Jan 2005 16:01:34 -0000 1.1 --- ServerConnectionInfo.java 11 May 2005 10:51:29 -0000 1.2 *************** *** 10,17 **** public class ServerConnectionInfo { ! public String hostname; ! public int port; ! public String name; ! public String password; } \ No newline at end of file --- 10,18 ---- public class ServerConnectionInfo { ! public String hostname; ! public int port; ! public String name; ! public String password; ! public boolean useNoServer; } \ No newline at end of file Index: MapInfo.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/meta/MapInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MapInfo.java 12 Feb 2005 16:00:29 -0000 1.2 --- MapInfo.java 11 May 2005 10:51:29 -0000 1.3 *************** *** 10,17 **** public class MapInfo { ! public String name; ! public int width; ! public int height; ! public String imageURL; } \ No newline at end of file --- 10,17 ---- public class MapInfo { ! public String name; ! public int width; ! public int height; ! public String imageURL; } \ No newline at end of file |
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/controller Modified Files: Controller.java ServerPoller.java ServerManager.java PollHandler.java Added Files: VirtualServerManager.java SOAPServerManager.java Log Message: + Client is usable without server Index: PollHandler.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/PollHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PollHandler.java 12 Feb 2005 16:00:28 -0000 1.2 --- PollHandler.java 11 May 2005 10:51:27 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- import javax.swing.SwingUtilities; + import net.sf.magicmap.client.interfaces.ServerPollerListener; import net.sf.magicmap.client.model.node.AccessPointNode; *************** *** 266,291 **** // Alle momentan gesehenen AccessPoints merken ArrayList seenAps = client.getSeenAccessPoints(); ! for (int i = 0; i < sr.length; i++){ ! SimpleScanResultDTO r = sr[i]; ! String mac = r.getMacAP(); ! // Gibt es ggf. einen AP mit der Mac-Adresse? ! AccessPointNode ap = nodeModel.findAccessPoint(mac); ! if (ap == null){ ! // Nein ! ap = new AccessPointNode(nodeModel); ! ap.setMacAddress(mac); ! nodeModel.addNode(ap); ! //ap.setName(mac); ! } else{ ! // AccessPoint nur aktualisieren? ! if (seenAps.remove(ap)){ ! // Nur Signallevel aktualisieren ! client.setSignalLevelForAcessPoint(ap, r.getSignalLevel().doubleValue()); } else{ ! // Neu ! client.seesAccessPoint(ap, r.getSignalLevel().doubleValue()); } } } // Alle APs aus seenAps werden demzufolge nicht mehr gesehen und // dies teilen wir unserem Modell mit --- 267,298 ---- // Alle momentan gesehenen AccessPoints merken ArrayList seenAps = client.getSeenAccessPoints(); ! ! if (sr != null){ ! ! for (int i = 0; i < sr.length; i++){ ! SimpleScanResultDTO r = sr[i]; ! String mac = r.getMacAP(); ! // Gibt es ggf. einen AP mit der Mac-Adresse? ! AccessPointNode ap = nodeModel.findAccessPoint(mac); ! if (ap == null){ ! // Nein ! ap = new AccessPointNode(nodeModel); ! ap.setMacAddress(mac); ! nodeModel.addNode(ap); ! //ap.setName(mac); } else{ ! // AccessPoint nur aktualisieren? ! if (seenAps.remove(ap)){ ! // Nur Signallevel aktualisieren ! client.setSignalLevelForAcessPoint(ap, r.getSignalLevel().doubleValue()); ! } else{ ! // Neu ! client.seesAccessPoint(ap, r.getSignalLevel().doubleValue()); ! } } } + } + // Alle APs aus seenAps werden demzufolge nicht mehr gesehen und // dies teilen wir unserem Modell mit --- NEW FILE: SOAPServerManager.java --- /* * Created on 12.12.2004 */ package net.sf.magicmap.client.controller; import java.io.IOException; import java.rmi.RemoteException; import net.sf.magicmap.client.delegate.MapDelegate; import net.sf.magicmap.client.delegate.PositionDelegate; import net.sf.magicmap.client.delegate.SessionDelegate; import net.sf.magicmap.client.delegate.interfaces.MapFacadeInterface; import net.sf.magicmap.client.delegate.interfaces.PositionFacadeInterface; import net.sf.magicmap.client.delegate.interfaces.SessionFacadeInterface; import net.sf.magicmap.client.interfaces.CreateNewMapCallback; import net.sf.magicmap.client.interfaces.CreatePositionCallback; import net.sf.magicmap.client.interfaces.DeletePositionCallback; import net.sf.magicmap.client.interfaces.FetchPositionsCallback; import net.sf.magicmap.client.interfaces.MapCallback; import net.sf.magicmap.client.interfaces.MapNamesCallback; import net.sf.magicmap.client.interfaces.MovePositionCallback; import net.sf.magicmap.client.interfaces.PositionCallback; import net.sf.magicmap.client.interfaces.ServerConnectCallback; import net.sf.magicmap.client.interfaces.ServerDisconnectCallback; import net.sf.magicmap.client.meta.MapInfo; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.utils.Version; import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.dto.PositionDTO; import net.sf.magicmap.server.dto.SignalCharacterDTO; /** * Managet die Client-Server-Kommunikation sowie die * Verbindung selbst. * @author thuebner */ public class SOAPServerManager extends ServerManager { private static String mutex = "net.sf.magicmap.client.controller.Controller"; private SessionFacadeInterface sessionDelegate; // Verbindung zum Server private MapFacadeInterface mapDelegate; public PositionFacadeInterface positionDelgate; public SOAPServerManager(Controller controller) { super(controller); this.sessionDelegate = null; this.positionDelgate = null; this.mapDelegate = null; } /** * Stellt Verbindung zum Server her * */ public void connect(final ServerConnectCallback callback){ if (isConnected()){ System.out.println("Already connected."); } else{ Thread connectionThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.sessionDelegate = new SessionDelegate(); SOAPServerManager.this.sessionId = SOAPServerManager.this.sessionDelegate.connect(Settings .getClientName(), Settings.getClientMAC(), Settings.getClientPassword(), Version.PROTOCOL_VERSION); SOAPServerManager.this.mapDelegate = new MapDelegate(); SOAPServerManager.this.positionDelgate = new PositionDelegate(); callback.connected(SOAPServerManager.this.sessionId); } catch (Exception e){ callback.connectionError(e); } } } }; connectionThread.start(); } } /** * * @param callback */ public void disconnect(final ServerDisconnectCallback callback){ if (isConnected()){ Thread disconnectionThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.sessionDelegate.disconnect(Settings.getClientName(), Settings.getClientMAC(), Settings.getClientPassword(), sessionId); SOAPServerManager.this.positionDelgate = null; SOAPServerManager.this.mapDelegate = null; SOAPServerManager.this.sessionDelegate = null; callback.disconnected(); } catch (Exception e){ callback.disconnectionError(e); } SOAPServerManager.this.sessionId = -1; } } }; disconnectionThread.start(); } } /** * * @param name * @param URL * @param width * @param height * @param callback */ public void createNewMap(final String name, final String URL, final int width, final int height, final CreateNewMapCallback callback){ if (isConnected()){ Thread mapCreationThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.mapDelegate.createNewMap(sessionId, name, URL, width, height); MapInfo mapinfo = new MapInfo(); mapinfo.name = name; mapinfo.imageURL = URL; mapinfo.width = width; mapinfo.height = height; callback.newMapCreated(mapinfo); } catch (Exception e){ e.printStackTrace(); callback.createNewMapError(e); } } } }; mapCreationThread.start(); } } /** * Liefert die eindeutigen Namen der auf dem Server angelegten Karten * zurück. * @param callback MapNamesCallback Objekt welches das MapNamesCallback implementiert * um die Kartennamen bzw. die */ public void retrieveMapNames(final MapNamesCallback callback){ if (isConnected()){ Thread getMapNamesThread = new Thread() { public void run(){ synchronized (mutex){ try{ String[] names = SOAPServerManager.this.mapDelegate.getMapNames(); callback.mapNamesReceived(names); } catch (Exception e){ e.printStackTrace(); callback.getMapNamesError(e); } } } }; getMapNamesThread.start(); } } /** * Lädt Daten zu einer Karte vom Server. Das Ergebniss wird über eine Callback * Funktionen geliefert. * @param name * @param callback */ public void retrieveMap(final String name, final MapCallback callback){ if (isConnected()){ Thread getMapThread = new Thread() { public void run(){ synchronized (mutex){ try{ MapDTO mapDTO = SOAPServerManager.this.mapDelegate.getMap(name); callback.mapReceived(mapDTO); } catch (Exception e){ callback.getMapError(e); } } } }; getMapThread.start(); } } /** * Erzeugt einen Referenzpunkt auf dem Server * @param node * @param callback */ public void createLocation(final int x, final int y, final boolean fixed, final String name, final CreatePositionCallback callback){ if (isConnected()){ final SignalCharacterDTO signalCharacter = currentSignalCharacter(); System.out.println("signalCharacter.getSimpleScanResults() " + signalCharacter.getSimpleScanResults()); Thread createPositionThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.positionDelgate.createOrUpdatePosition(SOAPServerManager.this.sessionId, controller.getCurrentMap().name, x, y, signalCharacter, name, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionCreated(); } catch (Exception e){ callback.positionCreationError(e); } } } }; createPositionThread.start(); } } /** * Entfernt einen Referenzpunkt oder die Positionierung eines * AccessPoints oder Clients mit gegebener Id vom Server * @param node * @param callback */ public void deletePosition(final long positionId, final DeletePositionCallback callback){ if (isConnected()){ Thread deletePositionThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.positionDelgate.deletePosition(sessionId, positionId); System.out.println("PositionID " + positionId + " deleted."); // TODO: Zusätzliche Parameter zur Position callback.positionDeleted(positionId); } catch (Exception e){ callback.positionDeleteError(e); } } } }; deletePositionThread.start(); } } /** * Bewegt einen Referenzpunkt oder die Positionierung eines * AccessPoints oder Clients mit gegebener Id vom Server * @param node * @param callback */ public void movePosition(final long positionId, final int x, final int y, final boolean fixed, final MovePositionCallback callback){ if (isConnected()){ Thread movePositionThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.positionDelgate.movePosition(sessionId, positionId, x, y, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionMoved(positionId); } catch (Exception e){ callback.positionMoveError(e); } } } }; movePositionThread.start(); } } /* public void createOrUpdateClientPosition(long sessionId, String mapName, int positionX, int positionY, public void createOrUpdateAccessPosition(long sessionId, String mapName, int positionX, int positionY, String accessPointMac) throws RemoteException, MapException, SessionException{ public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY) throws RemoteException, public void deletePosition(long sessionId, long positionId) throws RemoteException, MapException, SessionException{ */ /** * Eine Position von (-1,-1) bedeutet, dass der Client nicht fixiert ist sondern * frei beweglich ist. Es werden dann nur seine Signalstärken geupdatet. * @param x X-Koordinate bzgl. Map * @param y Y-Koordinate bzgl. Map * @param clientMac MAC-Adresses des betreffenden Clients * @param callback Callback */ public void setClientPosition(final int x, final int y, final boolean fixed, final String clientMac, final PositionCallback callback){ if (isConnected()){ Thread positionThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.positionDelgate.createOrUpdateClientPosition(sessionId, controller.getCurrentMap().name, x, y, currentSignalCharacter(), clientMac, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionUpdated(clientMac); } catch (Exception e){ callback.positionError(e); } } } }; positionThread.start(); } } /** * Eine Position von (-1,-1) bedeutet, dass der Client nicht fixiert ist sondern * frei beweglich ist. Es werden dann nur seine Signalstärken geupdatet. * @param x X-Koordinate bzgl. Map * @param y Y-Koordinate bzgl. Map * @param clientMac MAC-Adresses des betreffenden Clients * @param callback Callback */ public void setAccessPointPosition(final int x, final int y, final boolean fixed, final String accessPointMac, final PositionCallback callback){ if (isConnected()){ Thread positionThread = new Thread() { public void run(){ synchronized (mutex){ try{ SOAPServerManager.this.positionDelgate.createOrUpdateAccessPosition(sessionId, controller.getCurrentMap().name, x, y, accessPointMac, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionUpdated(accessPointMac); } catch (Exception e){ callback.positionError(e); } } } }; positionThread.start(); } } public void fetchPositionsFromServer(final FetchPositionsCallback callback){ if (isConnected()){ Thread fetchPositionsThread = new Thread() { public void run(){ synchronized (mutex){ try{ PositionDTO[] positions = SOAPServerManager.this.positionDelgate.getPositionsForMapSince( SOAPServerManager.this.sessionId, controller.getCurrentMap().name, timestamp); for (int i = 0; i < positions.length; i++){ if (positions[i].getLastModified().longValue() > SOAPServerManager.this.timestamp){ SOAPServerManager.this.timestamp = positions[i].getLastModified().longValue(); } } callback.positionsFetched(positions); } catch (Exception e){ callback.positionFetchError(e); } } } }; fetchPositionsThread.start(); } } /* (non-Javadoc) * @see net.sf.magicmap.client.interfaces.ServerPollerListener#positionCreatedOrUpdatedOrDeleted(java.lang.String, long, net.sf.magicmap.client.delegate.dto.PositionDTO) */ public void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position){ // TODO Auto-generated method stub } /** * @param poller */ public void submitClientInfo(){ if (isConnected() && !controller.isInvisible()){ final SignalCharacterDTO signalCharacter = currentSignalCharacter(); Thread updateClientThread = new Thread() { public void run(){ synchronized (mutex){ try{ int x = controller.getClientPosX(); int y = controller.getClientPosY(); if (x < 0) x = 0; else if (x >= controller.getCurrentMap().width) x = controller.getCurrentMap().width - 1; if (y < 0) y = 0; else if (y >= controller.getCurrentMap().height) y = controller.getCurrentMap().height - 1;; SOAPServerManager.this.positionDelgate.createOrUpdateClientPosition(SOAPServerManager.this.sessionId, controller.getCurrentMap().name, x, y, signalCharacter, controller.getClient().getMacAddress(), controller.getClient().isFix()); // TODO: Zusätzliche Parameter zur Position System.out.println("Client info submitted."); } catch (Exception e){ e.printStackTrace(); } } } }; updateClientThread.start(); } } /* (non-Javadoc) * @see net.sf.magicmap.client.controller.ServerManager#reloadMap() */ public void reloadMap(){ try{ positionDelgate = new PositionDelegate(); } catch (RemoteException e){ // TODO Auto-generated catch block e.printStackTrace(); } } /* (non-Javadoc) * @see net.sf.magicmap.client.controller.ServerManager#closeMap() */ public void closeMap(){ if (positionDelgate != null){ try{ positionDelgate.close(); } catch (IOException e){ e.printStackTrace(); } } } } --- NEW FILE: VirtualServerManager.java --- /* * Created on 10.05.2005 * */ package net.sf.magicmap.client.controller; import net.sf.magicmap.client.interfaces.CreateNewMapCallback; import net.sf.magicmap.client.interfaces.CreatePositionCallback; import net.sf.magicmap.client.interfaces.DeletePositionCallback; import net.sf.magicmap.client.interfaces.FetchPositionsCallback; import net.sf.magicmap.client.interfaces.MapCallback; import net.sf.magicmap.client.interfaces.MapNamesCallback; import net.sf.magicmap.client.interfaces.MovePositionCallback; import net.sf.magicmap.client.interfaces.PositionCallback; import net.sf.magicmap.client.interfaces.ServerConnectCallback; import net.sf.magicmap.client.interfaces.ServerDisconnectCallback; import net.sf.magicmap.client.meta.MapInfo; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.utils.Version; import net.sf.magicmap.server.Init; import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.dto.PositionDTO; import net.sf.magicmap.server.dto.SignalCharacterDTO; import net.sf.magicmap.server.facade.MapFacade; import net.sf.magicmap.server.facade.PositionFacade; import net.sf.magicmap.server.facade.SessionFacade; /** * @author thuebner * */ public class VirtualServerManager extends ServerManager { private static String mutex = "net.sf.magicmap.client.controller.Controller"; /** * @param controller */ public VirtualServerManager(Controller controller) { super(controller); } MapFacade mapFacade; private SessionFacade sessionFacade; private PositionFacade positionFacade; /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#resetTimestamp() */ public void resetTimestamp(){ this.timestamp = -1; } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#isConnected() */ public boolean isConnected(){ return (this.sessionId != -1); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#connect(net.sf.magicmap.client.interfaces.ServerConnectCallback) */ public void connect(ServerConnectCallback callback){ if (isConnected()){ System.out.println("Already connected."); } else{ System.out.println("Connect to local DB"); // init JDO Init.initJDO("org.apache.derby.jdbc.EmbeddedDriver", "jdbc:derby:magicmap;create=true", "magicmap", "hamilton"); mapFacade = new MapFacade(); sessionFacade = new SessionFacade(); positionFacade = new PositionFacade(); try{ sessionId = sessionFacade.connect(Settings.getClientName(), Settings.getClientMAC(), Settings .getClientPassword(), Version.PROTOCOL_VERSION); callback.connected(sessionId); } catch (Exception e){ callback.connectionError(e); } } } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#disconnect(net.sf.magicmap.client.interfaces.ServerDisconnectCallback) */ public void disconnect(ServerDisconnectCallback callback){ if (!isConnected()) return; callback.disconnected(); this.sessionId = -1; } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#createNewMap(java.lang.String, * java.lang.String, int, int, * net.sf.magicmap.client.interfaces.CreateNewMapCallback) */ public void createNewMap(final String name, final String URL, final int width, final int height, final CreateNewMapCallback callback){ if (!isConnected()) return; Thread mapCreationThread = new Thread() { public void run(){ synchronized (mutex){ try{ mapFacade.createNewMap(sessionId, name, URL, width, height); MapInfo mapinfo = new MapInfo(); mapinfo.name = name; mapinfo.imageURL = URL; mapinfo.width = width; mapinfo.height = height; callback.newMapCreated(mapinfo); } catch (Exception e){ e.printStackTrace(); callback.createNewMapError(e); } } } }; mapCreationThread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#retrieveMapNames(net.sf.magicmap.client.interfaces.MapNamesCallback) */ public void retrieveMapNames(final MapNamesCallback callback){ if (!isConnected()) return; Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ String[] names = mapFacade.getMapNames(); callback.mapNamesReceived(names); } catch (Exception e){ e.printStackTrace(); callback.getMapNamesError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#retrieveMap(java.lang.String, * net.sf.magicmap.client.interfaces.MapCallback) */ public void retrieveMap(final String name, final MapCallback callback){ if (!isConnected()) return; Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ MapDTO mapDTO = mapFacade.getMap(name); callback.mapReceived(mapDTO); } catch (Exception e){ callback.getMapError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#createLocation(int, * int, boolean, java.lang.String, * net.sf.magicmap.client.interfaces.CreatePositionCallback) */ public void createLocation(final int x, final int y, final boolean fixed, final String name, final CreatePositionCallback callback){ if (!isConnected()) return; final SignalCharacterDTO signalCharacter = currentSignalCharacter(); System.out.println("signalCharacter.getSimpleScanResults() " + signalCharacter.getSimpleScanResults()); Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ positionFacade.createOrUpdatePosition(sessionId, controller.getCurrentMap().name, x, y, signalCharacter, name, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionCreated(); } catch (Exception e){ callback.positionCreationError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#deletePosition(long, * net.sf.magicmap.client.interfaces.DeletePositionCallback) */ public void deletePosition(final long positionId, final DeletePositionCallback callback){ if (!isConnected()) return; Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ positionFacade.deletePosition(sessionId, positionId); System.out.println("PositionID " + positionId + " deleted."); // TODO: Zusätzliche Parameter zur Position callback.positionDeleted(positionId); } catch (Exception e){ callback.positionDeleteError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#movePosition(long, * int, int, boolean, * net.sf.magicmap.client.interfaces.MovePositionCallback) */ public void movePosition(final long positionId, final int x, final int y, final boolean fixed, final MovePositionCallback callback){ if (!isConnected()) return; Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ positionFacade.movePosition(sessionId, positionId, x, y, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionMoved(positionId); } catch (Exception e){ callback.positionMoveError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#setClientPosition(int, * int, boolean, java.lang.String, * net.sf.magicmap.client.interfaces.PositionCallback) */ public void setClientPosition(final int x, final int y, final boolean fixed, final String clientMac, final PositionCallback callback){ if (!isConnected()) return; Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ positionFacade.createOrUpdateClientPosition(sessionId, controller.getCurrentMap().name, x, y, currentSignalCharacter(), clientMac, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionUpdated(clientMac); } catch (Exception e){ callback.positionError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#setAccessPointPosition(int, * int, boolean, java.lang.String, * net.sf.magicmap.client.interfaces.PositionCallback) */ public void setAccessPointPosition(final int x, final int y, final boolean fixed, final String accessPointMac, final PositionCallback callback){ if (!isConnected()) return; Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ positionFacade.createOrUpdateAccessPosition(sessionId, controller.getCurrentMap().name, x, y, accessPointMac, fixed); // TODO: Zusätzliche Parameter zur Position callback.positionUpdated(accessPointMac); } catch (Exception e){ callback.positionError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#fetchPositionsFromServer(net.sf.magicmap.client.interfaces.FetchPositionsCallback) */ public void fetchPositionsFromServer(final FetchPositionsCallback callback){ if (!isConnected()) return; Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ PositionDTO[] positions = positionFacade.getPositionsForMapSince(sessionId, controller.getCurrentMap().name, timestamp); for (int i = 0; i < positions.length; i++){ if (positions[i].getLastModified().longValue() > timestamp){ timestamp = positions[i].getLastModified().longValue(); } } callback.positionsFetched(positions); } catch (Exception e){ callback.positionFetchError(e); } } } }; thread.start(); } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#positionCreatedOrUpdatedOrDeleted(java.lang.String, * long, net.sf.magicmap.server.dto.PositionDTO) */ public void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position){ // TODO Auto-generated method stub } /* * (non-Javadoc) * * @see net.sf.magicmap.client.controller.ServerManager#submitClientInfo() */ public void submitClientInfo(){ if (!isConnected()) return; final SignalCharacterDTO signalCharacter = currentSignalCharacter(); Thread thread = new Thread() { public void run(){ synchronized (mutex){ try{ int x = controller.getClientPosX(); int y = controller.getClientPosY(); if (x < 0) x = 0; else if (x >= controller.getCurrentMap().width) x = controller.getCurrentMap().width - 1; if (y < 0) y = 0; else if (y >= controller.getCurrentMap().height) y = controller.getCurrentMap().height - 1;; positionFacade.createOrUpdateClientPosition(sessionId, controller.getCurrentMap().name, x, y, signalCharacter, controller.getClient().getMacAddress(), controller.getClient().isFix()); // TODO: Zusätzliche Parameter zur Position System.out.println("Client info submitted."); } catch (Exception e){ e.printStackTrace(); } } } }; thread.start(); } /* (non-Javadoc) * @see net.sf.magicmap.client.controller.ServerManager#reloadMap() */ public void reloadMap(){ // TODO Auto-generated method stub } /* (non-Javadoc) * @see net.sf.magicmap.client.controller.ServerManager#closeMap() */ public void closeMap(){ // TODO Auto-generated method stub } } Index: Controller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Controller.java 12 Feb 2005 16:00:28 -0000 1.2 --- Controller.java 11 May 2005 10:51:27 -0000 1.3 *************** *** 9,16 **** import java.net.MalformedURLException; import java.net.UnknownHostException; - import java.rmi.RemoteException; import java.util.ArrayList; - import net.sf.magicmap.client.delegate.PositionDelegate; import net.sf.magicmap.client.gui.utils.CallbackHandler; import net.sf.magicmap.client.interfaces.CreateNewMapCallback; --- 9,14 ---- *************** *** 87,93 **** this.scanner = null; this.currentMap = null; ! this.serverManager = new ServerManager(this); this.pollhandler = new PollHandler(this); - this.poller = new ServerPoller(serverManager, pollhandler); this.callbackHandler = new CallbackHandler(); try{ --- 85,90 ---- this.scanner = null; this.currentMap = null; ! this.serverManager = null; this.pollhandler = new PollHandler(this); this.callbackHandler = new CallbackHandler(); try{ *************** *** 214,218 **** */ public boolean isConnected(){ ! return serverManager.isConnected(); } --- 211,215 ---- */ public boolean isConnected(){ ! return (serverManager != null && serverManager.isConnected()); } *************** *** 235,246 **** this.currentMap = map; try{ ! this.serverManager.positionDelgate = new PositionDelegate(); this.mapView.loadMap(map); } catch (MalformedURLException e){ System.out.println("Map loading failed." + e.getMessage()); closeMap(); - } catch (RemoteException e){ - System.out.println("Map loading failed." + e.getMessage()); - closeMap(); } if (isMapLoaded() && isConnected()){ --- 232,240 ---- this.currentMap = map; try{ ! serverManager.reloadMap(); this.mapView.loadMap(map); } catch (MalformedURLException e){ System.out.println("Map loading failed." + e.getMessage()); closeMap(); } if (isMapLoaded() && isConnected()){ *************** *** 273,283 **** this.currentMap = null; this.mapView.unloadMap(); ! if (this.serverManager.positionDelgate != null){ ! try{ ! this.serverManager.positionDelgate.close(); ! } catch (IOException e){ ! e.printStackTrace(); ! } ! } poller.stop(); nodeModel.clear(); --- 267,271 ---- this.currentMap = null; this.mapView.unloadMap(); ! serverManager.closeMap(); poller.stop(); nodeModel.clear(); *************** *** 325,328 **** --- 313,323 ---- public void connect(ServerConnectCallback callback){ + if (Settings.isUseNoServer()){ + serverManager = new VirtualServerManager(this); + } else{ + serverManager = new SOAPServerManager(this); + } + // Poller erzeugen (benötigt ServerManager) + this.poller = new ServerPoller(serverManager, pollhandler); serverManager.connect(callback); } Index: ServerPoller.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerPoller.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServerPoller.java 12 Feb 2005 16:00:28 -0000 1.2 --- ServerPoller.java 11 May 2005 10:51:27 -0000 1.3 *************** *** 37,41 **** public void start(){ ! this.timer.schedule(builderTimerTask(), Settings.POLL_INTERVAL, Settings.POLL_INTERVAL); } --- 37,41 ---- public void start(){ ! this.timer.schedule(builderTimerTask(), Settings.POLL_DELAY, Settings.POLL_INTERVAL); } Index: ServerManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ServerManager.java 16 Feb 2005 09:02:31 -0000 1.5 --- ServerManager.java 11 May 2005 10:51:27 -0000 1.6 *************** *** 1,4 **** /* ! * Created on 12.12.2004 */ --- 1,7 ---- /* ! * Created on 10.05.2005 ! * ! * TODO To change the template for this generated file go to ! * Window - Preferences - Java - Code Style - Code Templates */ *************** *** 12,21 **** import java.util.Iterator; - import net.sf.magicmap.client.delegate.MapDelegate; - import net.sf.magicmap.client.delegate.PositionDelegate; - import net.sf.magicmap.client.delegate.SessionDelegate; - import net.sf.magicmap.client.delegate.interfaces.MapFacadeInterface; - import net.sf.magicmap.client.delegate.interfaces.PositionFacadeInterface; - import net.sf.magicmap.client.delegate.interfaces.SessionFacadeInterface; import net.sf.magicmap.client.interfaces.CreateNewMapCallback; import net.sf.magicmap.client.interfaces.CreatePositionCallback; --- 15,18 ---- *************** *** 28,36 **** import net.sf.magicmap.client.interfaces.ServerConnectCallback; import net.sf.magicmap.client.interfaces.ServerDisconnectCallback; - import net.sf.magicmap.client.meta.MapInfo; import net.sf.magicmap.client.model.measurement.SeenAccessPoint; - import net.sf.magicmap.client.utils.Settings; - import net.sf.magicmap.client.utils.Version; - import net.sf.magicmap.server.dto.MapDTO; import net.sf.magicmap.server.dto.PositionDTO; import net.sf.magicmap.server.dto.SignalCharacterDTO; --- 25,29 ---- *************** *** 38,64 **** /** - * Managet die Client-Server-Kommunikation sowie die - * Verbindung selbst. * @author thuebner */ ! public class ServerManager { ! ! private static String mutex = "net.sf.magicmap.client.controller.Controller"; ! ! private Controller controller; ! private SessionFacadeInterface sessionDelegate; // Verbindung zum Server ! private MapFacadeInterface mapDelegate; ! public PositionFacadeInterface positionDelgate; ! private long sessionId; ! private long timestamp; ! public ServerManager(Controller controller) { ! this.controller = controller; ! this.sessionDelegate = null; ! this.positionDelgate = null; ! this.mapDelegate = null; ! this.timestamp = -1; ! this.sessionId = -1; ! } public void resetTimestamp(){ --- 31,44 ---- /** * @author thuebner + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates */ ! public abstract class ServerManager { ! protected long sessionId = -1; ! protected long timestamp = -1; ! protected Controller controller; public void resetTimestamp(){ *************** *** 70,214 **** } ! /** ! * Stellt Verbindung zum Server her ! * ! */ ! public void connect(final ServerConnectCallback callback){ ! if (isConnected()){ ! System.out.println("Already connected."); ! } else{ ! Thread connectionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.sessionDelegate = new SessionDelegate(); ! ServerManager.this.sessionId = ServerManager.this.sessionDelegate.connect(Settings.getClientName(), ! Settings.getClientMAC(), Settings.getClientPassword(), Version.PROTOCOL_VERSION); ! ServerManager.this.mapDelegate = new MapDelegate(); ! ServerManager.this.positionDelgate = new PositionDelegate(); ! callback.connected(ServerManager.this.sessionId); ! } catch (Exception e){ ! callback.connectionError(e); ! } ! } ! } ! }; ! connectionThread.start(); ! } ! } ! ! /** ! * ! * @param callback ! */ ! public void disconnect(final ServerDisconnectCallback callback){ ! if (isConnected()){ ! Thread disconnectionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.sessionDelegate.disconnect(Settings.getClientName(), Settings.getClientMAC(), Settings ! .getClientPassword(), sessionId); ! ServerManager.this.positionDelgate = null; ! ServerManager.this.mapDelegate = null; ! ServerManager.this.sessionDelegate = null; ! callback.disconnected(); ! } catch (Exception e){ ! callback.disconnectionError(e); ! } ! ServerManager.this.sessionId = -1; ! } ! } ! }; ! disconnectionThread.start(); ! } ! } ! ! /** ! * ! * @param name ! * @param URL ! * @param width ! * @param height ! * @param callback ! */ ! public void createNewMap(final String name, final String URL, final int width, final int height, ! final CreateNewMapCallback callback){ ! if (isConnected()){ ! Thread mapCreationThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.mapDelegate.createNewMap(sessionId, name, URL, width, height); ! MapInfo mapinfo = new MapInfo(); ! mapinfo.name = name; ! mapinfo.imageURL = URL; ! mapinfo.width = width; ! mapinfo.height = height; ! callback.newMapCreated(mapinfo); ! } catch (Exception e){ ! e.printStackTrace(); ! callback.createNewMapError(e); ! } ! } ! } ! }; ! mapCreationThread.start(); ! } ! } ! ! /** ! * Liefert die eindeutigen Namen der auf dem Server angelegten Karten ! * zurück. ! * @param callback MapNamesCallback Objekt welches das MapNamesCallback implementiert ! * um die Kartennamen bzw. die ! */ ! public void retrieveMapNames(final MapNamesCallback callback){ ! if (isConnected()){ ! Thread getMapNamesThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! String[] names = ServerManager.this.mapDelegate.getMapNames(); ! callback.mapNamesReceived(names); ! } catch (Exception e){ ! e.printStackTrace(); ! callback.getMapNamesError(e); ! } ! } ! } ! }; ! getMapNamesThread.start(); ! } } ! /** ! * Lädt Daten zu einer Karte vom Server. Das Ergebniss wird über eine Callback ! * Funktionen geliefert. ! * @param name ! * @param callback ! */ ! public void retrieveMap(final String name, final MapCallback callback){ ! if (isConnected()){ ! Thread getMapThread = new Thread() { ! public void run(){ ! synchronized (mutex){ ! try{ ! MapDTO mapDTO = ServerManager.this.mapDelegate.getMap(name); ! callback.mapReceived(mapDTO); ! } catch (Exception e){ ! callback.getMapError(e); ! } ! } ! } ! }; ! getMapThread.start(); ! } ! } /** --- 50,60 ---- } ! public ServerManager(Controller controller) { ! this.controller = controller; } ! public abstract void reloadMap(); ! public abstract void closeMap(); /** *************** *** 217,221 **** * @return */ ! private SignalCharacterDTO currentSignalCharacter(){ SignalCharacterDTO signalCharacter = new SignalCharacterDTO(); Collection accessPoints = controller.getMeasurementModel().getAccessPoints(); --- 63,67 ---- * @return */ ! protected SignalCharacterDTO currentSignalCharacter(){ SignalCharacterDTO signalCharacter = new SignalCharacterDTO(); Collection accessPoints = controller.getMeasurementModel().getAccessPoints(); *************** *** 230,235 **** if (signalCharacter.getSimpleScanResults() == null){ list = new ArrayList(); ! } else { ! list = new ArrayList(Arrays.asList(signalCharacter.getSimpleScanResults())); } Calendar c = new GregorianCalendar(); --- 76,81 ---- if (signalCharacter.getSimpleScanResults() == null){ list = new ArrayList(); ! } else{ ! list = new ArrayList(Arrays.asList(signalCharacter.getSimpleScanResults())); } Calendar c = new GregorianCalendar(); *************** *** 250,281 **** /** * Erzeugt einen Referenzpunkt auf dem Server * @param node * @param callback */ ! public void createLocation(final int x, final int y, final boolean fixed, final String name, ! final CreatePositionCallback callback){ ! if (isConnected()){ ! final SignalCharacterDTO signalCharacter = currentSignalCharacter(); ! System.out.println("signalCharacter.getSimpleScanResults() " + signalCharacter.getSimpleScanResults()); ! ! Thread createPositionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.positionDelgate.createOrUpdatePosition(ServerManager.this.sessionId, controller ! .getCurrentMap().name, x, y, signalCharacter, name, fixed); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionCreated(); ! } catch (Exception e){ ! callback.positionCreationError(e); ! } ! } ! } ! }; ! createPositionThread.start(); ! } ! } /** --- 96,144 ---- /** + * Stellt Verbindung zum Server her + * + */ + public abstract void connect(final ServerConnectCallback callback); + + /** + * + * @param callback + */ + public abstract void disconnect(final ServerDisconnectCallback callback); + + /** + * + * @param name + * @param URL + * @param width + * @param height + * @param callback + */ + public abstract void createNewMap(final String name, final String URL, final int width, final int height, + final CreateNewMapCallback callback); + + /** + * Liefert die eindeutigen Namen der auf dem Server angelegten Karten + * zurück. + * @param callback MapNamesCallback Objekt welches das MapNamesCallback implementiert + * um die Kartennamen bzw. die + */ + public abstract void retrieveMapNames(final MapNamesCallback callback); + + /** + * Lädt Daten zu einer Karte vom Server. Das Ergebniss wird über eine Callback + * Funktionen geliefert. + * @param name + * @param callback + */ + public abstract void retrieveMap(final String name, final MapCallback callback); + + /** * Erzeugt einen Referenzpunkt auf dem Server * @param node * @param callback */ ! public abstract void createLocation(final int x, final int y, final boolean fixed, final String name, ! final CreatePositionCallback callback); /** *************** *** 285,308 **** * @param callback */ ! public void deletePosition(final long positionId, final DeletePositionCallback callback){ ! if (isConnected()){ ! Thread deletePositionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.positionDelgate.deletePosition(sessionId, positionId); ! System.out.println("PositionID " + positionId + " deleted."); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionDeleted(positionId); ! } catch (Exception e){ ! callback.positionDeleteError(e); ! } ! } ! } ! }; ! deletePositionThread.start(); ! } ! } /** --- 148,152 ---- * @param callback */ ! public abstract void deletePosition(final long positionId, final DeletePositionCallback callback); /** *************** *** 312,335 **** * @param callback */ ! public void movePosition(final long positionId, final int x, final int y, final boolean fixed, ! final MovePositionCallback callback){ ! if (isConnected()){ ! Thread movePositionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.positionDelgate.movePosition(sessionId, positionId, x, y, fixed); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionMoved(positionId); ! } catch (Exception e){ ! callback.positionMoveError(e); ! } ! } ! } ! }; ! movePositionThread.start(); ! } ! } /* --- 156,161 ---- * @param callback */ ! public abstract void movePosition(final long positionId, final int x, final int y, final boolean fixed, ! final MovePositionCallback callback); /* *************** *** 338,372 **** public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY) throws RemoteException, public void deletePosition(long sessionId, long positionId) throws RemoteException, MapException, SessionException{ ! */ ! ! /** ! * Eine Position von (-1,-1) bedeutet, dass der Client nicht fixiert ist sondern ! * frei beweglich ist. Es werden dann nur seine Signalstärken geupdatet. ! * @param x X-Koordinate bzgl. Map ! * @param y Y-Koordinate bzgl. Map ! * @param clientMac MAC-Adresses des betreffenden Clients ! * @param callback Callback ! */ ! public void setClientPosition(final int x, final int y, final boolean fixed, final String clientMac, ! final PositionCallback callback){ ! if (isConnected()){ ! Thread positionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.positionDelgate.createOrUpdateClientPosition(sessionId, ! controller.getCurrentMap().name, x, y, currentSignalCharacter(), clientMac, fixed); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionUpdated(clientMac); ! } catch (Exception e){ ! callback.positionError(e); ! } ! } ! } ! }; ! positionThread.start(); ! } ! } /** --- 164,169 ---- public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY) throws RemoteException, public void deletePosition(long sessionId, long positionId) throws RemoteException, MapException, SessionException{ ! */public abstract void setClientPosition(final int x, final int y, final boolean fixed, final String clientMac, ! final PositionCallback callback); /** *************** *** 378,471 **** * @param callback Callback */ ! public void setAccessPointPosition(final int x, final int y, final boolean fixed, final String accessPointMac, ! final PositionCallback callback){ ! if (isConnected()){ ! Thread positionThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! ServerManager.this.positionDelgate.createOrUpdateAccessPosition(sessionId, ! controller.getCurrentMap().name, x, y, accessPointMac, fixed); ! // TODO: Zusätzliche Parameter zur Position ! callback.positionUpdated(accessPointMac); ! } catch (Exception e){ ! callback.positionError(e); ! } ! } ! } ! }; ! positionThread.start(); ! } ! } ! ! public void fetchPositionsFromServer(final FetchPositionsCallback callback){ ! if (isConnected()){ ! Thread fetchPositionsThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! PositionDTO[] positions = ServerManager.this.positionDelgate.getPositionsForMapSince( ! ServerManager.this.sessionId, controller.getCurrentMap().name, timestamp); ! for (int i = 0; i < positions.length; i++){ ! if (positions[i].getLastModified().longValue() > ServerManager.this.timestamp){ ! ServerManager.this.timestamp = positions[i].getLastModified().longValue(); ! } ! } ! callback.positionsFetched(positions); ! } catch (Exception e){ ! callback.positionFetchError(e); ! } ! } ! } ! }; ! fetchPositionsThread.start(); ! } ! } /* (non-Javadoc) * @see net.sf.magicmap.client.interfaces.ServerPollerListener#positionCreatedOrUpdatedOrDeleted(java.lang.String, long, net.sf.magicmap.client.delegate.dto.PositionDTO) ! */ ! public void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position){ ! // TODO Auto-generated method stub ! ! } /** * @param poller */ ! public void submitClientInfo(){ ! if (isConnected() && !controller.isInvisible()){ ! final SignalCharacterDTO signalCharacter = currentSignalCharacter(); ! Thread updateClientThread = new Thread() { ! ! public void run(){ ! synchronized (mutex){ ! try{ ! int x = controller.getClientPosX(); ! int y = controller.getClientPosY(); ! if (x < 0) ! x = 0; ! else if (x >= controller.getCurrentMap().width) x = controller.getCurrentMap().width - 1; ! if (y < 0) ! y = 0; ! else if (y >= controller.getCurrentMap().height) y = controller.getCurrentMap().height - 1;; ! ! ServerManager.this.positionDelgate.createOrUpdateClientPosition(ServerManager.this.sessionId, controller ! .getCurrentMap().name, x, y, signalCharacter, controller.getClient().getMacAddress(), controller ! .getClient().isFix()); ! // TODO: Zusätzliche Parameter zur Position ! System.out.println("Client info submitted."); ! } catch (Exception e){ ! e.printStackTrace(); ! } ! } ! } ! }; ! updateClientThread.start(); ! } ! } ! } \ No newline at end of file --- 175,190 ---- * @param callback Callback */ ! public abstract void setAccessPointPosition(final int x, final int y, final boolean fixed, ! final String accessPointMac, final PositionCallback callback); ! public abstract void fetchPositionsFromServer(final FetchPositionsCallback callback); /* (non-Javadoc) * @see net.sf.magicmap.client.interfaces.ServerPollerListener#positionCreatedOrUpdatedOrDeleted(java.lang.String, long, net.sf.magicmap.client.delegate.dto.PositionDTO) ! */public abstract void positionCreatedOrUpdatedOrDeleted(String mapName, long timeStamp, PositionDTO position); /** * @param poller */ ! public abstract void submitClientInfo(); } \ No newline at end of file |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:52:07
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/delegate Modified Files: SessionDelegate.java MapDelegate.java PositionDelegate.java Log Message: + Client is usable without server Index: SessionDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/SessionDelegate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SessionDelegate.java 13 Feb 2005 21:36:37 -0000 1.3 --- SessionDelegate.java 11 May 2005 10:51:28 -0000 1.4 *************** *** 9,13 **** import localhost.magicmap.services.SessionFacade.SessionFacadeServiceLocator; import localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub; - import net.sf.magicmap.client.delegate.exception.ExceptionHandler; import net.sf.magicmap.client.delegate.interfaces.SessionFacadeInterface; --- 9,12 ---- *************** *** 26,31 **** try{ ! bindingLocal = (SessionFacadeSoapBindingStub) new SessionFacadeServiceLocator() ! .getSessionFacade(new URL(Settings.getServerURL() + JWS)); } catch (javax.xml.rpc.ServiceException jre){ if (jre.getLinkedCause() != null) jre.getLinkedCause().printStackTrace(); --- 25,31 ---- try{ ! bindingLocal = (SessionFacadeSoapBindingStub) new SessionFacadeServiceLocator().getSessionFacade(new URL(Settings ! .getServerURL() ! + JWS)); } catch (javax.xml.rpc.ServiceException jre){ if (jre.getLinkedCause() != null) jre.getLinkedCause().printStackTrace(); Index: MapDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/MapDelegate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MapDelegate.java 12 Feb 2005 16:00:28 -0000 1.2 --- MapDelegate.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 12,16 **** import localhost.magicmap.services.MapFacade.MapFacadeServiceLocator; import localhost.magicmap.services.MapFacade.MapFacadeSoapBindingStub; - import net.sf.magicmap.client.delegate.exception.ExceptionHandler; import net.sf.magicmap.client.delegate.interfaces.MapFacadeInterface; --- 12,15 ---- *************** *** 31,36 **** try{ ! bindingLocal = (MapFacadeSoapBindingStub) new MapFacadeServiceLocator() ! .getMapFacade(new URL(Settings.getServerURL() + JWS)); } catch (javax.xml.rpc.ServiceException jre){ if (jre.getLinkedCause() != null) jre.getLinkedCause().printStackTrace(); --- 30,36 ---- try{ ! bindingLocal = (MapFacadeSoapBindingStub) new MapFacadeServiceLocator().getMapFacade(new URL(Settings ! .getServerURL() ! + JWS)); } catch (javax.xml.rpc.ServiceException jre){ if (jre.getLinkedCause() != null) jre.getLinkedCause().printStackTrace(); Index: PositionDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/PositionDelegate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PositionDelegate.java 12 Feb 2005 16:00:28 -0000 1.2 --- PositionDelegate.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 9,13 **** import localhost.magicmap.services.PositionFacade.PositionFacadeServiceLocator; import localhost.magicmap.services.PositionFacade.PositionFacadeSoapBindingStub; - import net.sf.magicmap.client.delegate.exception.ExceptionHandler; import net.sf.magicmap.client.delegate.interfaces.PositionFacadeInterface; --- 9,12 ---- *************** *** 29,34 **** try{ ! bindingLocal = (PositionFacadeSoapBindingStub) new PositionFacadeServiceLocator() ! .getPositionFacade(new URL(Settings.getServerURL() + JWS)); } catch (javax.xml.rpc.ServiceException jre){ if (jre.getLinkedCause() != null) jre.getLinkedCause().printStackTrace(); --- 28,33 ---- try{ ! bindingLocal = (PositionFacadeSoapBindingStub) new PositionFacadeServiceLocator().getPositionFacade(new URL( ! Settings.getServerURL() + JWS)); } catch (javax.xml.rpc.ServiceException jre){ if (jre.getLinkedCause() != null) jre.getLinkedCause().printStackTrace(); *************** *** 56,61 **** SessionException{ try{ ! this.binding.createOrUpdatePosition(sessionId, mapName, positionX, positionY, character, positionName, ! fixed); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 55,59 ---- SessionException{ try{ ! this.binding.createOrUpdatePosition(sessionId, mapName, positionX, positionY, character, positionName, fixed); } catch (Exception e){ throw ExceptionHandler.checkException(e); *************** *** 70,75 **** SessionException{ try{ ! this.binding.createOrUpdateClientPosition(sessionId, mapName, positionX, positionY, character, ! clientMac, fixed); } catch (Exception e){ throw ExceptionHandler.checkException(e); --- 68,72 ---- SessionException{ try{ ! this.binding.createOrUpdateClientPosition(sessionId, mapName, positionX, positionY, character, clientMac, fixed); } catch (Exception e){ throw ExceptionHandler.checkException(e); *************** *** 117,121 **** public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException, MapException, SessionException{ ! return this.binding.getPositionsForMapSince(sessionId, mapName, timeStamp); } --- 114,118 ---- public PositionDTO[] getPositionsForMapSince(long sessionId, String mapName, long timeStamp) throws RemoteException, MapException, SessionException{ ! return this.binding.getPositionsForMapSince(sessionId, mapName, timeStamp); } |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:52:07
|
Update of /cvsroot/magicmap/magicmapclient/src/edu/uci/ics/jung/visualization In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/edu/uci/ics/jung/visualization Modified Files: PluggableRenderer.java Log Message: + Client is usable without server Index: PluggableRenderer.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/edu/uci/ics/jung/visualization/PluggableRenderer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PluggableRenderer.java 13 Feb 2005 21:36:37 -0000 1.2 --- PluggableRenderer.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 591,595 **** return; } ! Shape s = vertexShapeFunction.getShape(v); g2d.translate(x, y); --- 591,595 ---- return; } ! Shape s = vertexShapeFunction.getShape(v); g2d.translate(x, y); |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:52:07
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/interfaces Modified Files: FetchPositionsCallback.java ServerPollerListener.java MapCallback.java Log Message: + Client is usable without server Index: FetchPositionsCallback.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces/FetchPositionsCallback.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FetchPositionsCallback.java 12 Feb 2005 16:00:28 -0000 1.2 --- FetchPositionsCallback.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 7,11 **** import net.sf.magicmap.server.dto.PositionDTO; - /** * @author thuebner --- 7,10 ---- Index: MapCallback.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces/MapCallback.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MapCallback.java 12 Feb 2005 16:00:28 -0000 1.2 --- MapCallback.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 7,11 **** import net.sf.magicmap.server.dto.MapDTO; - /** * @author thuebner --- 7,10 ---- Index: ServerPollerListener.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/interfaces/ServerPollerListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServerPollerListener.java 12 Feb 2005 16:00:28 -0000 1.2 --- ServerPollerListener.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 7,11 **** import net.sf.magicmap.server.dto.PositionDTO; - /** * @author thuebner --- 7,10 ---- |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:52:06
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/measurement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/measurement Modified Files: UDPScanner.java AbstractScanner.java Log Message: + Client is usable without server Index: UDPScanner.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/measurement/UDPScanner.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UDPScanner.java 14 Apr 2005 10:24:59 -0000 1.2 --- UDPScanner.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 92,96 **** //System.out.println("Paket empfangen: " + recievedStr); ! String ssid; String bssid; --- 92,96 ---- //System.out.println("Paket empfangen: " + recievedStr); ! String ssid; String bssid; *************** *** 119,126 **** clientMac = trim(st.nextToken()); clientAddress = packet.getAddress().toString(); ! Date lastSeenDate = new Date(System.currentTimeMillis()); //@TODO Auch englische Dsatumsformate parsen ! try { lastSeenDate = ScanResult.df.parse(lastSeen); } catch (Exception e){ --- 119,126 ---- clientMac = trim(st.nextToken()); clientAddress = packet.getAddress().toString(); ! Date lastSeenDate = new Date(System.currentTimeMillis()); //@TODO Auch englische Dsatumsformate parsen ! try{ lastSeenDate = ScanResult.df.parse(lastSeen); } catch (Exception e){ Index: AbstractScanner.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/measurement/AbstractScanner.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractScanner.java 14 Apr 2005 10:24:59 -0000 1.2 --- AbstractScanner.java 11 May 2005 10:51:28 -0000 1.3 *************** *** 43,47 **** protected synchronized void notifyScan(ScanResult result){ //System.out.println("Scan: " +result); ! Iterator it = listeners.iterator(); while (it.hasNext()){ ScannerListener l = (ScannerListener) it.next(); --- 43,47 ---- protected synchronized void notifyScan(ScanResult result){ //System.out.println("Scan: " +result); ! Iterator it = listeners.iterator(); while (it.hasNext()){ ScannerListener l = (ScannerListener) it.next(); |
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/server/dto Modified Files: MapDTO.java AccessPointDTO.java PositionDTO.java SignalCharacterDTO.java SimpleScanResultDTO.java ClientDTO.java Log Message: + Client is usable without server Index: ClientDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/ClientDTO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClientDTO.java 12 Feb 2005 16:00:28 -0000 1.1 --- ClientDTO.java 11 May 2005 10:51:30 -0000 1.2 *************** *** 8,186 **** package net.sf.magicmap.server.dto; ! public class ClientDTO implements java.io.Serializable { ! private java.lang.Long id; ! private java.lang.String mac; ! private java.lang.String name; ! ! public ClientDTO() { ! } ! public ClientDTO( ! java.lang.Long id, ! java.lang.String mac, ! java.lang.String name) { ! this.id = id; ! this.mac = mac; ! this.name = name; ! } ! /** ! * Gets the id value for this ClientDTO. ! * ! * @return id ! */ ! public java.lang.Long getId() { ! return id; ! } ! /** ! * Sets the id value for this ClientDTO. ! * ! * @param id ! */ ! public void setId(java.lang.Long id) { ! this.id = id; ! } ! /** ! * Gets the mac value for this ClientDTO. ! * ! * @return mac ! */ ! public java.lang.String getMac() { ! return mac; ! } ! /** ! * Sets the mac value for this ClientDTO. ! * ! * @param mac ! */ ! public void setMac(java.lang.String mac) { ! this.mac = mac; ! } ! /** ! * Gets the name value for this ClientDTO. ! * ! * @return name ! */ ! public java.lang.String getName() { ! return name; } ! /** ! * Sets the name value for this ClientDTO. ! * ! * @param name ! */ ! public void setName(java.lang.String name) { ! this.name = name; } ! ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj) { ! if (!(obj instanceof ClientDTO)) return false; ! ClientDTO other = (ClientDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null) { ! return (__equalsCalc == obj); ! } ! __equalsCalc = obj; ! boolean _equals; ! _equals = true && ! ((this.id==null && other.getId()==null) || ! (this.id!=null && ! this.id.equals(other.getId()))) && ! ((this.mac==null && other.getMac()==null) || ! (this.mac!=null && ! this.mac.equals(other.getMac()))) && ! ((this.name==null && other.getName()==null) || ! (this.name!=null && ! this.name.equals(other.getName()))); ! __equalsCalc = null; ! return _equals; } ! ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode() { ! if (__hashCodeCalc) { ! return 0; ! } ! __hashCodeCalc = true; ! int _hashCode = 1; ! if (getId() != null) { ! _hashCode += getId().hashCode(); ! } ! if (getMac() != null) { ! _hashCode += getMac().hashCode(); ! } ! if (getName() != null) { ! _hashCode += getName().hashCode(); ! } ! __hashCodeCalc = false; ! return _hashCode; } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = ! new org.apache.axis.description.TypeDesc(ClientDTO.class, true); ! static { ! typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO")); ! org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("id"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "id")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("mac"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "mac")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("name"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "name")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc() { ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanSerializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanDeserializer( ! _javaType, _xmlType, typeDesc); ! } ! } --- 8,165 ---- package net.sf.magicmap.server.dto; ! public class ClientDTO implements java.io.Serializable { ! private java.lang.Long id; ! private java.lang.String mac; ! private java.lang.String name; + public ClientDTO() {} ! public ClientDTO(java.lang.Long id, java.lang.String mac, java.lang.String name) { ! this.id = id; ! this.mac = mac; ! this.name = name; ! } + /** + * Gets the id value for this ClientDTO. + * + * @return id + */ + public java.lang.Long getId(){ + return id; + } ! /** ! * Sets the id value for this ClientDTO. ! * ! * @param id ! */ ! public void setId(java.lang.Long id){ ! this.id = id; ! } + /** + * Gets the mac value for this ClientDTO. + * + * @return mac + */ + public java.lang.String getMac(){ + return mac; + } ! /** ! * Sets the mac value for this ClientDTO. ! * ! * @param mac ! */ ! public void setMac(java.lang.String mac){ ! this.mac = mac; ! } + /** + * Gets the name value for this ClientDTO. + * + * @return name + */ + public java.lang.String getName(){ + return name; + } ! /** ! * Sets the name value for this ClientDTO. ! * ! * @param name ! */ ! public void setName(java.lang.String name){ ! this.name = name; ! } + private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj){ ! if (!(obj instanceof ClientDTO)) return false; ! ClientDTO other = (ClientDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null){ ! return (__equalsCalc == obj); } + __equalsCalc = obj; + boolean _equals; + _equals = true + && ((this.id == null && other.getId() == null) || (this.id != null && this.id.equals(other.getId()))) + && ((this.mac == null && other.getMac() == null) || (this.mac != null && this.mac.equals(other.getMac()))) + && ((this.name == null && other.getName() == null) || (this.name != null && this.name.equals(other.getName()))); + __equalsCalc = null; + return _equals; + } + private boolean __hashCodeCalc = false; ! public synchronized int hashCode(){ ! if (__hashCodeCalc){ ! return 0; } ! __hashCodeCalc = true; ! int _hashCode = 1; ! if (getId() != null){ ! _hashCode += getId().hashCode(); } ! if (getMac() != null){ ! _hashCode += getMac().hashCode(); } + if (getName() != null){ + _hashCode += getName().hashCode(); + } + __hashCodeCalc = false; + return _hashCode; + } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ! ClientDTO.class, true); ! static{ ! typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO")); ! org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("id"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "id")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("mac"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "mac")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("name"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "name")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc(){ ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType, ! java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc); ! } ! } \ No newline at end of file Index: PositionDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/PositionDTO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PositionDTO.java 12 Feb 2005 16:00:28 -0000 1.1 --- PositionDTO.java 11 May 2005 10:51:30 -0000 1.2 *************** *** 8,416 **** package net.sf.magicmap.server.dto; ! public class PositionDTO implements java.io.Serializable { ! private net.sf.magicmap.server.dto.AccessPointDTO accessPoint; ! private net.sf.magicmap.server.dto.SignalCharacterDTO character; ! private net.sf.magicmap.server.dto.ClientDTO client; ! private boolean deleted; ! private boolean fixed; ! private java.lang.Long id; ! private java.lang.Long lastModified; ! private java.lang.String name; ! private java.lang.Integer posX; ! private java.lang.Integer posY; ! ! public PositionDTO() { ! } ! ! public PositionDTO( ! net.sf.magicmap.server.dto.AccessPointDTO accessPoint, ! net.sf.magicmap.server.dto.SignalCharacterDTO character, ! net.sf.magicmap.server.dto.ClientDTO client, ! boolean deleted, ! boolean fixed, ! java.lang.Long id, ! java.lang.Long lastModified, ! java.lang.String name, ! java.lang.Integer posX, ! java.lang.Integer posY) { ! this.accessPoint = accessPoint; ! this.character = character; ! this.client = client; ! this.deleted = deleted; ! this.fixed = fixed; ! this.id = id; ! this.lastModified = lastModified; ! this.name = name; ! this.posX = posX; ! this.posY = posY; ! } ! ! /** ! * Gets the accessPoint value for this PositionDTO. ! * ! * @return accessPoint ! */ ! public net.sf.magicmap.server.dto.AccessPointDTO getAccessPoint() { ! return accessPoint; ! } ! /** ! * Sets the accessPoint value for this PositionDTO. ! * ! * @param accessPoint ! */ ! public void setAccessPoint(net.sf.magicmap.server.dto.AccessPointDTO accessPoint) { ! this.accessPoint = accessPoint; ! } ! /** ! * Gets the character value for this PositionDTO. ! * ! * @return character ! */ ! public net.sf.magicmap.server.dto.SignalCharacterDTO getCharacter() { ! return character; ! } ! /** ! * Sets the character value for this PositionDTO. ! * ! * @param character ! */ ! public void setCharacter(net.sf.magicmap.server.dto.SignalCharacterDTO character) { ! this.character = character; ! } ! /** ! * Gets the client value for this PositionDTO. ! * ! * @return client ! */ ! public net.sf.magicmap.server.dto.ClientDTO getClient() { ! return client; ! } ! /** ! * Sets the client value for this PositionDTO. ! * ! * @param client ! */ ! public void setClient(net.sf.magicmap.server.dto.ClientDTO client) { ! this.client = client; ! } ! /** ! * Gets the deleted value for this PositionDTO. ! * ! * @return deleted ! */ ! public boolean isDeleted() { ! return deleted; ! } ! /** ! * Sets the deleted value for this PositionDTO. ! * ! * @param deleted ! */ ! public void setDeleted(boolean deleted) { ! this.deleted = deleted; ! } ! /** ! * Gets the fixed value for this PositionDTO. ! * ! * @return fixed ! */ ! public boolean isFixed() { ! return fixed; ! } ! /** ! * Sets the fixed value for this PositionDTO. ! * ! * @param fixed ! */ ! public void setFixed(boolean fixed) { ! this.fixed = fixed; ! } ! /** ! * Gets the id value for this PositionDTO. ! * ! * @return id ! */ ! public java.lang.Long getId() { ! return id; ! } ! /** ! * Sets the id value for this PositionDTO. ! * ! * @param id ! */ ! public void setId(java.lang.Long id) { ! this.id = id; ! } ! /** ! * Gets the lastModified value for this PositionDTO. ! * ! * @return lastModified ! */ ! public java.lang.Long getLastModified() { ! return lastModified; } ! /** ! * Sets the lastModified value for this PositionDTO. ! * ! * @param lastModified ! */ ! public void setLastModified(java.lang.Long lastModified) { ! this.lastModified = lastModified; } ! ! ! /** ! * Gets the name value for this PositionDTO. ! * ! * @return name ! */ ! public java.lang.String getName() { ! return name; } ! ! ! /** ! * Sets the name value for this PositionDTO. ! * ! * @param name ! */ ! public void setName(java.lang.String name) { ! this.name = name; } ! ! ! /** ! * Gets the posX value for this PositionDTO. ! * ! * @return posX ! */ ! public java.lang.Integer getPosX() { ! return posX; } ! ! ! /** ! * Sets the posX value for this PositionDTO. ! * ! * @param posX ! */ ! public void setPosX(java.lang.Integer posX) { ! this.posX = posX; } ! ! ! /** ! * Gets the posY value for this PositionDTO. ! * ! * @return posY ! */ ! public java.lang.Integer getPosY() { ! return posY; } ! ! ! /** ! * Sets the posY value for this PositionDTO. ! * ! * @param posY ! */ ! public void setPosY(java.lang.Integer posY) { ! this.posY = posY; } ! ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj) { ! if (!(obj instanceof PositionDTO)) return false; ! PositionDTO other = (PositionDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null) { ! return (__equalsCalc == obj); ! } ! __equalsCalc = obj; ! boolean _equals; ! _equals = true && ! ((this.accessPoint==null && other.getAccessPoint()==null) || ! (this.accessPoint!=null && ! this.accessPoint.equals(other.getAccessPoint()))) && ! ((this.character==null && other.getCharacter()==null) || ! (this.character!=null && ! this.character.equals(other.getCharacter()))) && ! ((this.client==null && other.getClient()==null) || ! (this.client!=null && ! this.client.equals(other.getClient()))) && ! this.deleted == other.isDeleted() && ! this.fixed == other.isFixed() && ! ((this.id==null && other.getId()==null) || ! (this.id!=null && ! this.id.equals(other.getId()))) && ! ((this.lastModified==null && other.getLastModified()==null) || ! (this.lastModified!=null && ! this.lastModified.equals(other.getLastModified()))) && ! ((this.name==null && other.getName()==null) || ! (this.name!=null && ! this.name.equals(other.getName()))) && ! ((this.posX==null && other.getPosX()==null) || ! (this.posX!=null && ! this.posX.equals(other.getPosX()))) && ! ((this.posY==null && other.getPosY()==null) || ! (this.posY!=null && ! this.posY.equals(other.getPosY()))); ! __equalsCalc = null; ! return _equals; } ! ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode() { ! if (__hashCodeCalc) { ! return 0; ! } ! __hashCodeCalc = true; ! int _hashCode = 1; ! if (getAccessPoint() != null) { ! _hashCode += getAccessPoint().hashCode(); ! } ! if (getCharacter() != null) { ! _hashCode += getCharacter().hashCode(); ! } ! if (getClient() != null) { ! _hashCode += getClient().hashCode(); ! } ! _hashCode += (isDeleted() ? Boolean.TRUE : Boolean.FALSE).hashCode(); ! _hashCode += (isFixed() ? Boolean.TRUE : Boolean.FALSE).hashCode(); ! if (getId() != null) { ! _hashCode += getId().hashCode(); ! } ! if (getLastModified() != null) { ! _hashCode += getLastModified().hashCode(); ! } ! if (getName() != null) { ! _hashCode += getName().hashCode(); ! } ! if (getPosX() != null) { ! _hashCode += getPosX().hashCode(); ! } ! if (getPosY() != null) { ! _hashCode += getPosY().hashCode(); ! } ! __hashCodeCalc = false; ! return _hashCode; } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = ! new org.apache.axis.description.TypeDesc(PositionDTO.class, true); ! static { ! typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO")); ! org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("accessPoint"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "accessPoint")); ! elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("character"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "character")); ! elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("client"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "client")); ! elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("deleted"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "deleted")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("fixed"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "fixed")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("id"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "id")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("lastModified"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "lastModified")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("name"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "name")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("posX"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "posX")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("posY"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "posY")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int")); ! typeDesc.addFieldDesc(elemField); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc() { ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanSerializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanDeserializer( ! _javaType, _xmlType, typeDesc); ! } ! } --- 8,371 ---- package net.sf.magicmap.server.dto; ! public class PositionDTO implements java.io.Serializable { ! private net.sf.magicmap.server.dto.AccessPointDTO accessPoint; ! private net.sf.magicmap.server.dto.SignalCharacterDTO character; ! private net.sf.magicmap.server.dto.ClientDTO client; ! private boolean deleted; ! private boolean fixed; ! private java.lang.Long id; ! private java.lang.Long lastModified; ! private java.lang.String name; ! private java.lang.Integer posX; ! private java.lang.Integer posY; + public PositionDTO() {} ! public PositionDTO(net.sf.magicmap.server.dto.AccessPointDTO accessPoint, ! net.sf.magicmap.server.dto.SignalCharacterDTO character, net.sf.magicmap.server.dto.ClientDTO client, ! boolean deleted, boolean fixed, java.lang.Long id, java.lang.Long lastModified, java.lang.String name, ! java.lang.Integer posX, java.lang.Integer posY) { ! this.accessPoint = accessPoint; ! this.character = character; ! this.client = client; ! this.deleted = deleted; ! this.fixed = fixed; ! this.id = id; ! this.lastModified = lastModified; ! this.name = name; ! this.posX = posX; ! this.posY = posY; ! } + /** + * Gets the accessPoint value for this PositionDTO. + * + * @return accessPoint + */ + public net.sf.magicmap.server.dto.AccessPointDTO getAccessPoint(){ + return accessPoint; + } ! /** ! * Sets the accessPoint value for this PositionDTO. ! * ! * @param accessPoint ! */ ! public void setAccessPoint(net.sf.magicmap.server.dto.AccessPointDTO accessPoint){ ! this.accessPoint = accessPoint; ! } + /** + * Gets the character value for this PositionDTO. + * + * @return character + */ + public net.sf.magicmap.server.dto.SignalCharacterDTO getCharacter(){ + return character; + } ! /** ! * Sets the character value for this PositionDTO. ! * ! * @param character ! */ ! public void setCharacter(net.sf.magicmap.server.dto.SignalCharacterDTO character){ ! this.character = character; ! } + /** + * Gets the client value for this PositionDTO. + * + * @return client + */ + public net.sf.magicmap.server.dto.ClientDTO getClient(){ + return client; + } ! /** ! * Sets the client value for this PositionDTO. ! * ! * @param client ! */ ! public void setClient(net.sf.magicmap.server.dto.ClientDTO client){ ! this.client = client; ! } + /** + * Gets the deleted value for this PositionDTO. + * + * @return deleted + */ + public boolean isDeleted(){ + return deleted; + } ! /** ! * Sets the deleted value for this PositionDTO. ! * ! * @param deleted ! */ ! public void setDeleted(boolean deleted){ ! this.deleted = deleted; ! } + /** + * Gets the fixed value for this PositionDTO. + * + * @return fixed + */ + public boolean isFixed(){ + return fixed; + } ! /** ! * Sets the fixed value for this PositionDTO. ! * ! * @param fixed ! */ ! public void setFixed(boolean fixed){ ! this.fixed = fixed; ! } + /** + * Gets the id value for this PositionDTO. + * + * @return id + */ + public java.lang.Long getId(){ + return id; + } ! /** ! * Sets the id value for this PositionDTO. ! * ! * @param id ! */ ! public void setId(java.lang.Long id){ ! this.id = id; ! } + /** + * Gets the lastModified value for this PositionDTO. + * + * @return lastModified + */ + public java.lang.Long getLastModified(){ + return lastModified; + } ! /** ! * Sets the lastModified value for this PositionDTO. ! * ! * @param lastModified ! */ ! public void setLastModified(java.lang.Long lastModified){ ! this.lastModified = lastModified; ! } + /** + * Gets the name value for this PositionDTO. + * + * @return name + */ + public java.lang.String getName(){ + return name; + } ! /** ! * Sets the name value for this PositionDTO. ! * ! * @param name ! */ ! public void setName(java.lang.String name){ ! this.name = name; ! } + /** + * Gets the posX value for this PositionDTO. + * + * @return posX + */ + public java.lang.Integer getPosX(){ + return posX; + } ! /** ! * Sets the posX value for this PositionDTO. ! * ! * @param posX ! */ ! public void setPosX(java.lang.Integer posX){ ! this.posX = posX; ! } + /** + * Gets the posY value for this PositionDTO. + * + * @return posY + */ + public java.lang.Integer getPosY(){ + return posY; + } ! /** ! * Sets the posY value for this PositionDTO. ! * ! * @param posY ! */ ! public void setPosY(java.lang.Integer posY){ ! this.posY = posY; ! } + private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj){ ! if (!(obj instanceof PositionDTO)) return false; ! PositionDTO other = (PositionDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null){ ! return (__equalsCalc == obj); } + __equalsCalc = obj; + boolean _equals; + _equals = true + && ((this.accessPoint == null && other.getAccessPoint() == null) || (this.accessPoint != null && this.accessPoint + .equals(other.getAccessPoint()))) + && ((this.character == null && other.getCharacter() == null) || (this.character != null && this.character + .equals(other.getCharacter()))) + && ((this.client == null && other.getClient() == null) || (this.client != null && this.client.equals(other + .getClient()))) + && this.deleted == other.isDeleted() + && this.fixed == other.isFixed() + && ((this.id == null && other.getId() == null) || (this.id != null && this.id.equals(other.getId()))) + && ((this.lastModified == null && other.getLastModified() == null) || (this.lastModified != null && this.lastModified + .equals(other.getLastModified()))) + && ((this.name == null && other.getName() == null) || (this.name != null && this.name.equals(other.getName()))) + && ((this.posX == null && other.getPosX() == null) || (this.posX != null && this.posX.equals(other.getPosX()))) + && ((this.posY == null && other.getPosY() == null) || (this.posY != null && this.posY.equals(other.getPosY()))); + __equalsCalc = null; + return _equals; + } + private boolean __hashCodeCalc = false; ! public synchronized int hashCode(){ ! if (__hashCodeCalc){ ! return 0; } ! __hashCodeCalc = true; ! int _hashCode = 1; ! if (getAccessPoint() != null){ ! _hashCode += getAccessPoint().hashCode(); } ! if (getCharacter() != null){ ! _hashCode += getCharacter().hashCode(); } ! if (getClient() != null){ ! _hashCode += getClient().hashCode(); } ! _hashCode += (isDeleted() ? Boolean.TRUE : Boolean.FALSE).hashCode(); ! _hashCode += (isFixed() ? Boolean.TRUE : Boolean.FALSE).hashCode(); ! if (getId() != null){ ! _hashCode += getId().hashCode(); } ! if (getLastModified() != null){ ! _hashCode += getLastModified().hashCode(); } ! if (getName() != null){ ! _hashCode += getName().hashCode(); } ! if (getPosX() != null){ ! _hashCode += getPosX().hashCode(); } ! if (getPosY() != null){ ! _hashCode += getPosY().hashCode(); } + __hashCodeCalc = false; + return _hashCode; + } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ! PositionDTO.class, true); ! static{ ! typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO")); ! org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("accessPoint"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "accessPoint")); ! elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("character"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "character")); ! elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("client"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "client")); ! elemField.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("deleted"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "deleted")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("fixed"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "fixed")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("id"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "id")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("lastModified"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "lastModified")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("name"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "name")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("posX"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "posX")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("posY"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "posY")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int")); ! typeDesc.addFieldDesc(elemField); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc(){ ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType, ! java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc); ! } ! } \ No newline at end of file Index: AccessPointDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/AccessPointDTO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AccessPointDTO.java 12 Feb 2005 16:00:28 -0000 1.1 --- AccessPointDTO.java 11 May 2005 10:51:30 -0000 1.2 *************** *** 8,186 **** package net.sf.magicmap.server.dto; ! public class AccessPointDTO implements java.io.Serializable { ! private java.lang.Long id; ! private java.lang.String mac; ! private java.lang.String ssid; ! ! public AccessPointDTO() { ! } ! public AccessPointDTO( ! java.lang.Long id, ! java.lang.String mac, ! java.lang.String ssid) { ! this.id = id; ! this.mac = mac; ! this.ssid = ssid; ! } ! /** ! * Gets the id value for this AccessPointDTO. ! * ! * @return id ! */ ! public java.lang.Long getId() { ! return id; ! } ! /** ! * Sets the id value for this AccessPointDTO. ! * ! * @param id ! */ ! public void setId(java.lang.Long id) { ! this.id = id; ! } ! /** ! * Gets the mac value for this AccessPointDTO. ! * ! * @return mac ! */ ! public java.lang.String getMac() { ! return mac; ! } ! /** ! * Sets the mac value for this AccessPointDTO. ! * ! * @param mac ! */ ! public void setMac(java.lang.String mac) { ! this.mac = mac; ! } ! /** ! * Gets the ssid value for this AccessPointDTO. ! * ! * @return ssid ! */ ! public java.lang.String getSsid() { ! return ssid; } ! /** ! * Sets the ssid value for this AccessPointDTO. ! * ! * @param ssid ! */ ! public void setSsid(java.lang.String ssid) { ! this.ssid = ssid; } ! ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj) { ! if (!(obj instanceof AccessPointDTO)) return false; ! AccessPointDTO other = (AccessPointDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null) { ! return (__equalsCalc == obj); ! } ! __equalsCalc = obj; ! boolean _equals; ! _equals = true && ! ((this.id==null && other.getId()==null) || ! (this.id!=null && ! this.id.equals(other.getId()))) && ! ((this.mac==null && other.getMac()==null) || ! (this.mac!=null && ! this.mac.equals(other.getMac()))) && ! ((this.ssid==null && other.getSsid()==null) || ! (this.ssid!=null && ! this.ssid.equals(other.getSsid()))); ! __equalsCalc = null; ! return _equals; } ! ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode() { ! if (__hashCodeCalc) { ! return 0; ! } ! __hashCodeCalc = true; ! int _hashCode = 1; ! if (getId() != null) { ! _hashCode += getId().hashCode(); ! } ! if (getMac() != null) { ! _hashCode += getMac().hashCode(); ! } ! if (getSsid() != null) { ! _hashCode += getSsid().hashCode(); ! } ! __hashCodeCalc = false; ! return _hashCode; } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = ! new org.apache.axis.description.TypeDesc(AccessPointDTO.class, true); ! static { ! typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO")); ! org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("id"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "id")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("mac"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "mac")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("ssid"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "ssid")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc() { ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanSerializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanDeserializer( ! _javaType, _xmlType, typeDesc); ! } ! } --- 8,165 ---- package net.sf.magicmap.server.dto; ! public class AccessPointDTO implements java.io.Serializable { ! private java.lang.Long id; ! private java.lang.String mac; ! private java.lang.String ssid; + public AccessPointDTO() {} ! public AccessPointDTO(java.lang.Long id, java.lang.String mac, java.lang.String ssid) { ! this.id = id; ! this.mac = mac; ! this.ssid = ssid; ! } + /** + * Gets the id value for this AccessPointDTO. + * + * @return id + */ + public java.lang.Long getId(){ + return id; + } ! /** ! * Sets the id value for this AccessPointDTO. ! * ! * @param id ! */ ! public void setId(java.lang.Long id){ ! this.id = id; ! } + /** + * Gets the mac value for this AccessPointDTO. + * + * @return mac + */ + public java.lang.String getMac(){ + return mac; + } ! /** ! * Sets the mac value for this AccessPointDTO. ! * ! * @param mac ! */ ! public void setMac(java.lang.String mac){ ! this.mac = mac; ! } + /** + * Gets the ssid value for this AccessPointDTO. + * + * @return ssid + */ + public java.lang.String getSsid(){ + return ssid; + } ! /** ! * Sets the ssid value for this AccessPointDTO. ! * ! * @param ssid ! */ ! public void setSsid(java.lang.String ssid){ ! this.ssid = ssid; ! } + private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj){ ! if (!(obj instanceof AccessPointDTO)) return false; ! AccessPointDTO other = (AccessPointDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null){ ! return (__equalsCalc == obj); } + __equalsCalc = obj; + boolean _equals; + _equals = true + && ((this.id == null && other.getId() == null) || (this.id != null && this.id.equals(other.getId()))) + && ((this.mac == null && other.getMac() == null) || (this.mac != null && this.mac.equals(other.getMac()))) + && ((this.ssid == null && other.getSsid() == null) || (this.ssid != null && this.ssid.equals(other.getSsid()))); + __equalsCalc = null; + return _equals; + } + private boolean __hashCodeCalc = false; ! public synchronized int hashCode(){ ! if (__hashCodeCalc){ ! return 0; } ! __hashCodeCalc = true; ! int _hashCode = 1; ! if (getId() != null){ ! _hashCode += getId().hashCode(); } ! if (getMac() != null){ ! _hashCode += getMac().hashCode(); } + if (getSsid() != null){ + _hashCode += getSsid().hashCode(); + } + __hashCodeCalc = false; + return _hashCode; + } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ! AccessPointDTO.class, true); ! static{ ! typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO")); ! org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("id"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "id")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("mac"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "mac")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("ssid"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "ssid")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc(){ ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType, ! java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc); ! } ! } \ No newline at end of file Index: SimpleScanResultDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/dto/SimpleScanResultDTO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimpleScanResultDTO.java 13 Feb 2005 22:27:52 -0000 1.2 --- SimpleScanResultDTO.java 11 May 2005 10:51:30 -0000 1.3 *************** *** 8,254 **** package net.sf.magicmap.server.dto; ! public class SimpleScanResultDTO implements java.io.Serializable { ! private java.util.Calendar lastSeen; ! private java.lang.String macAP; ! private java.lang.Double noise; ! private java.lang.Double signalLevel; ! private java.lang.String ssid; ! ! public SimpleScanResultDTO() { ! } ! public SimpleScanResultDTO( ! java.util.Calendar lastSeen, ! java.lang.String macAP, ! java.lang.Double noise, ! java.lang.Double signalLevel, ! java.lang.String ssid) { ! this.lastSeen = lastSeen; ! this.macAP = macAP; ! this.noise = noise; ! this.signalLevel = signalLevel; ! this.ssid = ssid; ! } ! /** ! * Gets the lastSeen value for this SimpleScanResultDTO. ! * ! * @return lastSeen ! */ ! public java.util.Calendar getLastSeen() { ! return lastSeen; ! } ! /** ! * Sets the lastSeen value for this SimpleScanResultDTO. ! * ! * @param lastSeen ! */ ! public void setLastSeen(java.util.Calendar lastSeen) { ! this.lastSeen = lastSeen; ! } ! /** ! * Gets the macAP value for this SimpleScanResultDTO. ! * ! * @return macAP ! */ ! public java.lang.String getMacAP() { ! return macAP; ! } ! /** ! * Sets the macAP value for this SimpleScanResultDTO. ! * ! * @param macAP ! */ ! public void setMacAP(java.lang.String macAP) { ! this.macAP = macAP; ! } ! /** ! * Gets the noise value for this SimpleScanResultDTO. ! * ! * @return noise ! */ ! public java.lang.Double getNoise() { ! return noise; ! } ! /** ! * Sets the noise value for this SimpleScanResultDTO. ! * ! * @param noise ! */ ! public void setNoise(java.lang.Double noise) { ! this.noise = noise; ! } ! /** ! * Gets the signalLevel value for this SimpleScanResultDTO. ! * ! * @return signalLevel ! */ ! public java.lang.Double getSignalLevel() { ! return signalLevel; } ! /** ! * Sets the signalLevel value for this SimpleScanResultDTO. ! * ! * @param signalLevel ! */ ! public void setSignalLevel(java.lang.Double signalLevel) { ! this.signalLevel = signalLevel; } ! ! ! /** ! * Gets the ssid value for this SimpleScanResultDTO. ! * ! * @return ssid ! */ ! public java.lang.String getSsid() { ! return ssid; } ! ! ! /** ! * Sets the ssid value for this SimpleScanResultDTO. ! * ! * @param ssid ! */ ! public void setSsid(java.lang.String ssid) { ! this.ssid = ssid; } ! ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj) { ! if (!(obj instanceof SimpleScanResultDTO)) return false; ! SimpleScanResultDTO other = (SimpleScanResultDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null) { ! return (__equalsCalc == obj); ! } ! __equalsCalc = obj; ! boolean _equals; ! _equals = true && ! ((this.lastSeen==null && other.getLastSeen()==null) || ! (this.lastSeen!=null && ! this.lastSeen.equals(other.getLastSeen()))) && ! ((this.macAP==null && other.getMacAP()==null) || ! (this.macAP!=null && ! this.macAP.equals(other.getMacAP()))) && ! ((this.noise==null && other.getNoise()==null) || ! (this.noise!=null && ! this.noise.equals(other.getNoise()))) && ! ((this.signalLevel==null && other.getSignalLevel()==null) || ! (this.signalLevel!=null && ! this.signalLevel.equals(other.getSignalLevel()))) && ! ((this.ssid==null && other.getSsid()==null) || ! (this.ssid!=null && ! this.ssid.equals(other.getSsid()))); ! __equalsCalc = null; ! return _equals; } ! ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode() { ! if (__hashCodeCalc) { ! return 0; ! } ! __hashCodeCalc = true; ! int _hashCode = 1; ! if (getLastSeen() != null) { ! _hashCode += getLastSeen().hashCode(); ! } ! if (getMacAP() != null) { ! _hashCode += getMacAP().hashCode(); ! } ! if (getNoise() != null) { ! _hashCode += getNoise().hashCode(); ! } ! if (getSignalLevel() != null) { ! _hashCode += getSignalLevel().hashCode(); ! } ! if (getSsid() != null) { ! _hashCode += getSsid().hashCode(); ! } ! __hashCodeCalc = false; ! return _hashCode; } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = ! new org.apache.axis.description.TypeDesc(SimpleScanResultDTO.class, true); ! static { ! typeDesc.setXmlType(new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SimpleScanResultDTO")); ! org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("lastSeen"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "lastSeen")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "dateTime")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("macAP"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "macAP")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("noise"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "noise")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "double")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("signalLevel"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "signalLevel")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "double")); ! typeDesc.addFieldDesc(elemField); ! elemField = new org.apache.axis.description.ElementDesc(); ! elemField.setFieldName("ssid"); ! elemField.setXmlName(new javax.xml.namespace.QName("", "ssid")); ! elemField.setXmlType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); ! typeDesc.addFieldDesc(elemField); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc() { ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanSerializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanDeserializer( ! _javaType, _xmlType, typeDesc); ! } ! } --- 8,228 ---- package net.sf.magicmap.server.dto; ! public class SimpleScanResultDTO implements java.io.Serializable { ! private java.util.Calendar lastSeen; ! private java.lang.String macAP; ! private java.lang.Double noise; ! private java.lang.Double signalLevel; ! private java.lang.String ssid; + public SimpleScanResultDTO() {} ! public SimpleScanResultDTO(java.util.Calendar lastSeen, java.lang.String macAP, java.lang.Double noise, ! java.lang.Double signalLevel, java.lang.String ssid) { ! this.lastSeen = lastSeen; ! this.macAP = macAP; ! this.noise = noise; ! this.signalLevel = signalLevel; ! this.ssid = ssid; ! } + /** + * Gets the lastSeen value for this SimpleScanResultDTO. + * + * @return lastSeen + */ + public java.util.Calendar getLastSeen(){ + return lastSeen; + } ! /** ! * Sets the lastSeen value for this SimpleScanResultDTO. ! * ! * @param lastSeen ! */ ! public void setLastSeen(java.util.Calendar lastSeen){ ! this.lastSeen = lastSeen; ! } + /** + * Gets the macAP value for this SimpleScanResultDTO. + * + * @return macAP + */ + public java.lang.String getMacAP(){ + return macAP; + } ! /** ! * Sets the macAP value for this SimpleScanResultDTO. ! * ! * @param macAP ! */ ! public void setMacAP(java.lang.String macAP){ ! this.macAP = macAP; ! } + /** + * Gets the noise value for this SimpleScanResultDTO. + * + * @return noise + */ + public java.lang.Double getNoise(){ + return noise; + } ! /** ! * Sets the noise value for this SimpleScanResultDTO. ! * ! * @param noise ! */ ! public void setNoise(java.lang.Double noise){ ! this.noise = noise; ! } + /** + * Gets the signalLevel value for this SimpleScanResultDTO. + * + * @return signalLevel + */ + public java.lang.Double getSignalLevel(){ + return signalLevel; + } ! /** ! * Sets the signalLevel value for this SimpleScanResultDTO. ! * ! * @param signalLevel ! */ ! public void setSignalLevel(java.lang.Double signalLevel){ ! this.signalLevel = signalLevel; ! } + /** + * Gets the ssid value for this SimpleScanResultDTO. + * + * @return ssid + */ + public java.lang.String getSsid(){ + return ssid; + } ! /** ! * Sets the ssid value for this SimpleScanResultDTO. ! * ! * @param ssid ! */ ! public void setSsid(java.lang.String ssid){ ! this.ssid = ssid; ! } + private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj){ ! if (!(obj instanceof SimpleScanResultDTO)) return false; ! SimpleScanResultDTO other = (SimpleScanResultDTO) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null){ ! return (__equalsCalc == obj); } + __equalsCalc = obj; + boolean _equals; + _equals = true + && ((this.lastSeen == null && other.getLastSeen() == null) || (this.lastSeen != null && this.lastSeen + .equals(other.getLastSeen()))) + && ((this.macAP == null && other.getMacAP() == null) || (this.macAP != null && this.macAP.equals(other + .getMacAP()))) + && ((this.noise == null && other.getNoise() == null) || (this.noise != null && this.noise.equals(other + .getNoise()))) + && ((this.signalLevel == null && other.getSignalLevel() == null) || (this.signalLevel != null && this.signalLevel + .equals(other.getSignalLevel()))) + && ((this.ssid == null && ... [truncated message content] |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:51:56
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/exception In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/server/exception Modified Files: AuthenticationException.java SessionException.java MapException.java Log Message: + Client is usable without server Index: MapException.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/exception/MapException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapException.java 16 Feb 2005 09:02:31 -0000 1.3 --- MapException.java 11 May 2005 10:51:31 -0000 1.4 *************** *** 8,95 **** package net.sf.magicmap.server.exception; ! public class MapException extends org.apache.axis.AxisFault implements java.io.Serializable { ! public MapException() { ! } ! /** ! * @param message ! */ ! public MapException(String message) { ! super(message); ! } ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj) { ! if (!(obj instanceof MapException)) return false; ! MapException other = (MapException) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null) { ! return (__equalsCalc == obj); ! } ! __equalsCalc = obj; ! boolean _equals; ! _equals = true; ! __equalsCalc = null; ! return _equals; ! } ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode() { ! if (__hashCodeCalc) { ! return 0; ! } ! __hashCodeCalc = true; ! int _hashCode = 1; ! __hashCodeCalc = false; ! return _hashCode; } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = ! new org.apache.axis.description.TypeDesc(MapException.class, true); ! static { ! typeDesc.setXmlType(new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException")); } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc() { ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanSerializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanDeserializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Writes the exception data to the faultDetails ! */ ! public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) throws java.io.IOException { ! context.serialize(qname, null, this); ! } ! } --- 8,88 ---- package net.sf.magicmap.server.exception; ! public class MapException extends org.apache.axis.AxisFault implements java.io.Serializable { ! public MapException() {} ! /** ! * @param message ! */ ! public MapException(String message) { ! super(message); ! } ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj){ ! if (!(obj instanceof MapException)) return false; ! MapException other = (MapException) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null){ ! return (__equalsCalc == obj); } + __equalsCalc = obj; + boolean _equals; + _equals = true; + __equalsCalc = null; + return _equals; + } ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode(){ ! if (__hashCodeCalc){ ! return 0; } + __hashCodeCalc = true; + int _hashCode = 1; + __hashCodeCalc = false; + return _hashCode; + } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ! MapException.class, true); ! static{ ! typeDesc.setXmlType(new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException")); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc(){ ! return typeDesc; ! } + /** + * Get Custom Serializer + */ + public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType, + javax.xml.namespace.QName _xmlType){ + return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc); + } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType, ! java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc); ! } ! ! /** ! * Writes the exception data to the faultDetails ! */ ! public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) ! throws java.io.IOException{ ! context.serialize(qname, null, this); ! } ! } \ No newline at end of file Index: SessionException.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/exception/SessionException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SessionException.java 12 Feb 2005 16:00:29 -0000 1.1 --- SessionException.java 11 May 2005 10:51:31 -0000 1.2 *************** *** 8,95 **** package net.sf.magicmap.server.exception; ! public class SessionException extends org.apache.axis.AxisFault implements java.io.Serializable { ! public SessionException() { ! } ! /** ! * @param message ! */ ! public SessionException(String message) { ! super(message); ! } ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj) { ! if (!(obj instanceof SessionException)) return false; ! SessionException other = (SessionException) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null) { ! return (__equalsCalc == obj); ! } ! __equalsCalc = obj; ! boolean _equals; ! _equals = true; ! __equalsCalc = null; ! return _equals; ! } ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode() { ! if (__hashCodeCalc) { ! return 0; ! } ! __hashCodeCalc = true; ! int _hashCode = 1; ! __hashCodeCalc = false; ! return _hashCode; } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = ! new org.apache.axis.description.TypeDesc(SessionException.class, true); ! static { ! typeDesc.setXmlType(new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException")); } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc() { ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanSerializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanDeserializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Writes the exception data to the faultDetails ! */ ! public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) throws java.io.IOException { ! context.serialize(qname, null, this); ! } ! } --- 8,88 ---- package net.sf.magicmap.server.exception; ! public class SessionException extends org.apache.axis.AxisFault implements java.io.Serializable { ! public SessionException() {} ! /** ! * @param message ! */ ! public SessionException(String message) { ! super(message); ! } ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj){ ! if (!(obj instanceof SessionException)) return false; ! SessionException other = (SessionException) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null){ ! return (__equalsCalc == obj); } + __equalsCalc = obj; + boolean _equals; + _equals = true; + __equalsCalc = null; + return _equals; + } ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode(){ ! if (__hashCodeCalc){ ! return 0; } + __hashCodeCalc = true; + int _hashCode = 1; + __hashCodeCalc = false; + return _hashCode; + } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ! SessionException.class, true); ! static{ ! typeDesc.setXmlType(new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException")); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc(){ ! return typeDesc; ! } + /** + * Get Custom Serializer + */ + public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType, + javax.xml.namespace.QName _xmlType){ + return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc); + } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType, ! java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc); ! } ! ! /** ! * Writes the exception data to the faultDetails ! */ ! public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) ! throws java.io.IOException{ ! context.serialize(qname, null, this); ! } ! } \ No newline at end of file Index: AuthenticationException.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/exception/AuthenticationException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AuthenticationException.java 12 Feb 2005 16:00:29 -0000 1.1 --- AuthenticationException.java 11 May 2005 10:51:31 -0000 1.2 *************** *** 8,95 **** package net.sf.magicmap.server.exception; ! public class AuthenticationException extends org.apache.axis.AxisFault implements java.io.Serializable { ! public AuthenticationException() { ! } ! /** ! * @param message ! */ ! public AuthenticationException(String message) { ! super(message); ! } ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj) { ! if (!(obj instanceof AuthenticationException)) return false; ! AuthenticationException other = (AuthenticationException) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null) { ! return (__equalsCalc == obj); ! } ! __equalsCalc = obj; ! boolean _equals; ! _equals = true; ! __equalsCalc = null; ! return _equals; ! } ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode() { ! if (__hashCodeCalc) { ! return 0; ! } ! __hashCodeCalc = true; ! int _hashCode = 1; ! __hashCodeCalc = false; ! return _hashCode; } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = ! new org.apache.axis.description.TypeDesc(AuthenticationException.class, true); ! static { ! typeDesc.setXmlType(new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "AuthenticationException")); } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc() { ! return typeDesc; ! } ! /** ! * Get Custom Serializer ! */ ! public static org.apache.axis.encoding.Serializer getSerializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanSerializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer( ! java.lang.String mechType, ! java.lang.Class _javaType, ! javax.xml.namespace.QName _xmlType) { ! return ! new org.apache.axis.encoding.ser.BeanDeserializer( ! _javaType, _xmlType, typeDesc); ! } ! /** ! * Writes the exception data to the faultDetails ! */ ! public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) throws java.io.IOException { ! context.serialize(qname, null, this); ! } ! } --- 8,89 ---- package net.sf.magicmap.server.exception; ! public class AuthenticationException extends org.apache.axis.AxisFault implements java.io.Serializable { ! public AuthenticationException() {} ! /** ! * @param message ! */ ! public AuthenticationException(String message) { ! super(message); ! } ! private java.lang.Object __equalsCalc = null; ! public synchronized boolean equals(java.lang.Object obj){ ! if (!(obj instanceof AuthenticationException)) return false; ! AuthenticationException other = (AuthenticationException) obj; ! if (obj == null) return false; ! if (this == obj) return true; ! if (__equalsCalc != null){ ! return (__equalsCalc == obj); } + __equalsCalc = obj; + boolean _equals; + _equals = true; + __equalsCalc = null; + return _equals; + } ! private boolean __hashCodeCalc = false; ! public synchronized int hashCode(){ ! if (__hashCodeCalc){ ! return 0; } + __hashCodeCalc = true; + int _hashCode = 1; + __hashCodeCalc = false; + return _hashCode; + } ! // Type metadata ! private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc( ! AuthenticationException.class, true); ! static{ ! typeDesc.setXmlType(new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", ! "AuthenticationException")); ! } ! /** ! * Return type metadata object ! */ ! public static org.apache.axis.description.TypeDesc getTypeDesc(){ ! return typeDesc; ! } + /** + * Get Custom Serializer + */ + public static org.apache.axis.encoding.Serializer getSerializer(java.lang.String mechType, java.lang.Class _javaType, + javax.xml.namespace.QName _xmlType){ + return new org.apache.axis.encoding.ser.BeanSerializer(_javaType, _xmlType, typeDesc); + } ! /** ! * Get Custom Deserializer ! */ ! public static org.apache.axis.encoding.Deserializer getDeserializer(java.lang.String mechType, ! java.lang.Class _javaType, javax.xml.namespace.QName _xmlType){ ! return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType, _xmlType, typeDesc); ! } ! ! /** ! * Writes the exception data to the faultDetails ! */ ! public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) ! throws java.io.IOException{ ! context.serialize(qname, null, this); ! } ! } \ No newline at end of file |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:51:56
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java MainGUI.java ViewTabPanel.java Log Message: + Client is usable without server Index: ViewTabPanel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/ViewTabPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ViewTabPanel.java 13 Feb 2005 21:36:38 -0000 1.2 --- ViewTabPanel.java 11 May 2005 10:51:31 -0000 1.3 *************** *** 32,36 **** private JToolBar toolBar; ! ArrayList viewList; private ArrayList buttonList; private View active; --- 32,36 ---- private JToolBar toolBar; ! ArrayList viewList; private ArrayList buttonList; private View active; Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainGUI.java 16 Feb 2005 09:02:02 -0000 1.4 --- MainGUI.java 11 May 2005 10:51:31 -0000 1.5 *************** *** 91,101 **** private AbstractAction exitAction; private AbstractAction aboutAction; ! MapView mapView; private MagicAction invisibleAction; private MagicAction showAccessPoints; private MagicAction showLocations; private MagicAction showClients; ! MagicAction showEdgesBetweenLocations; ! MagicAction showEdges; /** --- 91,101 ---- private AbstractAction exitAction; private AbstractAction aboutAction; ! MapView mapView; private MagicAction invisibleAction; private MagicAction showAccessPoints; private MagicAction showLocations; private MagicAction showClients; ! MagicAction showEdgesBetweenLocations; ! MagicAction showEdges; /** *************** *** 163,168 **** } ! public void buildActions() { ! connectAction = new MagicAction("connect",GUIConstants.ICON_CONNECT,"connecttooltip") { public void actionPerformed(ActionEvent e){ ServerConnectionInfo info = new ServerConnectionInfo(); --- 163,169 ---- } ! public void buildActions(){ ! connectAction = new MagicAction("connect", GUIConstants.ICON_CONNECT, "connecttooltip") { ! public void actionPerformed(ActionEvent e){ ServerConnectionInfo info = new ServerConnectionInfo(); *************** *** 171,257 **** info.name = Settings.getClientName(); info.password = Settings.getClientPassword(); ! info = ConnectServerDialog.showDialog(MainGUI.this,info); ! if (info != null) { Settings.setClientName(info.name); Settings.setClientPassword(info.password); Settings.setServerURL(info.hostname, info.port); connect(); } ! }}; ! setProxyAction = new MagicAction("setproxy",GUIConstants.ICON_CONNECT,"setproxytooltip") { ! public void actionPerformed(ActionEvent e){ ! SetProxyDialog.showDialog(MainGUI.this); ! }}; - disconnectAction = new MagicAction("disconnect",GUIConstants.ICON_DISCONNECT,"disconnecttooltip") { public void actionPerformed(ActionEvent e){ Controller.getInstance().disconnect(MainGUI.this); ! }}; ! ! newMapAction = new MagicAction("newmap",GUIConstants.ICON_NEWMAP,"newmaptooltip") { public void actionPerformed(ActionEvent e){ MapInfo info = NewMapDialog.showDialog(MainGUI.this); ! if (info != null) { Controller.getInstance().createNewMap(info.name, info.imageURL, info.width, info.height, MainGUI.this); } ! }}; ! loadMapAction = new MagicAction("loadmap", GUIConstants.ICON_LOADMAP,"loadmaptooltip") { public void actionPerformed(ActionEvent e){ Controller.getInstance().retrieveMapNames(MainGUI.this); ! }}; ! ! exitAction = new MagicAction("exit",GUIConstants.ICON_EXIT,"exit") { public void actionPerformed(ActionEvent e){ MainGUI.this.setVisible(false); ! System.exit(0); ! ! }}; aboutAction = new MagicAction("about") { public void actionPerformed(ActionEvent e){ ! JOptionPane.showMessageDialog(MainGUI.this, "MagicMap - Version " + Version.getVersion() +"\n\nHumboldt-Universität zu Berlin\nInstitut für Informatik, Peter Ibach, Tobias Hübner, Martin Schweigert",GUIUtils.i18n("about",false),JOptionPane.PLAIN_MESSAGE); ! }}; ! ! ! invisibleAction = new MagicAction("invisible",GUIConstants.ICON_INVISIBLE,"invisibletooltip") { public void actionPerformed(ActionEvent e){ toogleInvisible(); ! }}; ! ! showAccessPoints = new MagicAction("showaccesspoints") { ! public void actionPerformed(ActionEvent e){ ! mapView.setShowAccessPoints(showAccessPoints.isSelected()); ! }}; ! ! showLocations = new MagicAction("showlocations") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowLocations(showLocations.isSelected()); ! }}; ! ! showClients = new MagicAction("showclients") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowClients(showClients.isSelected()); ! }}; ! ! showEdgesBetweenLocations = new MagicAction("showedgesbetweenlocations") { ! public void actionPerformed(ActionEvent e){ mapView.setShowEdgesBetweenLocations(showEdgesBetweenLocations.isSelected()); ! ! }}; ! ! showEdges = new MagicAction("showedges") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowEdges(showEdges.isSelected()); ! ! }}; ! ! invisibleAction.setEnabled(false); disconnectAction.setEnabled(false); --- 172,282 ---- info.name = Settings.getClientName(); info.password = Settings.getClientPassword(); ! info.useNoServer = Settings.isUseNoServer(); ! info = ConnectServerDialog.showDialog(MainGUI.this, info); ! if (info != null){ Settings.setClientName(info.name); Settings.setClientPassword(info.password); Settings.setServerURL(info.hostname, info.port); + Settings.setUseNoServer(info.useNoServer); connect(); } ! } ! }; ! setProxyAction = new MagicAction("setproxy", GUIConstants.ICON_CONNECT, "setproxytooltip") { ! ! public void actionPerformed(ActionEvent e){ ! SetProxyDialog.showDialog(MainGUI.this); ! } ! }; ! ! disconnectAction = new MagicAction("disconnect", GUIConstants.ICON_DISCONNECT, "disconnecttooltip") { public void actionPerformed(ActionEvent e){ Controller.getInstance().disconnect(MainGUI.this); ! } ! }; ! ! newMapAction = new MagicAction("newmap", GUIConstants.ICON_NEWMAP, "newmaptooltip") { ! public void actionPerformed(ActionEvent e){ MapInfo info = NewMapDialog.showDialog(MainGUI.this); ! if (info != null){ Controller.getInstance().createNewMap(info.name, info.imageURL, info.width, info.height, MainGUI.this); } ! } ! }; ! loadMapAction = new MagicAction("loadmap", GUIConstants.ICON_LOADMAP, "loadmaptooltip") { ! public void actionPerformed(ActionEvent e){ Controller.getInstance().retrieveMapNames(MainGUI.this); ! } ! }; ! ! exitAction = new MagicAction("exit", GUIConstants.ICON_EXIT, "exit") { ! public void actionPerformed(ActionEvent e){ MainGUI.this.setVisible(false); ! System.exit(0); ! ! } ! }; aboutAction = new MagicAction("about") { + public void actionPerformed(ActionEvent e){ ! JOptionPane ! .showMessageDialog( ! MainGUI.this, ! "MagicMap - Version " ! + Version.getVersion() ! + "\n\nHumboldt-Universität zu Berlin\nInstitut für Informatik, Peter Ibach, Tobias Hübner, Martin Schweigert", ! GUIUtils.i18n("about", false), JOptionPane.PLAIN_MESSAGE); ! } ! }; ! ! invisibleAction = new MagicAction("invisible", GUIConstants.ICON_INVISIBLE, "invisibletooltip") { ! public void actionPerformed(ActionEvent e){ toogleInvisible(); ! } ! }; ! showAccessPoints = new MagicAction("showaccesspoints") { ! public void actionPerformed(ActionEvent e){ ! mapView.setShowAccessPoints(showAccessPoints.isSelected()); ! } ! }; ! ! showLocations = new MagicAction("showlocations") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowLocations(showLocations.isSelected()); ! } ! }; ! ! showClients = new MagicAction("showclients") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowClients(showClients.isSelected()); ! } ! }; ! showEdgesBetweenLocations = new MagicAction("showedgesbetweenlocations") { ! public void actionPerformed(ActionEvent e){ mapView.setShowEdgesBetweenLocations(showEdgesBetweenLocations.isSelected()); ! ! } ! }; ! ! showEdges = new MagicAction("showedges") { ! ! public void actionPerformed(ActionEvent e){ ! mapView.setShowEdges(showEdges.isSelected()); ! ! } ! }; ! invisibleAction.setEnabled(false); disconnectAction.setEnabled(false); *************** *** 263,267 **** showEdgesBetweenLocations.setEnabled(false); showEdges.setEnabled(false); ! } /** * Hauptpanel bauen * @return --- 288,294 ---- showEdgesBetweenLocations.setEnabled(false); showEdges.setEnabled(false); ! } ! ! /** * Hauptpanel bauen * @return Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapPanel.java 21 Apr 2005 10:53:27 -0000 1.3 --- MapPanel.java 11 May 2005 10:51:31 -0000 1.4 *************** *** 50,54 **** private int lastX; private int lastY; ! Node selectedNode; private AbstractAction createLocationAction; private AbstractAction fetchLocationsAction; --- 50,54 ---- private int lastX; private int lastY; ! Node selectedNode; private AbstractAction createLocationAction; private AbstractAction fetchLocationsAction; |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:51:55
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/utils Modified Files: Settings.java Version.java Log Message: + Client is usable without server Index: Settings.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Settings.java 16 Feb 2005 09:02:03 -0000 1.4 --- Settings.java 11 May 2005 10:51:31 -0000 1.5 *************** *** 14,17 **** --- 14,18 ---- public static final int TIMEOUT = 15000; public static final int POLL_INTERVAL = 5000; + public static final long POLL_DELAY = 500; public static String WEBSERVICE_PATH = "/magicmap/services/"; *************** *** 19,25 **** public static String clientName = "mobilepdp11"; public static String clientPassword = "test"; - public static String NIGHTLY = ""; - public static String hostname = "phl.informatik.hu-berlin.de"; public static int port = 80; --- 20,27 ---- public static String clientName = "mobilepdp11"; public static String clientPassword = "test"; + public static boolean useNoServer = false; + + public static String NIGHTLY = ""; public static String hostname = "phl.informatik.hu-berlin.de"; public static int port = 80; *************** *** 70,77 **** */ public static void setup(String[] args){ ! if (args!=null && args.length>0){ for (int i = 0; i < args.length; i++){ boolean accepted = false; ! String arg = args[i].toLowerCase(); if (arg.equals("--webservicepath")){ i++; --- 72,79 ---- */ public static void setup(String[] args){ ! if (args != null && args.length > 0){ for (int i = 0; i < args.length; i++){ boolean accepted = false; ! String arg = args[i].toLowerCase(); if (arg.equals("--webservicepath")){ i++; *************** *** 84,89 **** } } ! } } \ No newline at end of file --- 86,104 ---- } } ! } + /** + * @return Returns the useNoServer. + */ + public static boolean isUseNoServer(){ + return useNoServer; + } + + /** + * @param useNoServer The useNoServer to set. + */ + public static void setUseNoServer(boolean useNoServer){ + Settings.useNoServer = useNoServer; + } } \ No newline at end of file Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Version.java 16 Feb 2005 20:37:23 -0000 1.5 --- Version.java 11 May 2005 10:51:31 -0000 1.6 *************** *** 13,23 **** public static final String PROTOCOL_VERSION = "0.3"; ! public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 5; ! public static final String VERSION_FLAVOR = "alpha"; ! public static String getVersion(){ ! return VERSION_MAJOR + "." + VERSION_MINOR + VERSION_FLAVOR + " " + Settings.NIGHTLY; } ! } \ No newline at end of file --- 13,23 ---- public static final String PROTOCOL_VERSION = "0.3"; ! public static final int VERSION_MAJOR = 0; ! public static final int VERSION_MINOR = 5; ! public static final String VERSION_FLAVOR = "alpha"; ! public static String getVersion(){ ! return VERSION_MAJOR + "." + VERSION_MINOR + VERSION_FLAVOR + " " + Settings.NIGHTLY; } ! } \ No newline at end of file |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:51:41
|
Update of /cvsroot/magicmap/magicmapclient/src/edu/uci/ics/jung/visualization/graphdraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/edu/uci/ics/jung/visualization/graphdraw Modified Files: SettableRenderer.java Log Message: + Client is usable without server Index: SettableRenderer.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/edu/uci/ics/jung/visualization/graphdraw/SettableRenderer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SettableRenderer.java 13 Feb 2005 21:36:38 -0000 1.2 --- SettableRenderer.java 11 May 2005 10:51:31 -0000 1.3 *************** *** 472,476 **** Color fg = (vertexColorFunction == null) ? vertexFGColor : vertexColorFunction.getForeColor(v); - if (icon == null){ if (bg == null && fg == null){ --- 472,475 ---- |
|
From: Tobias H. <thu...@us...> - 2005-05-11 10:51:39
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/gui/utils Modified Files: RelativePanelBuilder.java Log Message: + Client is usable without server Index: RelativePanelBuilder.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils/RelativePanelBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RelativePanelBuilder.java 16 Jan 2005 16:01:29 -0000 1.1 --- RelativePanelBuilder.java 11 May 2005 10:51:30 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- import javax.swing.JButton; + import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; *************** *** 118,121 **** --- 119,128 ---- } + public JCheckBox addCheckBox(String text, String name, boolean selected){ + JCheckBox checkBox = new JCheckBox(text, selected); + add(checkBox, name); + return checkBox; + } + public JTextField addTextField(String name, int x, int y){ JTextField f = addTextField(name); |
1 message has been excluded from this view by a project administrator.
