Menu
▾
▴
magicmap-commits — SVN commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(14) |
Mar
|
Apr
(4) |
May
(57) |
Jun
(14) |
Jul
(15) |
Aug
(5) |
Sep
(29) |
Oct
(13) |
Nov
(44) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(14) |
Feb
(78) |
Mar
(55) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(9) |
| 2007 |
Jan
(21) |
Feb
(67) |
Mar
(39) |
Apr
(28) |
May
(7) |
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(1) |
Oct
(18) |
Nov
(8) |
Dec
(11) |
| 2008 |
Jan
(16) |
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andreas W. <an...@us...> - 2006-02-17 15:55:26
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20591/src/net/sf/magicmap/client/model/node Removed Files: MapNode.java Log Message: mapNode removed --- MapNode.java DELETED --- |
|
From: Johannes Z. <jza...@us...> - 2006-02-16 13:20:08
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/model/node In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26085/src/net/sf/magicmap/client/model/node Added Files: MapNode.java Log Message: new node for maps (slightly agains concept, but seems currently the only way to integrate maps in the outline view without very major changes) --- NEW FILE: MapNode.java --- package net.sf.magicmap.client.model.node; import java.util.ArrayList; /** * Node type for maps * (currently only used for the outline view) * @author Johannes Zapotoczky (joh...@za...) */ public class MapNode extends Node { /** * Constructor * @param model - the corresponding node model (!= null) */ public MapNode(NodeModel model) { super(model); } /* (non-Javadoc) * @see net.sf.magicmap.client.model.node.Node#getNeighbors() */ public ArrayList getNeighbors() { return new ArrayList(); } /* (non-Javadoc) * @see net.sf.magicmap.client.model.node.Node#getType() */ public int getType() { return NodeModel.NODETYPE_MAP; } } |
|
From: Johannes Z. <jza...@us...> - 2006-02-15 21:19:39
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13622/res Modified Files: screentext_en_US.properties screentext_de_DE.properties Log Message: added string for map display in outline Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** screentext_de_DE.properties 8 Oct 2005 23:18:09 -0000 1.7 --- screentext_de_DE.properties 15 Feb 2006 21:19:32 -0000 1.8 *************** *** 40,43 **** --- 40,44 ---- console=Konsole measurement=Messung + outline_maps=Karten accesspoints=Access Points locations=Referenzpunkte Index: screentext_en_US.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_en_US.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** screentext_en_US.properties 14 Feb 2005 12:51:14 -0000 1.1 --- screentext_en_US.properties 15 Feb 2006 21:19:31 -0000 1.2 *************** *** 14,16 **** rename=Rename delete=Delete ! properties=Properties... \ No newline at end of file --- 14,17 ---- rename=Rename delete=Delete ! properties=Properties... ! outline_maps=Maps \ No newline at end of file |
|
From: Andreas W. <an...@us...> - 2006-02-15 12:23:54
|
Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11924/src/net/sf/magicmap/server/facade Modified Files: MapFacade.java Log Message: neue standart werte Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MapFacade.java 14 Feb 2006 16:02:19 -0000 1.7 --- MapFacade.java 15 Feb 2006 12:23:35 -0000 1.8 *************** *** 157,174 **** // ToDo : Statische Werte durch die tatsächlichen ersetzen ! result.setGeoPoint1X(1); ! result.setGeoPoint1Y(1); ! result.setGeoPoint1Long(48310000); ! result.setGeoPoint1Lat(189175000); result.setGeoPoint1Alt(0); ! result.setGeoPoint2X(1); ! result.setGeoPoint2Y(1); ! result.setGeoPoint2Long(48310000); ! result.setGeoPoint2Lat(189175000); result.setGeoPoint2Alt(0); result.setGeoPoint3X(1); result.setGeoPoint3Y(1); ! result.setGeoPoint3Long(48310000); ! result.setGeoPoint3Lat(189175000); result.setGeoPoint3Alt(0); JDOUtil.commit(tx); --- 157,174 ---- // ToDo : Statische Werte durch die tatsächlichen ersetzen ! result.setGeoPoint1X(0); ! result.setGeoPoint1Y(0); ! result.setGeoPoint1Long(188767800); ! result.setGeoPoint1Lat(48660000); result.setGeoPoint1Alt(0); ! result.setGeoPoint2X(650); ! result.setGeoPoint2Y(498); ! result.setGeoPoint2Long(188720399); ! result.setGeoPoint2Lat(48759599); result.setGeoPoint2Alt(0); result.setGeoPoint3X(1); result.setGeoPoint3Y(1); ! result.setGeoPoint3Long(0); ! result.setGeoPoint3Lat(0); result.setGeoPoint3Alt(0); JDOUtil.commit(tx); |
|
From: Florian L. <fle...@us...> - 2006-02-14 16:03:32
|
Update of /cvsroot/magicmap/magicmapclient/inf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11868/inf Modified Files: MapFacade.wsdl Log Message: geopositiondata implemented Index: MapFacade.wsdl =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/inf/MapFacade.wsdl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MapFacade.wsdl 10 Feb 2006 15:41:22 -0000 1.2 --- MapFacade.wsdl 14 Feb 2006 16:03:22 -0000 1.3 *************** *** 63,66 **** --- 63,80 ---- </wsdl:types> + <wsdl:message name="deleteGeoPointResponse"> + + </wsdl:message> + + <wsdl:message name="deleteGeoPointRequest"> + + <wsdl:part name="mapName" type="soapenc:string"/> + + <wsdl:part name="xPos" type="xsd:int"/> + + <wsdl:part name="yPos" type="xsd:int"/> + + </wsdl:message> + <wsdl:message name="getMapNamesResponse"> *************** *** 89,92 **** --- 103,112 ---- </wsdl:message> + <wsdl:message name="createGeoPointResponse"> + + <wsdl:part name="createGeoPointReturn" type="tns1:MapDTO"/> + + </wsdl:message> + <wsdl:message name="getMapNamesRequest"> *************** *** 105,108 **** --- 125,144 ---- </wsdl:message> + <wsdl:message name="createGeoPointRequest"> + + <wsdl:part name="mapName" type="soapenc:string"/> + + <wsdl:part name="xPos" type="xsd:int"/> + + <wsdl:part name="yPos" type="xsd:int"/> + + <wsdl:part name="longitude" type="xsd:int"/> + + <wsdl:part name="latitude" type="xsd:int"/> + + <wsdl:part name="altitude" type="xsd:int"/> + + </wsdl:message> + <wsdl:message name="MapException"> *************** *** 149,152 **** --- 185,204 ---- </wsdl:operation> + <wsdl:operation name="createGeoPoint" parameterOrder="mapName xPos yPos longitude latitude altitude"> + + <wsdl:input message="impl:createGeoPointRequest" name="createGeoPointRequest"/> + + <wsdl:output message="impl:createGeoPointResponse" name="createGeoPointResponse"/> + + </wsdl:operation> + + <wsdl:operation name="deleteGeoPoint" parameterOrder="mapName xPos yPos"> + + <wsdl:input message="impl:deleteGeoPointRequest" name="deleteGeoPointRequest"/> + + <wsdl:output message="impl:deleteGeoPointResponse" name="deleteGeoPointResponse"/> + + </wsdl:operation> + </wsdl:portType> *************** *** 227,230 **** --- 279,318 ---- </wsdl:operation> + <wsdl:operation name="createGeoPoint"> + + <wsdlsoap:operation soapAction=""/> + + <wsdl:input name="createGeoPointRequest"> + + <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> + + </wsdl:input> + + <wsdl:output name="createGeoPointResponse"> + + <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="deleteGeoPoint"> + + <wsdlsoap:operation soapAction=""/> + + <wsdl:input name="deleteGeoPointRequest"> + + <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://facade.server.magicmap.sf.net" use="encoded"/> + + </wsdl:input> + + <wsdl:output name="deleteGeoPointResponse"> + + <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://localhost:8080/magicmap/services/MapFacade" use="encoded"/> + + </wsdl:output> + + </wsdl:operation> + </wsdl:binding> |
|
From: Florian L. <fle...@us...> - 2006-02-14 16:02:27
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11419/src/net/sf/magicmap/server/facade Modified Files: MapFacade.java Log Message: geopositiondata implemented Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MapFacade.java 10 Feb 2006 15:18:04 -0000 1.6 --- MapFacade.java 14 Feb 2006 16:02:19 -0000 1.7 *************** *** 180,183 **** --- 180,208 ---- /** + * + * @param mapName + * @param xPos + * @param yPos + * @param longitude + * @param latitude + * @param altitude + * @return + */ + public MapDTO createGeoPoint(String mapName, int xPos, int yPos, int longitude, int latitude, int altitude){ + //TODO: implement method + return null; + } + + /** + * + * @param mapName + * @param xPos + * @param yPos + */ + public void deleteGeoPoint(String mapName, int xPos, int yPos){ + //TODO: implement method + } + + /** * @param mac */ |
|
From: Florian L. <fle...@us...> - 2006-02-14 16:02:27
|
Update of /cvsroot/magicmap/magicmapserver/dblayer/src/net/sf/magicmap/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11419/dblayer/src/net/sf/magicmap/db Added Files: GeoPosition.java Log Message: geopositiondata implemented --- NEW FILE: GeoPosition.java --- package net.sf.magicmap.db; import java.util.Collection; import java.util.HashSet; /** * @author lederer & weiß * @jdo.persistence-capable * identity-type="application" * @jdo.class-vendor-extension * vendor-name="jpox" * key="table-name" * value="position" * @jdo.class-vendor-extension * vendor-name="jpox" key="use-poid-generator" * value="true" * @jdo.class-vendor-extension * vendor-name="jpox" key="poid-class-generator" * value="org.jpox.poid.SequenceTablePoidGenerator" */ public class GeoPosition { /** * */ protected GeoPosition() { super(); } /** * primary key * * @jdo.field * persistence-modifier="persistent" * primary-key="true" */ long id; /** * zugehörige Karte * * @jdo.field * persistence-modifier="persistent" * null-value="exception" */ Map map; /** * x Position im Bild * * @jdo.field * persistence-modifier="persistent" * null-value="exception" */ int posX; /** * y Position im Bild * * @jdo.field * persistence-modifier="persistent" * null-value="exception" */ int posY; int latitude; int longitude; int altitude; /** * AccessPoints, die diese Hardware haben * * @jdo.field * persistence-modifier="persistent" */ AccessPoint accessPoint; /** * * @param map * @param posX * @param posY */ public GeoPosition(Map map, int posX, int posY) { super(); this.map = map; this.posX = posX; this.posY = posY; } /** * @return Returns the id. */ public long getId(){ return this.id; } /** * @return Returns the map. */ public Map getMap(){ return this.map; } /** * @return Returns the posX. */ public int getPosX(){ return this.posX; } /** * @return Returns the posY. */ public int getPosY(){ return this.posY; } /** * @param posX The posX to set. */ public void setPosX(int posX){ this.posX = posX; } /** * @param posY The posY to set. */ public void setPosY(int posY){ this.posY = posY; } } |
|
From: Florian L. <fle...@us...> - 2006-02-10 15:41:31
|
Update of /cvsroot/magicmap/magicmapclient/inf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17425/inf Modified Files: MapFacade.wsdl Log Message: geopositiondata implemented Index: MapFacade.wsdl =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/inf/MapFacade.wsdl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MapFacade.wsdl 11 May 2005 15:42:47 -0000 1.1 --- MapFacade.wsdl 10 Feb 2006 15:41:22 -0000 1.2 *************** *** 10,13 **** --- 10,28 ---- <complexType name="MapDTO"> <sequence> + <element name="geoPoint1Alt" nillable="true" type="soapenc:int"/> + <element name="geoPoint1Lat" nillable="true" type="soapenc:int"/> + <element name="geoPoint1Long" nillable="true" type="soapenc:int"/> + <element name="geoPoint1X" nillable="true" type="soapenc:int"/> + <element name="geoPoint1Y" nillable="true" type="soapenc:int"/> + <element name="geoPoint2Alt" nillable="true" type="soapenc:int"/> + <element name="geoPoint2Lat" nillable="true" type="soapenc:int"/> + <element name="geoPoint2Long" nillable="true" type="soapenc:int"/> + <element name="geoPoint2X" nillable="true" type="soapenc:int"/> + <element name="geoPoint2Y" nillable="true" type="soapenc:int"/> + <element name="geoPoint3Alt" nillable="true" type="soapenc:int"/> + <element name="geoPoint3Lat" nillable="true" type="soapenc:int"/> + <element name="geoPoint3Long" nillable="true" type="soapenc:int"/> + <element name="geoPoint3X" nillable="true" type="soapenc:int"/> + <element name="geoPoint3Y" nillable="true" type="soapenc:int"/> <element name="id" nillable="true" type="soapenc:long"/> <element name="imageHeight" nillable="true" type="soapenc:int"/> |
|
From: Andreas W. <an...@us...> - 2006-02-10 15:18:12
|
Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7273/src/net/sf/magicmap/server/facade Modified Files: MapFacade.java Log Message: getMap um 3 WGS84 Koordinaten erweitert Index: MapFacade.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MapFacade.java 11 May 2005 15:46:30 -0000 1.5 --- MapFacade.java 10 Feb 2006 15:18:04 -0000 1.6 *************** *** 155,158 **** --- 155,175 ---- result.setImageWidth(map.getImageWidth()); result.setImageURL(map.getImageURL()); + + // ToDo : Statische Werte durch die tatsächlichen ersetzen + result.setGeoPoint1X(1); + result.setGeoPoint1Y(1); + result.setGeoPoint1Long(48310000); + result.setGeoPoint1Lat(189175000); + result.setGeoPoint1Alt(0); + result.setGeoPoint2X(1); + result.setGeoPoint2Y(1); + result.setGeoPoint2Long(48310000); + result.setGeoPoint2Lat(189175000); + result.setGeoPoint2Alt(0); + result.setGeoPoint3X(1); + result.setGeoPoint3Y(1); + result.setGeoPoint3Long(48310000); + result.setGeoPoint3Lat(189175000); + result.setGeoPoint3Alt(0); JDOUtil.commit(tx); } finally{ |
|
From: Florian L. <fle...@us...> - 2006-02-10 15:17:32
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7030/src/net/sf/magicmap/server/utils Modified Files: Version.java Log Message: updated protokoll version of webservices Index: Version.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/utils/Version.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Version.java 11 May 2005 15:46:27 -0000 1.5 --- Version.java 10 Feb 2006 15:17:24 -0000 1.6 *************** *** 15,18 **** public interface Version { ! public static final String PROTOCOL_VERSION = "0.4"; } \ No newline at end of file --- 15,18 ---- public interface Version { ! public static final String PROTOCOL_VERSION = "0.5"; } \ No newline at end of file |
|
From: Martin S. <sch...@us...> - 2006-02-10 15:14:16
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5405/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: Pragmatic Programmer: DRY - removed redundancy Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MainGUI.java 8 Oct 2005 23:18:09 -0000 1.11 --- MainGUI.java 10 Feb 2006 15:14:02 -0000 1.12 *************** *** 11,15 **** import java.io.PrintWriter; import java.io.StringWriter; - import java.net.URL; import java.rmi.RemoteException; import java.util.Locale; --- 11,14 ---- *************** *** 18,22 **** import javax.swing.ImageIcon; import javax.swing.JButton; [...1017 lines suppressed...] statusBar.setInvisible(Controller.getInstance().isInvisible()); --- 620,624 ---- * */ ! protected void toogleInvisible() { Controller.getInstance().setInvisible(!Controller.getInstance().isInvisible()); statusBar.setInvisible(Controller.getInstance().isInvisible()); *************** *** 797,801 **** * */ ! protected void connect(){ statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_CONNECTING)); statusBar.setInvisible(Controller.getInstance().isInvisible()); --- 628,632 ---- * */ ! protected void connect() { statusBar.setMessage(GUIUtils.i18n(GUIConstants.STATE_CONNECTING)); statusBar.setInvisible(Controller.getInstance().isInvisible()); |
|
From: Florian L. <fle...@us...> - 2006-02-10 15:01:23
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32163/src/net/sf/magicmap/server/dto Modified Files: MapDTO.java Log Message: Index: MapDTO.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/MapDTO.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MapDTO.java 10 Feb 2006 14:45:32 -0000 1.4 --- MapDTO.java 10 Feb 2006 15:01:14 -0000 1.5 *************** *** 22,40 **** // Geokoordinaten in Millisekunden ! private long geoPoint1X; ! private long geoPoint1Y; ! private long geoPoint1Lat; ! private long geoPoint1Long; ! private long geoPoint1Alt; ! private long geoPoint2X; ! private long geoPoint2Y; ! private long geoPoint2Lat; ! private long geoPoint2Long; ! private long geoPoint2Alt; ! private long geoPoint3X; ! private long geoPoint3Y; ! private long geoPoint3Lat; ! private long geoPoint3Long; ! private long geoPoint3Alt; public MapDTO() {} --- 22,40 ---- // Geokoordinaten in Millisekunden ! private Integer geoPoint1X; ! private Integer geoPoint1Y; ! private Integer geoPoint1Lat; ! private Integer geoPoint1Long; ! private Integer geoPoint1Alt; ! private Integer geoPoint2X; ! private Integer geoPoint2Y; ! private Integer geoPoint2Lat; ! private Integer geoPoint2Long; ! private Integer geoPoint2Alt; ! private Integer geoPoint3X; ! private Integer geoPoint3Y; ! private Integer geoPoint3Lat; ! private Integer geoPoint3Long; ! private Integer geoPoint3Alt; public MapDTO() {} *************** *** 52,119 **** } ! public long getImageHeight(){ return this.imageHeight; } ! public long getImageWidth(){ return this.imageWidth; } ! public long getGeoPoint1X(){ return this.geoPoint1X; } ! public long getGeoPoint1Y(){ return this.geoPoint1Y; } ! public long getGeoPoint1Lat(){ return this.geoPoint1Lat; } ! public long getGeoPoint1Long(){ return this.geoPoint1Long; } ! public long getGeoPoint1Alt(){ return this.geoPoint1Alt; } ! public long getGeoPoint2X(){ return this.geoPoint1X; } ! public long getGeoPoint2Y(){ return this.geoPoint1Y; } ! public long getGeoPoint2Lat(){ return this.geoPoint1Lat; } ! public long getGeoPoint2Long(){ return this.geoPoint1Long; } ! public long getGeoPoint2Alt(){ return this.geoPoint1Alt; } ! public long getGeoPoint3X(){ return this.geoPoint1X; } ! public long getGeoPoint3Y(){ return this.geoPoint1Y; } ! public long getGeoPoint3Lat(){ return this.geoPoint1Lat; } ! public long getGeoPoint3Long(){ return this.geoPoint1Long; } ! public long getGeoPoint3Alt(){ return this.geoPoint1Alt; } --- 52,119 ---- } ! public Integer getImageHeight(){ return this.imageHeight; } ! public Integer getImageWidth(){ return this.imageWidth; } ! public Integer getGeoPoint1X(){ return this.geoPoint1X; } ! public Integer getGeoPoint1Y(){ return this.geoPoint1Y; } ! public Integer getGeoPoint1Lat(){ return this.geoPoint1Lat; } ! public Integer getGeoPoint1Long(){ return this.geoPoint1Long; } ! public Integer getGeoPoint1Alt(){ return this.geoPoint1Alt; } ! public Integer getGeoPoint2X(){ return this.geoPoint1X; } ! public Integer getGeoPoint2Y(){ return this.geoPoint1Y; } ! public Integer getGeoPoint2Lat(){ return this.geoPoint1Lat; } ! public Integer getGeoPoint2Long(){ return this.geoPoint1Long; } ! public Integer getGeoPoint2Alt(){ return this.geoPoint1Alt; } ! public Integer getGeoPoint3X(){ return this.geoPoint1X; } ! public Integer getGeoPoint3Y(){ return this.geoPoint1Y; } ! public Integer getGeoPoint3Lat(){ return this.geoPoint1Lat; } ! public Integer getGeoPoint3Long(){ return this.geoPoint1Long; } ! public Integer getGeoPoint3Alt(){ return this.geoPoint1Alt; } *************** *** 158,162 **** * @param geoPoint1X The X Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1X(long geoPoint1X){ this.geoPoint1X = geoPoint1X; } --- 158,162 ---- * @param geoPoint1X The X Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1X(Integer geoPoint1X){ this.geoPoint1X = geoPoint1X; } *************** *** 165,169 **** * @param geoPoint1Y The Y Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1Y(long geoPoint1Y){ this.geoPoint1Y = geoPoint1Y; } --- 165,169 ---- * @param geoPoint1Y The Y Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1Y(Integer geoPoint1Y){ this.geoPoint1Y = geoPoint1Y; } *************** *** 172,176 **** * @param geoPoint1Lat The Latitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Lat(long geoPoint1Lat){ this.geoPoint1Lat = geoPoint1Lat; } --- 172,176 ---- * @param geoPoint1Lat The Latitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Lat(Integer geoPoint1Lat){ this.geoPoint1Lat = geoPoint1Lat; } *************** *** 179,183 **** * @param geoPoint1Long The Longitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Long(long geoPoint1Long){ this.geoPoint1Long = geoPoint1Long; } --- 179,183 ---- * @param geoPoint1Long The Longitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Long(Integer geoPoint1Long){ this.geoPoint1Long = geoPoint1Long; } *************** *** 186,190 **** * @param geoPoint1Alt The Altitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Alt(long geoPoint1Alt){ this.geoPoint1Alt = geoPoint1Alt; } --- 186,190 ---- * @param geoPoint1Alt The Altitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Alt(Integer geoPoint1Alt){ this.geoPoint1Alt = geoPoint1Alt; } *************** *** 193,197 **** * @param geoPoint2X The X Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2X(long geoPoint2X){ this.geoPoint2X = geoPoint2X; } --- 193,197 ---- * @param geoPoint2X The X Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2X(Integer geoPoint2X){ this.geoPoint2X = geoPoint2X; } *************** *** 200,204 **** * @param geoPoint2Y The Y Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2Y(long geoPoint2Y){ this.geoPoint2Y = geoPoint2Y; } --- 200,204 ---- * @param geoPoint2Y The Y Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2Y(Integer geoPoint2Y){ this.geoPoint2Y = geoPoint2Y; } *************** *** 207,211 **** * @param geoPoint2Lat The Latitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Lat(long geoPoint2Lat){ this.geoPoint2Lat = geoPoint2Lat; } --- 207,211 ---- * @param geoPoint2Lat The Latitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Lat(Integer geoPoint2Lat){ this.geoPoint2Lat = geoPoint2Lat; } *************** *** 214,218 **** * @param geoPoint2Long The Longitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Long(long geoPoint2Long){ this.geoPoint2Long = geoPoint2Long; } --- 214,218 ---- * @param geoPoint2Long The Longitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Long(Integer geoPoint2Long){ this.geoPoint2Long = geoPoint2Long; } *************** *** 220,224 **** * @param geoPoint2Alt The Altitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Alt(long geoPoint2Alt){ this.geoPoint2Alt = geoPoint2Alt; } --- 220,224 ---- * @param geoPoint2Alt The Altitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Alt(Integer geoPoint2Alt){ this.geoPoint2Alt = geoPoint2Alt; } *************** *** 227,231 **** * @param geoPoint3X The X Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3X(long geoPoint3X){ this.geoPoint3X = geoPoint3X; } --- 227,231 ---- * @param geoPoint3X The X Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3X(Integer geoPoint3X){ this.geoPoint3X = geoPoint3X; } *************** *** 234,238 **** * @param geoPoint3Y The Y Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3Y(long geoPoint3Y){ this.geoPoint3Y = geoPoint3Y; } --- 234,238 ---- * @param geoPoint3Y The Y Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3Y(Integer geoPoint3Y){ this.geoPoint3Y = geoPoint3Y; } *************** *** 241,245 **** * @param geoPoint3Lat The Latitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Lat(long geoPoint3Lat){ this.geoPoint3Lat = geoPoint3Lat; } --- 241,245 ---- * @param geoPoint3Lat The Latitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Lat(Integer geoPoint3Lat){ this.geoPoint3Lat = geoPoint3Lat; } *************** *** 248,252 **** * @param geoPoint3Long The Longitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Long(long geoPoint3Long){ this.geoPoint3Long = geoPoint3Long; } --- 248,252 ---- * @param geoPoint3Long The Longitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Long(Integer geoPoint3Long){ this.geoPoint3Long = geoPoint3Long; } *************** *** 254,258 **** * @param geoPoint3Alt The Altitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Alt(long geoPoint3Alt){ this.geoPoint3Alt = geoPoint3Alt; } --- 254,258 ---- * @param geoPoint3Alt The Altitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Alt(Integer geoPoint3Alt){ this.geoPoint3Alt = geoPoint3Alt; } |
|
From: Andreas W. <an...@us...> - 2006-02-10 14:45:43
|
Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25891/src/net/sf/magicmap/server/dto Modified Files: MapDTO.java Log Message: Wertebereich auf long geändert Index: MapDTO.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/dto/MapDTO.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MapDTO.java 10 Feb 2006 14:38:56 -0000 1.3 --- MapDTO.java 10 Feb 2006 14:45:32 -0000 1.4 *************** *** 22,40 **** // Geokoordinaten in Millisekunden ! private Integer geoPoint1X; ! private Integer geoPoint1Y; ! private Integer geoPoint1Lat; ! private Integer geoPoint1Long; ! private Integer geoPoint1Alt; ! private Integer geoPoint2X; ! private Integer geoPoint2Y; ! private Integer geoPoint2Lat; ! private Integer geoPoint2Long; ! private Integer geoPoint2Alt; ! private Integer geoPoint3X; ! private Integer geoPoint3Y; ! private Integer geoPoint3Lat; ! private Integer geoPoint3Long; ! private Integer geoPoint3Alt; public MapDTO() {} --- 22,40 ---- // Geokoordinaten in Millisekunden ! private long geoPoint1X; ! private long geoPoint1Y; ! private long geoPoint1Lat; ! private long geoPoint1Long; ! private long geoPoint1Alt; ! private long geoPoint2X; ! private long geoPoint2Y; ! private long geoPoint2Lat; ! private long geoPoint2Long; ! private long geoPoint2Alt; ! private long geoPoint3X; ! private long geoPoint3Y; ! private long geoPoint3Lat; ! private long geoPoint3Long; ! private long geoPoint3Alt; public MapDTO() {} *************** *** 52,119 **** } ! public Integer getImageHeight(){ return this.imageHeight; } ! public Integer getImageWidth(){ return this.imageWidth; } ! public Integer getGeoPoint1X(){ return this.geoPoint1X; } ! public Integer getGeoPoint1Y(){ return this.geoPoint1Y; } ! public Integer getGeoPoint1Lat(){ return this.geoPoint1Lat; } ! public Integer getGeoPoint1Long(){ return this.geoPoint1Long; } ! public Integer getGeoPoint1Alt(){ return this.geoPoint1Alt; } ! public Integer getGeoPoint2X(){ return this.geoPoint1X; } ! public Integer getGeoPoint2Y(){ return this.geoPoint1Y; } ! public Integer getGeoPoint2Lat(){ return this.geoPoint1Lat; } ! public Integer getGeoPoint2Long(){ return this.geoPoint1Long; } ! public Integer getGeoPoint2Alt(){ return this.geoPoint1Alt; } ! public Integer getGeoPoint3X(){ return this.geoPoint1X; } ! public Integer getGeoPoint3Y(){ return this.geoPoint1Y; } ! public Integer getGeoPoint3Lat(){ return this.geoPoint1Lat; } ! public Integer getGeoPoint3Long(){ return this.geoPoint1Long; } ! public Integer getGeoPoint3Alt(){ return this.geoPoint1Alt; } --- 52,119 ---- } ! public long getImageHeight(){ return this.imageHeight; } ! public long getImageWidth(){ return this.imageWidth; } ! public long getGeoPoint1X(){ return this.geoPoint1X; } ! public long getGeoPoint1Y(){ return this.geoPoint1Y; } ! public long getGeoPoint1Lat(){ return this.geoPoint1Lat; } ! public long getGeoPoint1Long(){ return this.geoPoint1Long; } ! public long getGeoPoint1Alt(){ return this.geoPoint1Alt; } ! public long getGeoPoint2X(){ return this.geoPoint1X; } ! public long getGeoPoint2Y(){ return this.geoPoint1Y; } ! public long getGeoPoint2Lat(){ return this.geoPoint1Lat; } ! public long getGeoPoint2Long(){ return this.geoPoint1Long; } ! public long getGeoPoint2Alt(){ return this.geoPoint1Alt; } ! public long getGeoPoint3X(){ return this.geoPoint1X; } ! public long getGeoPoint3Y(){ return this.geoPoint1Y; } ! public long getGeoPoint3Lat(){ return this.geoPoint1Lat; } ! public long getGeoPoint3Long(){ return this.geoPoint1Long; } ! public long getGeoPoint3Alt(){ return this.geoPoint1Alt; } *************** *** 158,162 **** * @param geoPoint1X The X Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1X(Integer geoPoint1X){ this.geoPoint1X = geoPoint1X; } --- 158,162 ---- * @param geoPoint1X The X Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1X(long geoPoint1X){ this.geoPoint1X = geoPoint1X; } *************** *** 165,169 **** * @param geoPoint1Y The Y Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1Y(Integer geoPoint1Y){ this.geoPoint1Y = geoPoint1Y; } --- 165,169 ---- * @param geoPoint1Y The Y Coordinate for the first Georeferencepoint on the map */ ! public void setGeoPoint1Y(long geoPoint1Y){ this.geoPoint1Y = geoPoint1Y; } *************** *** 172,176 **** * @param geoPoint1Lat The Latitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Lat(Integer geoPoint1Lat){ this.geoPoint1Lat = geoPoint1Lat; } --- 172,176 ---- * @param geoPoint1Lat The Latitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Lat(long geoPoint1Lat){ this.geoPoint1Lat = geoPoint1Lat; } *************** *** 179,183 **** * @param geoPoint1Long The Longitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Long(Integer geoPoint1Long){ this.geoPoint1Long = geoPoint1Long; } --- 179,183 ---- * @param geoPoint1Long The Longitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Long(long geoPoint1Long){ this.geoPoint1Long = geoPoint1Long; } *************** *** 186,190 **** * @param geoPoint1Alt The Altitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Alt(Integer geoPoint1Alt){ this.geoPoint1Alt = geoPoint1Alt; } --- 186,190 ---- * @param geoPoint1Alt The Altitude for the first Georeferencepoint on the map */ ! public void setGeoPoint1Alt(long geoPoint1Alt){ this.geoPoint1Alt = geoPoint1Alt; } *************** *** 193,197 **** * @param geoPoint2X The X Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2X(Integer geoPoint2X){ this.geoPoint2X = geoPoint2X; } --- 193,197 ---- * @param geoPoint2X The X Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2X(long geoPoint2X){ this.geoPoint2X = geoPoint2X; } *************** *** 200,204 **** * @param geoPoint2Y The Y Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2Y(Integer geoPoint2Y){ this.geoPoint2Y = geoPoint2Y; } --- 200,204 ---- * @param geoPoint2Y The Y Coordinate for the second Georeferencepoint on the map */ ! public void setGeoPoint2Y(long geoPoint2Y){ this.geoPoint2Y = geoPoint2Y; } *************** *** 207,211 **** * @param geoPoint2Lat The Latitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Lat(Integer geoPoint2Lat){ this.geoPoint2Lat = geoPoint2Lat; } --- 207,211 ---- * @param geoPoint2Lat The Latitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Lat(long geoPoint2Lat){ this.geoPoint2Lat = geoPoint2Lat; } *************** *** 214,218 **** * @param geoPoint2Long The Longitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Long(Integer geoPoint2Long){ this.geoPoint2Long = geoPoint2Long; } --- 214,218 ---- * @param geoPoint2Long The Longitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Long(long geoPoint2Long){ this.geoPoint2Long = geoPoint2Long; } *************** *** 220,224 **** * @param geoPoint2Alt The Altitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Alt(Integer geoPoint2Alt){ this.geoPoint2Alt = geoPoint2Alt; } --- 220,224 ---- * @param geoPoint2Alt The Altitude for the second Georeferencepoint on the map */ ! public void setGeoPoint2Alt(long geoPoint2Alt){ this.geoPoint2Alt = geoPoint2Alt; } *************** *** 227,231 **** * @param geoPoint3X The X Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3X(Integer geoPoint3X){ this.geoPoint3X = geoPoint3X; } --- 227,231 ---- * @param geoPoint3X The X Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3X(long geoPoint3X){ this.geoPoint3X = geoPoint3X; } *************** *** 234,238 **** * @param geoPoint3Y The Y Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3Y(Integer geoPoint3Y){ this.geoPoint3Y = geoPoint3Y; } --- 234,238 ---- * @param geoPoint3Y The Y Coordinate for the third Georeferencepoint on the map */ ! public void setGeoPoint3Y(long geoPoint3Y){ this.geoPoint3Y = geoPoint3Y; } *************** *** 241,245 **** * @param geoPoint3Lat The Latitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Lat(Integer geoPoint3Lat){ this.geoPoint3Lat = geoPoint3Lat; } --- 241,245 ---- * @param geoPoint3Lat The Latitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Lat(long geoPoint3Lat){ this.geoPoint3Lat = geoPoint3Lat; } *************** *** 248,252 **** * @param geoPoint3Long The Longitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Long(Integer geoPoint3Long){ this.geoPoint3Long = geoPoint3Long; } --- 248,252 ---- * @param geoPoint3Long The Longitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Long(long geoPoint3Long){ this.geoPoint3Long = geoPoint3Long; } *************** *** 254,258 **** * @param geoPoint3Alt The Altitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Alt(Integer geoPoint3Alt){ this.geoPoint3Alt = geoPoint3Alt; } --- 254,258 ---- * @param geoPoint3Alt The Altitude for the third Georeferencepoint on the map */ ! public void setGeoPoint3Alt(long geoPoint3Alt){ this.geoPoint3Alt = geoPoint3Alt; } |
|
From: Andreas W. <an...@us...> - 2006-02-10 14:39:15
|
Update of /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/dto In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22268/src/net/sf/magicmap/server/dto Modified Files: MapDTO.java Log Message: Anpassung an WGS84 Index: MapDTO.java =================================================================== RCS file: /cvsroot/magicmap//magicmapserver/src/net/sf/magicmap/server/dto/MapDTO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MapDTO.java 11 May 2005 10:45:05 -0000 1.2 --- MapDTO.java 10 Feb 2006 14:38:56 -0000 1.3 *************** *** 20,23 **** --- 20,40 ---- private Integer imageHeight; private Integer imageWidth; + + // Geokoordinaten in Millisekunden + private Integer geoPoint1X; + private Integer geoPoint1Y; + private Integer geoPoint1Lat; + private Integer geoPoint1Long; + private Integer geoPoint1Alt; + private Integer geoPoint2X; + private Integer geoPoint2Y; + private Integer geoPoint2Lat; + private Integer geoPoint2Long; + private Integer geoPoint2Alt; + private Integer geoPoint3X; + private Integer geoPoint3Y; + private Integer geoPoint3Lat; + private Integer geoPoint3Long; + private Integer geoPoint3Alt; public MapDTO() {} *************** *** 42,45 **** --- 59,122 ---- return this.imageWidth; } + + public Integer getGeoPoint1X(){ + return this.geoPoint1X; + } + + public Integer getGeoPoint1Y(){ + return this.geoPoint1Y; + } + + public Integer getGeoPoint1Lat(){ + return this.geoPoint1Lat; + } + + public Integer getGeoPoint1Long(){ + return this.geoPoint1Long; + } + + public Integer getGeoPoint1Alt(){ + return this.geoPoint1Alt; + } + public Integer getGeoPoint2X(){ + return this.geoPoint1X; + } + + public Integer getGeoPoint2Y(){ + return this.geoPoint1Y; + } + + public Integer getGeoPoint2Lat(){ + return this.geoPoint1Lat; + } + + public Integer getGeoPoint2Long(){ + return this.geoPoint1Long; + } + + public Integer getGeoPoint2Alt(){ + return this.geoPoint1Alt; + } + + public Integer getGeoPoint3X(){ + return this.geoPoint1X; + } + + public Integer getGeoPoint3Y(){ + return this.geoPoint1Y; + } + + public Integer getGeoPoint3Lat(){ + return this.geoPoint1Lat; + } + + public Integer getGeoPoint3Long(){ + return this.geoPoint1Long; + } + + public Integer getGeoPoint3Alt(){ + return this.geoPoint1Alt; + } + /** *************** *** 77,80 **** this.name = name; } ! } \ No newline at end of file --- 154,260 ---- this.name = name; } ! ! /** ! * @param geoPoint1X The X Coordinate for the first Georeferencepoint on the map ! */ ! public void setGeoPoint1X(Integer geoPoint1X){ ! this.geoPoint1X = geoPoint1X; ! } ! ! /** ! * @param geoPoint1Y The Y Coordinate for the first Georeferencepoint on the map ! */ ! public void setGeoPoint1Y(Integer geoPoint1Y){ ! this.geoPoint1Y = geoPoint1Y; ! } ! ! /** ! * @param geoPoint1Lat The Latitude for the first Georeferencepoint on the map ! */ ! public void setGeoPoint1Lat(Integer geoPoint1Lat){ ! this.geoPoint1Lat = geoPoint1Lat; ! } ! ! /** ! * @param geoPoint1Long The Longitude for the first Georeferencepoint on the map ! */ ! public void setGeoPoint1Long(Integer geoPoint1Long){ ! this.geoPoint1Long = geoPoint1Long; ! } ! ! /** ! * @param geoPoint1Alt The Altitude for the first Georeferencepoint on the map ! */ ! public void setGeoPoint1Alt(Integer geoPoint1Alt){ ! this.geoPoint1Alt = geoPoint1Alt; ! } ! ! /** ! * @param geoPoint2X The X Coordinate for the second Georeferencepoint on the map ! */ ! public void setGeoPoint2X(Integer geoPoint2X){ ! this.geoPoint2X = geoPoint2X; ! } ! ! /** ! * @param geoPoint2Y The Y Coordinate for the second Georeferencepoint on the map ! */ ! public void setGeoPoint2Y(Integer geoPoint2Y){ ! this.geoPoint2Y = geoPoint2Y; ! } ! ! /** ! * @param geoPoint2Lat The Latitude for the second Georeferencepoint on the map ! */ ! public void setGeoPoint2Lat(Integer geoPoint2Lat){ ! this.geoPoint2Lat = geoPoint2Lat; ! } ! ! /** ! * @param geoPoint2Long The Longitude for the second Georeferencepoint on the map ! */ ! public void setGeoPoint2Long(Integer geoPoint2Long){ ! this.geoPoint2Long = geoPoint2Long; ! } ! /** ! * @param geoPoint2Alt The Altitude for the second Georeferencepoint on the map ! */ ! public void setGeoPoint2Alt(Integer geoPoint2Alt){ ! this.geoPoint2Alt = geoPoint2Alt; ! } ! ! /** ! * @param geoPoint3X The X Coordinate for the third Georeferencepoint on the map ! */ ! public void setGeoPoint3X(Integer geoPoint3X){ ! this.geoPoint3X = geoPoint3X; ! } ! ! /** ! * @param geoPoint3Y The Y Coordinate for the third Georeferencepoint on the map ! */ ! public void setGeoPoint3Y(Integer geoPoint3Y){ ! this.geoPoint3Y = geoPoint3Y; ! } ! ! /** ! * @param geoPoint3Lat The Latitude for the third Georeferencepoint on the map ! */ ! public void setGeoPoint3Lat(Integer geoPoint3Lat){ ! this.geoPoint3Lat = geoPoint3Lat; ! } ! ! /** ! * @param geoPoint3Long The Longitude for the third Georeferencepoint on the map ! */ ! public void setGeoPoint3Long(Integer geoPoint3Long){ ! this.geoPoint3Long = geoPoint3Long; ! } ! /** ! * @param geoPoint3Alt The Altitude for the third Georeferencepoint on the map ! */ ! public void setGeoPoint3Alt(Integer geoPoint3Alt){ ! this.geoPoint3Alt = geoPoint3Alt; ! } ! } \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2006-02-07 18:12:10
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9386/src/net/sf/magicmap/client/utils Modified Files: Settings.java Log Message: using of getopts added (by Gregor Maier) Index: Settings.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Settings.java 8 Oct 2005 23:18:09 -0000 1.7 --- Settings.java 7 Feb 2006 16:05:00 -0000 1.8 *************** *** 1,12 **** --- 1,28 ---- /* * Created on 14.11.2004 + * + * added gnu.getopt by gregor <gr...@ma...> + * gnu.getopt can be found at: http://www.urbanophile.com/arenn/hacking/download.html */ package net.sf.magicmap.client.utils; + import gnu.getopt.Getopt; + import gnu.getopt.LongOpt; + /** * @author Martin */ public class Settings { + + public static final LongOpt[] longopts = new LongOpt[] { + new LongOpt("webservicepath", LongOpt.REQUIRED_ARGUMENT, null, 'w'), + new LongOpt("nightly", LongOpt.REQUIRED_ARGUMENT, null, 'n'), + // New options. Mainly for console only mode + new LongOpt("server", LongOpt.REQUIRED_ARGUMENT, null, 's'), + new LongOpt("port", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + }; + + public static final String optionsStr = "w:n:s:p:"; public static final String[] DEFAULT_SERVER_LIST = new String[]{"localhost", "phl.informatik.hu-berlin.de"}; *************** *** 27,30 **** --- 43,47 ---- public static int port = 80; + public static final String TIME_DATE_FORMAT = "HH:mm:ss dd.MM.yyyy"; *************** *** 78,100 **** } /** * @param args */ 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++; ! WEBSERVICE_PATH = args[i]; ! } ! if (arg.equals("--nightly")){ ! i++; ! NIGHTLY = args[i]; ! } } } - } --- 95,123 ---- } + /** * @param args */ public static void setup(String[] args){ ! Getopt g = new Getopt("magicmapclient", args, optionsStr, longopts); ! int c, tmpval; ! ! while ( (c=g.getopt()) != -1) { ! switch(c) { ! case 'w': ! WEBSERVICE_PATH = g.getOptarg(); break; ! case 'n': ! NIGHTLY = g.getOptarg(); break; ! case 's': ! hostname = g.getOptarg(); break; ! case 'p': ! port = Integer.parseInt(g.getOptarg()); break; ! case '?': ! break; // getopt already printed an error ! default: ! System.out.println("getopt() returned " + c); ! break; } } } *************** *** 112,114 **** Settings.useNoServer = useNoServer; } ! } \ No newline at end of file --- 135,137 ---- Settings.useNoServer = useNoServer; } ! } |
|
From: Florian L. <fle...@us...> - 2006-02-07 18:10:45
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9668/src/net/sf/magicmap/server/cache Modified Files: PositionCache.java Log Message: cache error patched Index: PositionCache.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/cache/PositionCache.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PositionCache.java 6 Dec 2005 11:45:16 -0000 1.9 --- PositionCache.java 7 Feb 2006 16:05:37 -0000 1.10 *************** *** 324,328 **** if (!existsMapHashtable(map)) addMapHashtable(map); if (getMapHashtable(map).existsPosition(position.getName())){ ! getMapHashtable(map).removePosition(position.getName()); } getMapHashtable(map).addPosition(position); --- 324,328 ---- if (!existsMapHashtable(map)) addMapHashtable(map); if (getMapHashtable(map).existsPosition(position.getName())){ ! getMapHashtable(map).deletePosition(position.getName()); } getMapHashtable(map).addPosition(position); |
|
From: Johannes Z. <jza...@us...> - 2006-02-02 21:23:22
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24072/src/net/sf/magicmap/client/gui/dialogs Modified Files: ConnectServerDialog.java Log Message: window close operation now treated as cancel Index: ConnectServerDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConnectServerDialog.java 11 May 2005 10:51:30 -0000 1.3 --- ConnectServerDialog.java 2 Feb 2006 21:23:14 -0000 1.4 *************** *** 32,180 **** public class ConnectServerDialog extends JDialog implements ActionListener { ! private JPanel mainPanel; ! private ServerConnectionInfo serverConnectionInfo; ! private JComboBox hostname; ! private JTextField clientname; ! private JTextField port; ! private JPasswordField password; ! private JCheckBox useNoServer; ! ! public static ServerConnectionInfo showDialog(Frame owner, ServerConnectionInfo info){ ! ConnectServerDialog d = new ConnectServerDialog(owner, info); ! GUIUtils.locateOnScreen(d); ! d.setModal(true); ! d.setVisible(true); ! return d.getServerConnectionInfo(); ! } ! public ConnectServerDialog(Frame owner, ServerConnectionInfo info) { ! super(owner, GUIUtils.i18n("connectserver")); ! setSize(300, 300); ! this.setResizable(false); ! this.serverConnectionInfo = info; ! RelativeLayout layout = new RelativeLayout(); ! RelativePanelBuilder builder = new RelativePanelBuilder(layout); ! /* ! builder.addButton("Hallo","hallo", "HALLO", 10, 10); ! builder.setRightRightDistance("hallo",DependencyManager.ROOT_NAME,-10); ! builder.addButton("Noch nen Button", "button", "TEST"); ! builder.setTopBottomDistance("button","hallo",10); ! builder.setLeftLeftDistance("button",DependencyManager.ROOT_NAME,10); ! builder.addButton("Hiho","hiho","NOCHNENTEST"); ! builder.setTopBottomDistance("hiho","hallo",10); ! builder.setLeftRightDistance("hiho","button",10); ! builder.setRightRightDistance("hiho",DependencyManager.ROOT_NAME,-100); ! */ ! // OK / Abbrechen ! JButton ok = builder.createButton(GUIUtils.i18n("connect"), "OK", this); ! JButton cancel = builder.createButton(GUIUtils.i18n("cancel"), "CANCEL", this); ! builder.addOKCancelButtonBar(ok, cancel, "okcancel"); ! builder.setLeftLeftDistance("okcancel", null, 10); ! builder.setRightRightDistance("okcancel", null, -10); ! builder.setBottomBottomDistance("okcancel", null, -10); ! // Clientname ! clientname = builder.addTextField("clientname"); ! builder.addLabel(GUIUtils.i18n("clientname"), "clientlabel", clientname); ! builder.setLeft("clientlabel", 20); ! builder.setRightRightDistance("clientname", null, -20); ! builder.setTopBottomDistance("clientlabel", "header", 20); ! builder.setTopBottomDistance("clientname", "header", 20); ! // Password ! password = new JPasswordField(); ! builder.add(password, "password"); ! builder.addLabel(GUIUtils.i18n("password"), "passwordlabel", password); ! builder.setLeft("passwordlabel", 20); ! builder.setRightRightDistance("password", null, -20); ! builder.setTopBottomDistance("passwordlabel", "clientlabel,clientname", 5); ! builder.setTopBottomDistance("password", "clientlabel,clientname", 5); ! // Hostname ! hostname = builder.addComboBox(Settings.DEFAULT_SERVER_LIST, "hostcombo"); ! builder.addLabel(GUIUtils.i18n("hostname"), "hostlabel", hostname); ! builder.setLeft("hostlabel", 20); ! hostname.setEditable(true); ! builder.setRightRightDistance("hostcombo", null, -20); ! builder.setTopBottomDistance("hostlabel", "passwordlabel,password", 10); ! builder.setTopBottomDistance("hostcombo", "passwordlabel,password", 10); ! // Port ! port = builder.addTextField("portedit"); ! builder.addLabel(GUIUtils.i18n("port"), "portlabel", port); ! builder.setLeft("portlabel", 20); ! builder.setTopBottomDistance("portlabel", "hostlabel,hostcombo", 5); ! builder.setRightRightDistance("portedit", null, -20); ! builder.setLeftRightDistance("portedit", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! builder.setTopBottomDistance("portedit", "hostlabel,hostcombo,clientlabel,passwordlabel", 5); ! builder.setLeftRightDistance("hostcombo", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! builder.setLeftRightDistance("clientname", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! builder.setLeftRightDistance("password", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! // CheckBox für "lokale Verbindung" ! useNoServer = builder.addCheckBox(GUIUtils.i18n("nonserverconnect"), "nonserver", serverConnectionInfo.useNoServer); ! builder.setLeftLeftDistance("nonserver", "portedit", 0); ! builder.setTopBottomDistance("nonserver", "portlabel,portedit", 5); ! useNoServer.setActionCommand("USENOSERVER"); ! useNoServer.addActionListener(this); ! // Kopf ! builder.addDialogHeader("<html><b>" + GUIUtils.i18n("createconnectiontopacwserver") + "</b><br>" ! + GUIUtils.i18n("createconnectiontopacwserverhint") + "</html>", GUIConstants.ICON_SERVER_BIG, "header"); ! builder.setTop("header", 0); ! builder.setLeft("header", 0); ! builder.setRightRightDistance("header", null, 0); ! // Defaults setzen ! this.password.setText(serverConnectionInfo.password); ! this.clientname.setText(serverConnectionInfo.name); ! this.hostname.setSelectedItem(serverConnectionInfo.hostname); ! this.port.setText("" + serverConnectionInfo.port); ! mainPanel = builder.getPanel(); ! setContentPane(mainPanel); ! getRootPane().setDefaultButton(ok); ! //getContentPane().setLayout(new BorderLayout()); ! //getContentPane().add(mainPanel,BorderLayout.CENTER); ! } ! /** ! */ ! public void actionPerformed(ActionEvent e){ ! if ("OK".equals(e.getActionCommand())){ ! serverConnectionInfo = new ServerConnectionInfo(); ! serverConnectionInfo.hostname = (String) this.hostname.getSelectedItem(); ! serverConnectionInfo.password = new String(this.password.getPassword()); ! serverConnectionInfo.name = this.clientname.getText(); ! serverConnectionInfo.useNoServer = this.useNoServer.isSelected(); ! try{ ! serverConnectionInfo.port = Integer.parseInt(this.port.getText()); ! } catch (NumberFormatException n){ ! JOptionPane.showMessageDialog(this, GUIUtils.i18n("invalidportnumber")); ! return; ! } ! this.setVisible(false); ! } else if ("CANCEL".equals(e.getActionCommand())){ ! serverConnectionInfo = null; ! this.setVisible(false); ! } else if ("USENOSERVER".equals(e.getActionCommand())){ ! // CheckBox angeklickt ! boolean b = !useNoServer.isSelected(); ! this.hostname.setEnabled(b); ! this.port.setEnabled(b); ! } ! } ! public ServerConnectionInfo getServerConnectionInfo(){ ! return serverConnectionInfo; ! } ! public void setServerConnectionInfo(ServerConnectionInfo serverConnectionInfo){ ! this.serverConnectionInfo = serverConnectionInfo; ! } ! } \ No newline at end of file --- 32,202 ---- public class ConnectServerDialog extends JDialog implements ActionListener { ! private JPanel mainPanel; ! private ServerConnectionInfo serverConnectionInfo; ! private JComboBox hostname; ! private JTextField clientname; ! private JTextField port; ! private JPasswordField password; ! private JCheckBox useNoServer; ! /** ! * Static method to create and open a ConnectServerDialog ! * @param owner - the owner frame for the dialog ! * @param info - the server connection info ! * @return ! */ ! public static ServerConnectionInfo showDialog(Frame owner, ServerConnectionInfo info){ ! ConnectServerDialog d = new ConnectServerDialog(owner, info); ! GUIUtils.locateOnScreen(d); ! d.setModal(true); ! d.setVisible(true); ! return d.getServerConnectionInfo(); ! } ! /** ! * Constructor ! * @param owner - owner frame of this dialog (!= null) ! * @param info - server connnection info (!= null) ! */ ! public ConnectServerDialog(Frame owner, ServerConnectionInfo info) { ! super(owner, GUIUtils.i18n("connectserver")); ! ! // necessary to treat a dialog close as cancel ! addWindowListener(new java.awt.event.WindowAdapter() { ! public void windowClosing(java.awt.event.WindowEvent e) { ! cancelConnect(); ! } ! }); ! ! setSize(300, 300); ! this.setResizable(false); ! this.serverConnectionInfo = info; ! RelativeLayout layout = new RelativeLayout(); ! RelativePanelBuilder builder = new RelativePanelBuilder(layout); ! // OK / Abbrechen ! JButton ok = builder.createButton(GUIUtils.i18n("connect"), "OK", this); ! JButton cancel = builder.createButton(GUIUtils.i18n("cancel"), "CANCEL", this); ! builder.addOKCancelButtonBar(ok, cancel, "okcancel"); ! builder.setLeftLeftDistance("okcancel", null, 10); ! builder.setRightRightDistance("okcancel", null, -10); ! builder.setBottomBottomDistance("okcancel", null, -10); ! // Clientname ! clientname = builder.addTextField("clientname"); ! builder.addLabel(GUIUtils.i18n("clientname"), "clientlabel", clientname); ! builder.setLeft("clientlabel", 20); ! builder.setRightRightDistance("clientname", null, -20); ! builder.setTopBottomDistance("clientlabel", "header", 20); ! builder.setTopBottomDistance("clientname", "header", 20); ! // Password ! password = new JPasswordField(); ! builder.add(password, "password"); ! builder.addLabel(GUIUtils.i18n("password"), "passwordlabel", password); ! builder.setLeft("passwordlabel", 20); ! builder.setRightRightDistance("password", null, -20); ! builder.setTopBottomDistance("passwordlabel", "clientlabel,clientname", 5); ! builder.setTopBottomDistance("password", "clientlabel,clientname", 5); ! // Hostname ! hostname = builder.addComboBox(Settings.DEFAULT_SERVER_LIST, "hostcombo"); ! builder.addLabel(GUIUtils.i18n("hostname"), "hostlabel", hostname); ! builder.setLeft("hostlabel", 20); ! hostname.setEditable(true); ! builder.setRightRightDistance("hostcombo", null, -20); ! builder.setTopBottomDistance("hostlabel", "passwordlabel,password", 10); ! builder.setTopBottomDistance("hostcombo", "passwordlabel,password", 10); ! // Port ! port = builder.addTextField("portedit"); ! builder.addLabel(GUIUtils.i18n("port"), "portlabel", port); ! builder.setLeft("portlabel", 20); ! builder.setTopBottomDistance("portlabel", "hostlabel,hostcombo", 5); ! builder.setRightRightDistance("portedit", null, -20); ! builder.setLeftRightDistance("portedit", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! builder.setTopBottomDistance("portedit", "hostlabel,hostcombo,clientlabel,passwordlabel", 5); ! builder.setLeftRightDistance("hostcombo", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! builder.setLeftRightDistance("clientname", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! builder.setLeftRightDistance("password", "portlabel,hostlabel,clientlabel,passwordlabel", 5); ! // CheckBox für "lokale Verbindung" ! useNoServer = builder.addCheckBox(GUIUtils.i18n("nonserverconnect"), "nonserver", serverConnectionInfo.useNoServer); ! builder.setLeftLeftDistance("nonserver", "portedit", 0); ! builder.setTopBottomDistance("nonserver", "portlabel,portedit", 5); ! useNoServer.setActionCommand("USENOSERVER"); ! useNoServer.addActionListener(this); ! // Kopf ! builder.addDialogHeader("<html><b>" + GUIUtils.i18n("createconnectiontopacwserver") + "</b><br>" ! + GUIUtils.i18n("createconnectiontopacwserverhint") + "</html>", GUIConstants.ICON_SERVER_BIG, "header"); ! builder.setTop("header", 0); ! builder.setLeft("header", 0); ! builder.setRightRightDistance("header", null, 0); ! // Defaults setzen ! this.password.setText(serverConnectionInfo.password); ! this.clientname.setText(serverConnectionInfo.name); ! this.hostname.setSelectedItem(serverConnectionInfo.hostname); ! this.port.setText("" + serverConnectionInfo.port); ! mainPanel = builder.getPanel(); ! setContentPane(mainPanel); ! getRootPane().setDefaultButton(ok); ! //getContentPane().setLayout(new BorderLayout()); ! //getContentPane().add(mainPanel,BorderLayout.CENTER); ! } ! /* (non-Javadoc) ! * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) ! */ ! public void actionPerformed(ActionEvent e){ ! if ("OK".equals(e.getActionCommand())){ ! serverConnectionInfo = new ServerConnectionInfo(); ! serverConnectionInfo.hostname = (String) this.hostname.getSelectedItem(); ! serverConnectionInfo.password = new String(this.password.getPassword()); ! serverConnectionInfo.name = this.clientname.getText(); ! serverConnectionInfo.useNoServer = this.useNoServer.isSelected(); ! try { ! serverConnectionInfo.port = Integer.parseInt(this.port.getText()); ! } catch (NumberFormatException n){ ! JOptionPane.showMessageDialog(this, GUIUtils.i18n("invalidportnumber")); ! return; ! } ! this.setVisible(false); ! } else if ("CANCEL".equals(e.getActionCommand())){ ! cancelConnect(); ! } else if ("USENOSERVER".equals(e.getActionCommand())){ ! // CheckBox angeklickt ! boolean b = !useNoServer.isSelected(); ! this.hostname.setEnabled(b); ! this.port.setEnabled(b); ! } ! } ! /** ! * local method for cancelling a connect dialog ! */ ! private void cancelConnect() { ! serverConnectionInfo = null; ! this.setVisible(false); ! } ! /** ! * get the ServerConnectionInfo ! * @return the serverConnectionInfo ! */ ! public ServerConnectionInfo getServerConnectionInfo(){ ! return serverConnectionInfo; ! } ! /** ! * set the ServerConnectionInfo ! * @param serverConnectionInfo - the new serverConnectionInfo ! */ ! public void setServerConnectionInfo(ServerConnectionInfo serverConnectionInfo){ ! this.serverConnectionInfo = serverConnectionInfo; ! } ! } |
|
From: Florian L. <fle...@us...> - 2006-02-01 13:27:37
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15318 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 11 May 2005 15:45:02 -0000 1.3 --- .cvsignore 1 Feb 2006 13:27:27 -0000 1.4 *************** *** 4,5 **** --- 4,6 ---- derby.log src-gen + MagicMap nightly.launch |
|
From: Torsten F. <tor...@us...> - 2006-01-31 12:27:06
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/algorithms/distance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24971/src/net/sf/magicmap/client/algorithms/distance Modified Files: MagicDistanceAlgorithm.java Log Message: Index: MagicDistanceAlgorithm.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/algorithms/distance/MagicDistanceAlgorithm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MagicDistanceAlgorithm.java 16 Jan 2005 16:01:25 -0000 1.1 --- MagicDistanceAlgorithm.java 31 Jan 2006 12:26:57 -0000 1.2 *************** *** 16,20 **** double result = 0; for (int i = 0; i < a.length; i++){ ! result += Math.abs(a[i] - b[i]); } result = result / (double) a.length; --- 16,22 ---- double result = 0; for (int i = 0; i < a.length; i++){ ! result += Math.abs(a[i] - b[i]);// ?Distanz der einzelnen Arraywerte, aufaddiert und durch die Anzahl dividiert ! // -> wahrscheinlich durchschnittliche Entfernung der einzelnen Positionen ! } result = result / (double) a.length; |
|
From: Florian L. <fle...@us...> - 2006-01-20 13:23:38
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3142/src/net/sf/magicmap/client/delegate Modified Files: Tag: MagicMap_Daedalus PositionDelegate.java Log Message: Index: PositionDelegate.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/PositionDelegate.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** PositionDelegate.java 30 Nov 2005 14:34:39 -0000 1.3.2.1 --- PositionDelegate.java 20 Jan 2006 13:23:29 -0000 1.3.2.2 *************** *** 66,72 **** * @see com.saugstation.pacw.generated.PositionFacade#movePosition(long, long, int, int) */ ! public void movePosition(long sessionId, String mapname, long positionId, int newPositionX, int newPositionY, boolean fixed) ! throws RemoteException, MapException, SessionException{ ! daedalus.updatePositionTable(localMac, newPositionX, newPositionY); } --- 66,72 ---- * @see com.saugstation.pacw.generated.PositionFacade#movePosition(long, long, int, int) */ ! public void movePosition(long sessionId, long positionId, int newPositionX, int newPositionY, boolean fixed) throws SessionException, MapException, RemoteException { ! ! daedalus.updatePositionTable(localMac, newPositionX, newPositionY); } *************** *** 74,78 **** * @see com.saugstation.pacw.generated.PositionFacade#deletePosition(long, long) */ ! public void deletePosition(long sessionId, String mapname, long positionId) throws RemoteException, MapException, SessionException{ } --- 74,78 ---- * @see com.saugstation.pacw.generated.PositionFacade#deletePosition(long, long) */ ! public void deletePosition(long sessionId, long positionId) throws SessionException, MapException, RemoteException { } *************** *** 93,95 **** --- 93,97 ---- } + + } \ No newline at end of file |
|
From: Andreas W. <an...@us...> - 2006-01-20 13:13:57
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32273/src/net/sf/magicmap/server/calculation Modified Files: Tag: ServerCalculationBranch Calculation.java Log Message: weitere Anpassungen Index: Calculation.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation/Attic/Calculation.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Calculation.java 18 Jan 2006 14:52:57 -0000 1.1.2.2 --- Calculation.java 20 Jan 2006 13:13:47 -0000 1.1.2.3 *************** *** 40,45 **** nodeModel.removeNode(node); } else{ ! System.out ! .println("Position with location information deleted, but node with given name is not a location!"); } } else{ --- 40,44 ---- nodeModel.removeNode(node); } else{ ! System.out.println("Position with location information deleted, but node with given name is not a location!"); } } else{ *************** *** 201,215 **** ClientNode client = (ClientNode) nodeModel.findNode(clientdto.getName()); ! // Wenn eigener Client unfixiert kommt Positionsangaben ignorieren ! if (client == controller.getClient() && !position.isFixed()){ ! // Aber noch schnell unfixieren ! client.setFix(false); ! System.out.println("Eigener Client wird ignoriert"); ! return; ! } else{ ! if (client == controller.getClient() && position.isFixed()){ ! System.out.println("Eigener Client empfangen mit fixierter Position."); ! } ! } // Sonst beachten wir alle Positionen die wir bekommen --- 200,216 ---- ClientNode client = (ClientNode) nodeModel.findNode(clientdto.getName()); ! /* ! * // Wenn eigener Client unfixiert kommt Positionsangaben ignorieren ! * if (client == controller.getClient() && !position.isFixed()){ ! * // Aber noch schnell unfixieren ! * client.setFix(false); ! * System.out.println("Eigener Client wird ignoriert"); ! * return; ! * } else{ ! * if (client == controller.getClient() && position.isFixed()){ ! * System.out.println("Eigener Client empfangen mit fixierter Position."); ! * } ! * } ! */ // Sonst beachten wir alle Positionen die wir bekommen *************** *** 236,241 **** client.setId(position.getId().longValue()); ! // Signalstärken usw. verwaltet der scannende Client selbst ! if (client == controller.getClient()) return; // Signalcharakteristik auswerden und gesehene --- 237,244 ---- client.setId(position.getId().longValue()); ! // Signalstärken usw. verwaltet der scannende Client selbst, ! // aber da wir hier im Server sind, tut er es nicht. ! ! // if (client == controller.getClient()) return; // Signalcharakteristik auswerden und gesehene |
|
From: Andreas W. <an...@us...> - 2006-01-18 14:53:05
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2744/src/net/sf/magicmap/server/calculation Modified Files: Tag: ServerCalculationBranch CalculationManager.java Calculation.java Log Message: Update Index: CalculationManager.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation/Attic/CalculationManager.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** CalculationManager.java 17 Jan 2006 15:50:56 -0000 1.1.2.1 --- CalculationManager.java 18 Jan 2006 14:52:57 -0000 1.1.2.2 *************** *** 7,11 **** public class CalculationManager { ! private HashMap<String,NodeModel> } --- 7,47 ---- public class CalculationManager { ! static CalculationManager singleton_CalculationManager = null; ! ! private HashMap calculators = null; ! ! public static CalculationManager getInstance() ! { ! if (singleton_CalculationManager == null) ! singleton_CalculationManager = new CalculationManager(); ! return singleton_CalculationManager; ! } ! ! public void addMap(String mapName) ! { ! calculators.put(mapName,new NodeModel()); ! } ! ! public void addMap(String mapName, NodeModel nodeModel) ! { ! calculators.put(mapName, nodeModel); ! } ! ! ! ! public NodeModel getNodeModel(String mapName) ! { ! if (calculators.containsKey(mapName)) ! { ! return (NodeModel) calculators.get(mapName); ! } ! return null; ! } ! ! ! private CalculationManager() ! { ! calculators = new HashMap<String,NodeModel>(); ! } } Index: Calculation.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/calculation/Attic/Calculation.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Calculation.java 17 Jan 2006 15:50:56 -0000 1.1.2.1 --- Calculation.java 18 Jan 2006 14:52:57 -0000 1.1.2.2 *************** *** 20,24 **** public class Calculation implements CalculationInterface { ! public void positionCreatedOrUpdatedOrDeleted(String mapName, PositionDTO position) { try{ SwingUtilities.invokeAndWait(new Runnable() { --- 20,24 ---- public class Calculation implements CalculationInterface { ! public void positionCreatedOrUpdatedOrDeleted(final String mapName, final PositionDTO position) { try{ SwingUtilities.invokeAndWait(new Runnable() { *************** *** 26,30 **** public void run(){ try{ ! NodeModel nodeModel = controller.getNodeModel(); Node node = nodeModel.findNode(position.getName()); --- 26,31 ---- public void run(){ try{ ! ! NodeModel nodeModel = CalculationManager.getInstance().getNodeModel(mapName); Node node = nodeModel.findNode(position.getName()); |
|
From: Torsten K. <zo...@us...> - 2006-01-18 12:44:54
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22410 Removed Files: Neu Textdokument.txt Log Message: --- Neu Textdokument.txt DELETED --- |
|
From: Torsten K. <zo...@us...> - 2006-01-18 12:42:19
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21814 Added Files: Neu Textdokument.txt Log Message: --- NEW FILE: Neu Textdokument.txt --- |
|
From: Andreas W. <an...@us...> - 2006-01-17 15:51:16
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/measurement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23010/src/net/sf/magicmap/server/measurement Added Files: Tag: ServerCalculationBranch Constants.java Log Message: First Version --- NEW FILE: Constants.java --- /* * Created on 09.12.2004 */ package net.sf.magicmap.server.measurement; /** * @author thuebner */ public class Constants { public static final double MIN_SIGNALLEVEL = -100.0; // Toter AccessPoint (intern) public static final double AP_DISTANCE_NEAR = 30.0; // Wann ein AP "nahe" ist (emprisch ermittelt) public static final double PENALTY_FACTOR = 0.01; } |
1 message has been excluded from this view by a project administrator.
