gpsmap-cvslog Mailing List for GPSylon
Status: Inactive
Brought to you by:
cdaller
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(64) |
Jun
(284) |
Jul
(167) |
Aug
(10) |
Sep
(2) |
Oct
(52) |
Nov
(128) |
Dec
(52) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(7) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(75) |
Oct
|
Nov
|
Dec
(4) |
2005 |
Jan
|
Feb
(22) |
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2006 |
Jan
(107) |
Feb
(17) |
Mar
(117) |
Apr
(34) |
May
(23) |
Jun
(55) |
Jul
(1) |
Aug
|
Sep
|
Oct
(233) |
Nov
(32) |
Dec
(7) |
2007 |
Jan
|
Feb
(12) |
Mar
(3) |
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(11) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Christof D. <cd...@us...> - 2008-03-19 21:23:09
|
Update of /cvsroot/gpsmap/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1621 Modified Files: antenv_jdk1.4.sh Log Message: added comment Index: antenv_jdk1.4.sh =================================================================== RCS file: /cvsroot/gpsmap/gpstool/antenv_jdk1.4.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** antenv_jdk1.4.sh 25 Apr 2007 09:03:22 -0000 1.1 --- antenv_jdk1.4.sh 19 Mar 2008 21:23:05 -0000 1.2 *************** *** 1,3 **** --- 1,4 ---- #!/bin/sh + # source this file! export JAVA_HOME=/opt/j2sdk1.4.2_13 export PATH=$JAVA_HOME/bin:$PATH |
From: Christof D. <cd...@us...> - 2008-03-19 21:21:59
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31230/src/org/dinopolis/gpstool/gpsinput/garmin Modified Files: GarminWaypointD109.java GarminWaypointD108.java Log Message: fixed bug in D108 and D109 Index: GarminWaypointD108.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin/GarminWaypointD108.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GarminWaypointD108.java 30 Jan 2008 20:44:04 -0000 1.17 --- GarminWaypointD108.java 19 Mar 2008 21:21:16 -0000 1.18 *************** *** 250,259 **** public GarminPacket toGarminPacket(int packet_id) { ! int data_length = 48 + Math.min(identification_.length()+1,51) ! + Math.min(comment_.length()+1,51) ! + Math.min(facility_.length()+1,31) ! + Math.min(city_.length()+1,25) ! + Math.min(address_.length()+1,51) ! + Math.min(cross_road_.length()+1,51); GarminPacket pack = new GarminPacket(packet_id,data_length); --- 250,265 ---- public GarminPacket toGarminPacket(int packet_id) { ! // int data_length = 48 + Math.min(identification_.length()+1,51) ! // + Math.min(comment_.length()+1,51) ! // + Math.min(facility_.length()+1,31) ! // + Math.min(city_.length()+1,25) ! // + Math.min(address_.length()+1,51) ! // + Math.min(cross_road_.length()+1,51); ! int data_length = 48 + identification_.length() + 1 ! + comment_.length() + 1 ! + facility_.length() + 1 ! + city_.length() + 1 ! + address_.length() + 1 ! + cross_road_.length() + 1; GarminPacket pack = new GarminPacket(packet_id,data_length); Index: GarminWaypointD109.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin/GarminWaypointD109.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GarminWaypointD109.java 30 Jan 2008 20:44:04 -0000 1.10 --- GarminWaypointD109.java 19 Mar 2008 21:21:16 -0000 1.11 *************** *** 226,235 **** public GarminPacket toGarminPacket(int packet_id) { ! int data_length = 52 + Math.min(identification_.length()+1,51) ! + Math.min(comment_.length()+1,51) ! + Math.min(facility_.length()+1,31) ! + Math.min(city_.length()+1,25) ! + Math.min(address_.length()+1,51) ! + Math.min(cross_road_.length()+1,51); GarminPacket pack = new GarminPacket(packet_id,data_length); --- 226,242 ---- public GarminPacket toGarminPacket(int packet_id) { ! // int data_length = 52 + identification_.length()+1,51) ! // + Math.min(comment_.length()+1,51) ! // + Math.min(facility_.length()+1,31) ! // + Math.min(city_.length()+1,25) ! // + Math.min(address_.length()+1,51) ! // + Math.min(cross_road_.length()+1,51); ! int data_length = 52 + identification_.length() + 1 ! + comment_.length() ! + facility_.length()+1 ! + city_.length()+1 ! + address_.length()+1 ! + cross_road_.length()+1; ! GarminPacket pack = new GarminPacket(packet_id,data_length); |
From: Christof D. <cd...@us...> - 2008-03-19 21:21:52
|
Update of /cvsroot/gpsmap/gpstool/doc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31230/doc Modified Files: changelog.txt Log Message: fixed bug in D108 and D109 Index: changelog.txt =================================================================== RCS file: /cvsroot/gpsmap/gpstool/doc/changelog.txt,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** changelog.txt 30 Jan 2008 20:49:24 -0000 1.64 --- changelog.txt 19 Mar 2008 21:21:10 -0000 1.65 *************** *** 1,4 **** --- 1,6 ---- ChangeLog for GPSMap/GPSylon (http://gpsmap.sourceforge.net) + 2008/03/19: fixed bugs D108 and D109 (variable length strings) + 2008/01/30: adding support for gpsd in GPSTool fixed problem in D108 and D109 (variable length strings) |
From: Christof D. <cd...@us...> - 2008-01-30 21:17:05
|
Update of /cvsroot/gpsmap/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15353 Modified Files: build.xml Log Message: fixed bug in gpstool, missing inner class when uploading Index: build.xml =================================================================== RCS file: /cvsroot/gpsmap/gpstool/build.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** build.xml 30 Jan 2008 20:47:48 -0000 1.56 --- build.xml 30 Jan 2008 21:17:08 -0000 1.57 *************** *** 473,476 **** --- 473,477 ---- <include name="org/dinopolis/gpstool/GPSTool$*.class"/> <include name="org/dinopolis/gpstool/gpx/ReadGPX.class"/> + <include name="org/dinopolis/gpstool/gpx/ReadGPX$*.class"/> </fileset> |
From: Christof D. <cd...@us...> - 2008-01-30 20:49:22
|
Update of /cvsroot/gpsmap/gpstool/doc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3677/doc Modified Files: changelog.txt Log Message: latest changes Index: changelog.txt =================================================================== RCS file: /cvsroot/gpsmap/gpstool/doc/changelog.txt,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** changelog.txt 25 Apr 2007 09:02:04 -0000 1.63 --- changelog.txt 30 Jan 2008 20:49:24 -0000 1.64 *************** *** 1,4 **** --- 1,8 ---- ChangeLog for GPSMap/GPSylon (http://gpsmap.sourceforge.net) + 2008/01/30: adding support for gpsd in GPSTool + fixed problem in D108 and D109 (variable length strings) + version 0.5.4, not yet released + 2007/04/25: new version of log4j jar, changed log4j.properties to use logfile for debug msgs version 0.5.3 released |
From: Christof D. <cd...@us...> - 2008-01-30 20:48:53
|
Update of /cvsroot/gpsmap/gpstool/doc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3288/doc Modified Files: readme.html screenshots.html Log Message: obfuscating my email address Index: readme.html =================================================================== RCS file: /cvsroot/gpsmap/gpstool/doc/readme.html,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** readme.html 3 Nov 2006 08:51:44 -0000 1.31 --- readme.html 30 Jan 2008 20:48:55 -0000 1.32 *************** *** 688,693 **** to <address> ! <a href="mailto:cd...@us...">Christof ! Dallermassl</a> at 47.059734°/15.473280° </address> </p> --- 688,716 ---- to <address> ! <script type="text/javascript" language="javascript"> ! <!-- ! // Email obfuscator script 2.1 by Tim Williams, University of Arizona ! // Random encryption key feature by Andrew Moulden, Site Engineering Ltd ! // This code is freeware provided these four comment lines remain intact ! // A wizard to generate this code is at http://www.jottings.com/obfuscator/ ! { coded = "lQt44Xx@hHXxH.HuhxlXPuxLX.VX3" ! key = "QTrPHVypbUSeMgz6k41BIcOADt2JuGFxWdZmfsnjXvLwN7E08Clq9R3Y5haKio" ! shift=coded.length ! link="" ! for (i=0; i<coded.length; i++) { ! if (key.indexOf(coded.charAt(i))==-1) { ! ltr = coded.charAt(i) ! link += (ltr) ! } ! else { ! ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length ! link += (key.charAt(ltr)) ! } ! } ! document.write("<a href='mailto:"+link+"'>Christof Dallermassl</a>") ! } ! //--> ! </script><noscript>Sorry, you need Javascript on to email me.</noscript> ! at 47.059734°/15.473280° </address> </p> Index: screenshots.html =================================================================== RCS file: /cvsroot/gpsmap/gpstool/doc/screenshots.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** screenshots.html 1 Feb 2006 15:35:25 -0000 1.6 --- screenshots.html 30 Jan 2008 20:48:55 -0000 1.7 *************** *** 86,90 **** Please report any comments, bugfixes, ... to ! <address><a href="mailto:cd...@us...">Christof Dallermassl</a></address> <div id="sflogo"> <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=64816&type=4" width="125" height="37" border="0" alt="SourceForge.net Logo" /> --- 86,114 ---- Please report any comments, bugfixes, ... to ! <address><script type="text/javascript" language="javascript"> ! <!-- ! // Email obfuscator script 2.1 by Tim Williams, University of Arizona ! // Random encryption key feature by Andrew Moulden, Site Engineering Ltd ! // This code is freeware provided these four comment lines remain intact ! // A wizard to generate this code is at http://www.jottings.com/obfuscator/ ! { coded = "lQt44Xx@hHXxH.HuhxlXPuxLX.VX3" ! key = "QTrPHVypbUSeMgz6k41BIcOADt2JuGFxWdZmfsnjXvLwN7E08Clq9R3Y5haKio" ! shift=coded.length ! link="" ! for (i=0; i<coded.length; i++) { ! if (key.indexOf(coded.charAt(i))==-1) { ! ltr = coded.charAt(i) ! link += (ltr) ! } ! else { ! ltr = (key.indexOf(coded.charAt(i))-shift+key.length) % key.length ! link += (key.charAt(ltr)) ! } ! } ! document.write("<a href='mailto:"+link+"'>Christof Dallermassl</a>") ! } ! //--> ! </script><noscript>Sorry, you need Javascript on to email me.</noscript> ! </address> <div id="sflogo"> <a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=64816&type=4" width="125" height="37" border="0" alt="SourceForge.net Logo" /> |
From: Christof D. <cd...@us...> - 2008-01-30 20:47:46
|
Update of /cvsroot/gpsmap/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2864 Modified Files: gpstool.sh gpstool.cmd serialportlist.cmd gpsylon.sh gpsylon.cmd build.xml serialportlist.sh Log Message: adopted to version 0.5.4 Index: serialportlist.sh =================================================================== RCS file: /cvsroot/gpsmap/gpstool/serialportlist.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** serialportlist.sh 1 Aug 2007 12:38:11 -0000 1.5 --- serialportlist.sh 30 Jan 2008 20:47:48 -0000 1.6 *************** *** 43,45 **** #echo "PRGDIR is $PRGDIR" ! $JAVA $JAVA_LIB $GPSYLON_VMARGS -cp $PRGDIR/gpsinput-0.5.3.jar:$PRGDIR/lib/java/RXTXcomm.jar org.dinopolis.gpstool.gpsinput.SerialPortList --- 43,45 ---- #echo "PRGDIR is $PRGDIR" ! $JAVA $JAVA_LIB $GPSYLON_VMARGS -cp $PRGDIR/gpsinput-0.5.4.jar:$PRGDIR/lib/java/RXTXcomm.jar org.dinopolis.gpstool.gpsinput.SerialPortList Index: build.xml =================================================================== RCS file: /cvsroot/gpsmap/gpstool/build.xml,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** build.xml 25 Apr 2007 09:02:57 -0000 1.55 --- build.xml 30 Jan 2008 20:47:48 -0000 1.56 *************** *** 16,20 **** <echo>Java Version: ${java.version}</echo> ! <property name="release_version" value="0.5.3"/> <property name="target_class_dir" value="classes"/> <property name="source_dir" value="src"/> --- 16,20 ---- <echo>Java Version: ${java.version}</echo> ! <property name="release_version" value="0.5.4"/> <property name="target_class_dir" value="classes"/> <property name="source_dir" value="src"/> Index: gpsylon.cmd =================================================================== RCS file: /cvsroot/gpsmap/gpstool/gpsylon.cmd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gpsylon.cmd 24 Oct 2006 15:17:40 -0000 1.8 --- gpsylon.cmd 30 Jan 2008 20:47:48 -0000 1.9 *************** *** 13,15 **** rem run the jar file: ! java "%JAVA_LIB%" %GPSYLON_VMARGS% -jar "%PRG_DIR%gpsylon-0.5.3.jar" %* --- 13,15 ---- rem run the jar file: ! java "%JAVA_LIB%" %GPSYLON_VMARGS% -jar "%PRG_DIR%gpsylon-0.5.4.jar" %* Index: gpstool.sh =================================================================== RCS file: /cvsroot/gpsmap/gpstool/gpstool.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gpstool.sh 1 Aug 2007 12:38:11 -0000 1.5 --- gpstool.sh 30 Jan 2008 20:47:48 -0000 1.6 *************** *** 43,45 **** #echo "PRGDIR is $PRGDIR" ! $JAVA $JAVA_LIB $GPSYLON_VMARGS -jar $PRGDIR/gpstool-0.5.3.jar "$@" --- 43,45 ---- #echo "PRGDIR is $PRGDIR" ! $JAVA $JAVA_LIB $GPSYLON_VMARGS -jar $PRGDIR/gpstool-0.5.4.jar "$@" Index: gpstool.cmd =================================================================== RCS file: /cvsroot/gpsmap/gpstool/gpstool.cmd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gpstool.cmd 24 Oct 2006 15:17:40 -0000 1.2 --- gpstool.cmd 30 Jan 2008 20:47:48 -0000 1.3 *************** *** 15,19 **** rem run the jar file: rem c:\j2skd1.4.2_12\bin\java.exe -version ! java "%JAVA_LIB%" %GPSYLON_VMARGS% -jar "%PRG_DIR%gpstool-0.5.3.jar" %* pause --- 15,19 ---- rem run the jar file: rem c:\j2skd1.4.2_12\bin\java.exe -version ! java "%JAVA_LIB%" %GPSYLON_VMARGS% -jar "%PRG_DIR%gpstool-0.5.4.jar" %* pause Index: serialportlist.cmd =================================================================== RCS file: /cvsroot/gpsmap/gpstool/serialportlist.cmd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** serialportlist.cmd 24 Oct 2006 15:17:40 -0000 1.5 --- serialportlist.cmd 30 Jan 2008 20:47:48 -0000 1.6 *************** *** 12,16 **** set JAVA_LIB=-Djava.library.path=%LIBPATH% ! set CLASSPATH="%PRG_DIR%gpsinput-0.5.3.jar;%PRG_DIR%lib/java/RXTXcomm.jar" rem run the jar file: --- 12,16 ---- set JAVA_LIB=-Djava.library.path=%LIBPATH% ! set CLASSPATH="%PRG_DIR%gpsinput-0.5.4.jar;%PRG_DIR%lib/java/RXTXcomm.jar" rem run the jar file: Index: gpsylon.sh =================================================================== RCS file: /cvsroot/gpsmap/gpstool/gpsylon.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gpsylon.sh 1 Aug 2007 12:38:11 -0000 1.10 --- gpsylon.sh 30 Jan 2008 20:47:48 -0000 1.11 *************** *** 43,46 **** #echo "PRGDIR is $PRGDIR" ! $JAVA $JAVA_LIB $GPSYLON_VMARGS -jar $PRGDIR/gpsylon-0.5.3.jar "$@" --- 43,46 ---- #echo "PRGDIR is $PRGDIR" ! $JAVA $JAVA_LIB $GPSYLON_VMARGS -jar $PRGDIR/gpsylon-0.5.4.jar "$@" |
From: Christof D. <cd...@us...> - 2008-01-30 20:44:04
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1253/src/org/dinopolis/gpstool/gpsinput/garmin Modified Files: GarminWaypointD109.java GarminWaypointD108.java Log Message: fixed problem with variable length values Index: GarminWaypointD108.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin/GarminWaypointD108.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GarminWaypointD108.java 21 Apr 2006 12:43:31 -0000 1.16 --- GarminWaypointD108.java 30 Jan 2008 20:44:04 -0000 1.17 *************** *** 178,187 **** // read strings ! identification_ = pack.getNextAsString(51); ! comment_ = pack.getNextAsString(51); ! facility_ = pack.getNextAsString(31); ! city_ = pack.getNextAsString(25); ! address_ = pack.getNextAsString(51); ! cross_road_ = pack.getNextAsString(51); } --- 178,187 ---- // read strings ! identification_ = pack.getNextAsString(); ! comment_ = pack.getNextAsString(); ! facility_ = pack.getNextAsString(); ! city_ = pack.getNextAsString(); ! address_ = pack.getNextAsString(); ! cross_road_ = pack.getNextAsString(); } *************** *** 271,280 **** pack.setNextAsString(state_code_,2,false); pack.setNextAsString(country_code_,2,false); ! pack.setNextAsString(identification_,51,true); ! pack.setNextAsString(comment_,51,true); ! pack.setNextAsString(facility_,31,true); ! pack.setNextAsString(city_,25,true); ! pack.setNextAsString(address_,51,true); ! pack.setNextAsString(cross_road_,51,true); return (pack); --- 271,281 ---- pack.setNextAsString(state_code_,2,false); pack.setNextAsString(country_code_,2,false); ! ! pack.setNextAsString(identification_); ! pack.setNextAsString(comment_); ! pack.setNextAsString(facility_); ! pack.setNextAsString(city_); ! pack.setNextAsString(address_); ! pack.setNextAsString(cross_road_); return (pack); Index: GarminWaypointD109.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin/GarminWaypointD109.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GarminWaypointD109.java 13 Dec 2006 10:41:11 -0000 1.9 --- GarminWaypointD109.java 30 Jan 2008 20:44:04 -0000 1.10 *************** *** 150,159 **** // read strings ! identification_ = pack.getNextAsString(51); ! comment_ = pack.getNextAsString(51); ! facility_ = pack.getNextAsString(31); ! city_ = pack.getNextAsString(25); ! address_ = pack.getNextAsString(51); ! cross_road_ = pack.getNextAsString(51); } --- 150,159 ---- // read strings ! identification_ = pack.getNextAsString(); ! comment_ = pack.getNextAsString(); ! facility_ = pack.getNextAsString(); ! city_ = pack.getNextAsString(); ! address_ = pack.getNextAsString(); ! cross_road_ = pack.getNextAsString(); } *************** *** 248,257 **** pack.setNextAsString(country_code_,2,false); pack.setNextAsLongWord(ete_); ! pack.setNextAsString(identification_,51,true); ! pack.setNextAsString(comment_,51,true); ! pack.setNextAsString(facility_,31,true); ! pack.setNextAsString(city_,25,true); ! pack.setNextAsString(address_,51,true); ! pack.setNextAsString(cross_road_,51,true); return (pack); --- 248,257 ---- pack.setNextAsString(country_code_,2,false); pack.setNextAsLongWord(ete_); ! pack.setNextAsString(identification_); ! pack.setNextAsString(comment_); ! pack.setNextAsString(facility_); ! pack.setNextAsString(city_); ! pack.setNextAsString(address_); ! pack.setNextAsString(cross_road_); return (pack); |
From: Christof D. <cd...@us...> - 2008-01-30 20:43:01
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv767/src/org/dinopolis/gpstool/gpsinput/garmin Modified Files: GarminProduct.java Log Message: added comment Index: GarminProduct.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/garmin/GarminProduct.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GarminProduct.java 1 Dec 2003 09:38:07 -0000 1.7 --- GarminProduct.java 30 Jan 2008 20:43:02 -0000 1.8 *************** *** 48,51 **** --- 48,52 ---- product_software_= GarminDataConverter.getGarminWord(buffer,4); product_name_ = GarminDataConverter.getGarminString(buffer,6); + // FIXME: latest specification has multiple zero terminated strings here } |
From: Christof D. <cd...@us...> - 2008-01-30 20:42:48
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv682/src/org/dinopolis/gpstool Modified Files: Gpsylon.java Log Message: new version 0.5.4 Index: Gpsylon.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/Gpsylon.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Gpsylon.java 25 Apr 2007 09:00:26 -0000 1.12 --- Gpsylon.java 30 Jan 2008 20:42:43 -0000 1.13 *************** *** 137,141 **** { ! public final static String GPSYLON_VERSION = "0.5.3"; private final static String GPSYLON_CVS_VERSION = "$Revision$"; --- 137,141 ---- { ! public final static String GPSYLON_VERSION = "0.5.4"; private final static String GPSYLON_CVS_VERSION = "$Revision$"; |
From: Christof D. <cd...@us...> - 2008-01-30 20:41:20
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32512/src/org/dinopolis/gpstool Modified Files: GPSTool.java Log Message: adding support for gpsd Index: GPSTool.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/GPSTool.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GPSTool.java 23 Oct 2006 08:15:38 -0000 1.5 --- GPSTool.java 30 Jan 2008 20:41:17 -0000 1.6 *************** *** 55,58 **** --- 55,59 ---- import org.dinopolis.gpstool.gpsinput.GPSException; import org.dinopolis.gpstool.gpsinput.GPSFileDevice; + import org.dinopolis.gpstool.gpsinput.GPSNetworkGpsdDevice; import org.dinopolis.gpstool.gpsinput.GPSPosition; import org.dinopolis.gpstool.gpsinput.GPSRawDataFileLogger; *************** *** 208,212 **** String[] valid_args = ! new String[] {"device*","d*","help","h","speed#","s#","file*","f*", "nmea","n","garmin","g","sirf","i","rawdata","downloadtracks", "downloadwaypoints","downloadroutes","deviceinfo","printposonce", --- 209,213 ---- String[] valid_args = ! new String[] {"device*","d*","help","h","speed#","s#","file*","f*","gpsd*", "nmea","n","garmin","g","sirf","i","rawdata","downloadtracks", "downloadwaypoints","downloadroutes","deviceinfo","printposonce", *************** *** 233,236 **** --- 234,240 ---- String filename = null; String serial_port_name = null; + boolean gpsd = false; + String gpsd_host = "localhost"; + int gpsd_port = 2947; int serial_port_speed = -1; GPSDataProcessor gps_data_processor; *************** *** 283,286 **** --- 287,305 ---- filename = (String)args.getValue("f"); } + + if(args.isSet("gpsd")) + { + gpsd = true; + String gpsd_host_port = (String) args.getValue("gpsd"); + if (gpsd_host_port != null && gpsd_host_port.length() > 0) + { + String[] params = gpsd_host_port.split(":"); + gpsd_host = params[0]; + if (params.length > 0) + { + gpsd_port = Integer.parseInt(params[1]); + } + } + } if (args.isSet("garmin") || args.isSet("g")) *************** *** 340,343 **** --- 359,368 ---- gps_device = new GPSFileDevice(); } + else if(gpsd) + { + environment.put(GPSNetworkGpsdDevice.GPSD_HOST_KEY,gpsd_host); + environment.put(GPSNetworkGpsdDevice.GPSD_PORT_KEY,new Integer(gpsd_port)); + gps_device = new GPSNetworkGpsdDevice(); + } else { |
From: Christof D. <cd...@us...> - 2008-01-30 20:40:18
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/util/io In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31451/src/org/dinopolis/util/io Modified Files: Tokenizer.java Log Message: using a list instead of vector Index: Tokenizer.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/util/io/Tokenizer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Tokenizer.java 21 Apr 2006 14:14:56 -0000 1.6 --- Tokenizer.java 30 Jan 2008 20:40:03 -0000 1.7 *************** *** 732,736 **** { int token = nextToken(); ! Vector list = new Vector(); String word = ""; // while(token != Tokenizer.EOF) --- 732,736 ---- { int token = nextToken(); ! List list = new ArrayList(); String word = ""; // while(token != Tokenizer.EOF) |
From: Christof D. <cd...@us...> - 2008-01-30 20:39:34
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/util In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31435/src/org/dinopolis/gpstool/util Modified Files: GeoMath.java Log Message: added comment about wrong calculation Index: GeoMath.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/util/GeoMath.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GeoMath.java 13 Mar 2006 12:13:32 -0000 1.6 --- GeoMath.java 30 Jan 2008 20:39:37 -0000 1.7 *************** *** 58,61 **** --- 58,63 ---- * @param longitude2 the longitude of the second point given in degrees. * @return the distance in meters. + * FIXXME: The calculation is wrong (does not respect that a degree close to the pole is + * less (in meters) than a degree at the equator! */ public static double distance(double latitude1, double longitude1, |
From: Christof D. <cd...@us...> - 2008-01-30 20:38:58
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/nmea In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30912/src/org/dinopolis/gpstool/gpsinput/nmea Modified Files: GPSNmeaDataProcessor.java Log Message: try to reconnect added vdop, hdop to events Index: GPSNmeaDataProcessor.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/gpsinput/nmea/GPSNmeaDataProcessor.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** GPSNmeaDataProcessor.java 11 Apr 2007 07:51:37 -0000 1.16 --- GPSNmeaDataProcessor.java 30 Jan 2008 20:39:00 -0000 1.17 *************** *** 48,52 **** * Contributions: * <ul> ! * <li>Didier Donsez <did...@im...> added hanlding of VTG and HTD nmea sentences</li> * </ul> */ --- 48,52 ---- * Contributions: * <ul> ! * <li>Didier Donsez <did...@im...> added handling of VTG and HTD nmea sentences</li> * </ul> */ *************** *** 394,397 **** --- 394,415 ---- if (open_) // otherwise, this is the reason for the exception! ioe.printStackTrace(); + + // try to reconnect: + logger_.info("Lost connection, sleeping and try to reconnect"); + try + { + Thread.sleep(5000); // 5sec + } + catch (InterruptedException ie) + { + } + try + { + open(); + } catch (GPSException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } } } *************** *** 655,675 **** List data_fields = sentence.getDataFields(); Integer[] satellites_ids = new Integer[12]; - String pdop = (String) data_fields.get(14); - String hdop = (String) data_fields.get(15); - String vdop = (String) data_fields.get(16); int valid_fix = Integer.parseInt((String) data_fields.get(1)); ! ! for (int i=0; i < 12; i++) { ! String id = (String) data_fields.get(i+2); ! if (id != null && id.length()>0) { ! satellites_ids[i] = new Integer(Integer.parseInt(id)); ! } } - - changeGPSData(PDOP,new Float(pdop)); - - changeGPSData(HDOP,new Float(hdop)); ! changeGPSData(VDOP, new Float(vdop)); changeGPSData(IDS_SATELLITES, satellites_ids); --- 673,697 ---- List data_fields = sentence.getDataFields(); Integer[] satellites_ids = new Integer[12]; int valid_fix = Integer.parseInt((String) data_fields.get(1)); ! ! if(data_fields.size() > 13) ! { ! String pdop = (String) data_fields.get(14); ! String hdop = (String) data_fields.get(15); ! String vdop = (String) data_fields.get(16); ! changeGPSData(PDOP,new Float(pdop)); ! changeGPSData(HDOP,new Float(hdop)); ! changeGPSData(VDOP, new Float(vdop)); } ! for (int sat_index=0; sat_index < 12; sat_index++) { ! if(data_fields.size() > sat_index + 2) ! { ! String id = (String) data_fields.get(sat_index+2); ! if (id != null && id.length()>0) { ! satellites_ids[sat_index] = new Integer(Integer.parseInt(id)); ! } ! } ! } changeGPSData(IDS_SATELLITES, satellites_ids); |
From: Samuel B. <sa...@us...> - 2007-08-01 12:38:13
|
Update of /cvsroot/gpsmap/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31719 Modified Files: gpstool.sh gpsylon.sh serialportlist.sh Log Message: arch durch uname -m ersetzt (debian unstable hat arch entfernt) Index: serialportlist.sh =================================================================== RCS file: /cvsroot/gpsmap/gpstool/serialportlist.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** serialportlist.sh 24 Oct 2006 15:17:40 -0000 1.4 --- serialportlist.sh 1 Aug 2007 12:38:11 -0000 1.5 *************** *** 30,34 **** # Get the path to the native libraries ! LIBPATH=$PRGDIR/lib/native/`uname -s`/`arch` if [ -d "$LIBPATH" ]; then --- 30,34 ---- # Get the path to the native libraries ! LIBPATH=$PRGDIR/lib/native/`uname -s`/`uname -m` if [ -d "$LIBPATH" ]; then Index: gpstool.sh =================================================================== RCS file: /cvsroot/gpsmap/gpstool/gpstool.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gpstool.sh 5 Feb 2007 12:26:52 -0000 1.4 --- gpstool.sh 1 Aug 2007 12:38:11 -0000 1.5 *************** *** 30,34 **** # Get the path to the native libraries ! LIBPATH=$PRGDIR/lib/native/`uname -s`/`arch` if [ -d "$LIBPATH" ]; then --- 30,34 ---- # Get the path to the native libraries ! LIBPATH=$PRGDIR/lib/native/`uname -s`/`uname -m` if [ -d "$LIBPATH" ]; then Index: gpsylon.sh =================================================================== RCS file: /cvsroot/gpsmap/gpstool/gpsylon.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gpsylon.sh 5 Feb 2007 12:26:52 -0000 1.9 --- gpsylon.sh 1 Aug 2007 12:38:11 -0000 1.10 *************** *** 30,34 **** # Get the path to the native libraries ! LIBPATH=$PRGDIR/lib/native/`uname -s`/`arch` if [ -d "$LIBPATH" ]; then --- 30,34 ---- # Get the path to the native libraries ! LIBPATH=$PRGDIR/lib/native/`uname -s`/`uname -m` if [ -d "$LIBPATH" ]; then |
From: Christof D. <cd...@us...> - 2007-04-25 09:03:22
|
Update of /cvsroot/gpsmap/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18787 Added Files: antenv_jdk1.4.sh Log Message: set java version to 1.4 for building --- NEW FILE: antenv_jdk1.4.sh --- #!/bin/sh export JAVA_HOME=/opt/j2sdk1.4.2_13 export PATH=$JAVA_HOME/bin:$PATH |
From: Christof D. <cd...@us...> - 2007-04-25 09:03:00
|
Update of /cvsroot/gpsmap/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18387 Modified Files: build.xml Log Message: new log4j version print java version at startup Index: build.xml =================================================================== RCS file: /cvsroot/gpsmap/gpstool/build.xml,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** build.xml 24 Oct 2006 15:17:40 -0000 1.54 --- build.xml 25 Apr 2007 09:02:57 -0000 1.55 *************** *** 13,16 **** --- 13,19 ---- <!-- (that does not seem to work outside of a target!) --> <target name="init"> + <echo>Java Home: ${java.home}</echo> + <echo>Java Version: ${java.version}</echo> + <property name="release_version" value="0.5.3"/> <property name="target_class_dir" value="classes"/> *************** *** 51,55 **** <include name="postgresql-8.1-405.jdbc3.jar" /> <include name="velocity-dep-1.3.1.jar" /> ! <include name="log4j-1.2.8.jar" /> </patternset> --- 54,58 ---- <include name="postgresql-8.1-405.jdbc3.jar" /> <include name="velocity-dep-1.3.1.jar" /> ! <include name="log4j-1.2.14.jar" /> </patternset> *************** *** 60,64 **** <include name="RXTXcomm.jar" /> <include name="velocity-dep-1.3.1.jar" /> ! <include name="log4j-1.2.8.jar" /> </patternset> --- 63,67 ---- <include name="RXTXcomm.jar" /> <include name="velocity-dep-1.3.1.jar" /> ! <include name="log4j-1.2.14.jar" /> </patternset> *************** *** 68,72 **** <!--include name="comm.jar" /--> <include name="RXTXcomm.jar" /> ! <include name="log4j-1.2.8.jar" /> </patternset> --- 71,75 ---- <!--include name="comm.jar" /--> <include name="RXTXcomm.jar" /> ! <include name="log4j-1.2.14.jar" /> </patternset> *************** *** 74,78 **** <patternset id="util.lib.patternset"> <include name="gnu-regexp-1.1.3.jar" /> ! <include name="log4j-1.2.8.jar" /> </patternset> --- 77,81 ---- <patternset id="util.lib.patternset"> <include name="gnu-regexp-1.1.3.jar" /> ! <include name="log4j-1.2.14.jar" /> </patternset> *************** *** 183,187 **** <fileset dir="${basedir}/${lib_dir}"> <include name="gnu-regexp-1.1.3.jar" /> ! <include name="log4j-1.2.8.jar" /> </fileset> </classpath> --- 186,190 ---- <fileset dir="${basedir}/${lib_dir}"> <include name="gnu-regexp-1.1.3.jar" /> ! <include name="log4j-1.2.14.jar" /> </fileset> </classpath> *************** *** 203,207 **** <classpath id="compile_gpsinput-classpath"> <fileset dir="${basedir}/${lib_dir}"> ! <include name="log4j-1.2.8.jar"/> <include name="RXTXcomm.jar"/> </fileset> --- 206,210 ---- <classpath id="compile_gpsinput-classpath"> <fileset dir="${basedir}/${lib_dir}"> ! <include name="log4j-1.2.14.jar"/> <include name="RXTXcomm.jar"/> </fileset> *************** *** 228,232 **** <classpath id="compile_gpstool-classpath"> <fileset dir="${basedir}/${lib_dir}"> ! <include name="log4j-1.2.8.jar"/> <include name="RXTXcomm.jar"/> <include name="velocity-dep-1.3.1.jar" /> --- 231,235 ---- <classpath id="compile_gpstool-classpath"> <fileset dir="${basedir}/${lib_dir}"> ! <include name="log4j-1.2.14.jar"/> <include name="RXTXcomm.jar"/> <include name="velocity-dep-1.3.1.jar" /> *************** *** 352,356 **** <exec executable="/bin/sh"> <arg value="-c"/> ! <arg value="javadoc -J-Dhttp.proxyHost=${http_proxy_host} -J-Dhttp.proxyPort=${http_proxy_port} -breakiterator -classpath ${target_class_dir}:lib/java/openmap.jar:lib/java/gnu-regexp-1.1.3.jar:lib/java/log4j-1.2.8.jar:lib/java/velocity-dep-1.3.1.jar -d ${javadoc_dir} -sourcepath ${source_dir}/ -version -author -link http://openmap.bbn.com/doc/api/ -link http://java.sun.com/j2se/1.4/docs/api/ -subpackages org.dinopolis"/> </exec> </target> --- 355,359 ---- <exec executable="/bin/sh"> <arg value="-c"/> ! <arg value="javadoc -J-Dhttp.proxyHost=${http_proxy_host} -J-Dhttp.proxyPort=${http_proxy_port} -breakiterator -classpath ${target_class_dir}:lib/java/openmap.jar:lib/java/gnu-regexp-1.1.3.jar:lib/java/log4j-1.2.14.jar:lib/java/velocity-dep-1.3.1.jar -d ${javadoc_dir} -sourcepath ${source_dir}/ -version -author -link http://openmap.bbn.com/doc/api/ -link http://java.sun.com/j2se/1.4/docs/api/ -subpackages org.dinopolis"/> </exec> </target> |
From: Christof D. <cd...@us...> - 2007-04-25 09:02:39
|
Update of /cvsroot/gpsmap/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18348 Modified Files: .classpath Log Message: new log4j version Index: .classpath =================================================================== RCS file: /cvsroot/gpsmap/gpstool/.classpath,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** .classpath 27 Feb 2007 18:27:11 -0000 1.13 --- .classpath 25 Apr 2007 09:02:34 -0000 1.14 *************** *** 46,50 **** <classpathentry kind="src" output="plugins/writesvgimage/classes" path="plugins/writesvgimage/src"/> <classpathentry kind="lib" path="lib/java/gnu-regexp-1.1.3.jar"/> - <classpathentry kind="lib" path="lib/java/log4j-1.2.8.jar"/> <classpathentry kind="lib" path="lib/java/openmap.jar"/> <classpathentry kind="lib" path="lib/java/pg73jdbc3.jar"/> --- 46,49 ---- *************** *** 68,71 **** --- 67,71 ---- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java 1.4.2"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/java/log4j-1.2.14.jar"/> <classpathentry kind="output" path="classes"/> </classpath> |
From: Christof D. <cd...@us...> - 2007-04-25 09:02:20
|
Update of /cvsroot/gpsmap/gpstool/lib/java In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18318/lib/java Removed Files: log4j-1.2.8.jar Log Message: replaced by new version --- log4j-1.2.8.jar DELETED --- |
From: Christof D. <cd...@us...> - 2007-04-25 09:02:05
|
Update of /cvsroot/gpsmap/gpstool/doc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17941/doc Modified Files: changelog.txt Log Message: latest changelogs Index: changelog.txt =================================================================== RCS file: /cvsroot/gpsmap/gpstool/doc/changelog.txt,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** changelog.txt 11 Apr 2007 07:51:58 -0000 1.62 --- changelog.txt 25 Apr 2007 09:02:04 -0000 1.63 *************** *** 1,4 **** --- 1,7 ---- ChangeLog for GPSMap/GPSylon (http://gpsmap.sourceforge.net) + 2007/04/25: new version of log4j jar, changed log4j.properties to use logfile for debug msgs + version 0.5.3 released + 2007/04/11: added support for nmea sentence GSA (includes hdop, vdop and ids of satellites) (thanks to Philipe Morin) |
From: Christof D. <cd...@us...> - 2007-04-25 09:01:47
|
Update of /cvsroot/gpsmap/gpstool/lib/java In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17889/lib/java Added Files: log4j-1.2.14.jar Log Message: new log4j version --- NEW FILE: log4j-1.2.14.jar --- (This appears to be a binary file; contents omitted.) |
From: Christof D. <cd...@us...> - 2007-04-25 09:01:20
|
Update of /cvsroot/gpsmap/gpstool/auxiliary In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17860/auxiliary Modified Files: log4j.properties Log Message: completely rewritten: use new log4j, log to file Index: log4j.properties =================================================================== RCS file: /cvsroot/gpsmap/gpstool/auxiliary/log4j.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** log4j.properties 21 Apr 2006 12:35:03 -0000 1.3 --- log4j.properties 25 Apr 2007 09:01:20 -0000 1.4 *************** *** 2,21 **** # this is the log4j configuration file # ! #log4j.debug=true ! # user either rootLogger or categorylogger, otherwise all messages appear twice: ! log4j.rootLogger=INFO,console ! #log4j.category.org.dinopolis.gpstool.gpsinput.garmin.GPSGarminDataProcessor.packet.threads=DEBUG, console ! # log4j.category.org.dinopolis.gpstool=INFO,console ! # log4j.category.org.dinopolis.gpstool.Gpsylon=INFO, console ! # log4j.category.org.dinopolis.gpstool.Gpsylon.plugin=DEBUG, console ! # log4j.category.org.dinopolis.gpstool.Gpsylon.propertychange=INFO, console ! log4j.appender.console=org.apache.log4j.ConsoleAppender ! log4j.appender.console.layout=org.apache.log4j.PatternLayout ! log4j.appender.console.layout.ConversionPattern=%-5p %m %l (%c)%n - log4j.appender.socket4445=org.apache.log4j.net.SocketAppender - log4j.appender.socket4445.RemoteHost=localhost - log4j.appender.socket4445.Port=4445 --- 2,29 ---- # this is the log4j configuration file # + ### direct log messages to CONSOLE ### + log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender + log4j.appender.CONSOLE.Target=System.out + log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout + log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %m%n + log4j.appender.CONSOLE.Threshold=INFO ! ### direct messages to log FILE ### ! log4j.appender.FILE=org.apache.log4j.FileAppender ! log4j.appender.FILE.File=gpsylon.log ! log4j.appender.FILE.layout=org.apache.log4j.PatternLayout ! log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c{1}:%L - %m%n ! # the following recreates a file for each run ! log4j.appender.FILE.Append=false ! # prevent duplicates: ! log4j.additivity.FILE=false ! log4j.appender.FILE.Threshold=DEBUG ! ### set log levels - for more verbose logging change 'info' to 'debug' ### ! log4j.rootLogger=DEBUG, CONSOLE, FILE ! ! # detailed loggers: ! #log4j.logger.org.dinopolis.gpstool.Gpsylon=DEBUG, CONSOLE ! #log4j.logger.org.dinopolis=DEBUG,FILE |
From: Christof D. <cd...@us...> - 2007-04-25 09:00:49
|
Update of /cvsroot/gpsmap/gpstool/plugins/googlemaps/src/org/dinopolis/gpstool/plugin/googlemap In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17457/plugins/googlemaps/src/org/dinopolis/gpstool/plugin/googlemap Modified Files: GoogleMapPlugin.java Log Message: removed unused import Index: GoogleMapPlugin.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/plugins/googlemaps/src/org/dinopolis/gpstool/plugin/googlemap/GoogleMapPlugin.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GoogleMapPlugin.java 2 Nov 2006 22:38:21 -0000 1.1 --- GoogleMapPlugin.java 25 Apr 2007 09:00:48 -0000 1.2 *************** *** 54,58 **** import org.dinopolis.util.Resources; import org.dinopolis.util.gui.ActionStore; - import org.dinopolis.util.gui.MenuFactory; import com.bbn.openmap.LatLonPoint; --- 54,57 ---- |
From: Christof D. <cd...@us...> - 2007-04-25 09:00:32
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17398/src/org/dinopolis/gpstool Modified Files: Gpsylon.java Log Message: changed some log messages Index: Gpsylon.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/Gpsylon.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Gpsylon.java 13 Dec 2006 10:40:33 -0000 1.11 --- Gpsylon.java 25 Apr 2007 09:00:26 -0000 1.12 *************** *** 387,393 **** +log_file+"' - logging disabled."); logger_ = Logger.getLogger(Gpsylon.class); ! logger_plugin_ = Logger.getLogger(Gpsylon.class+".connection"); ! logger_connection_ = Logger.getLogger(Gpsylon.class+".plugin"); ! logger_gpsdata_ = Logger.getLogger(Gpsylon.class+".gpsdata"); } --- 387,393 ---- +log_file+"' - logging disabled."); logger_ = Logger.getLogger(Gpsylon.class); ! logger_plugin_ = Logger.getLogger(Gpsylon.class.getName()+".plugin"); ! logger_connection_ = Logger.getLogger(Gpsylon.class.getName()+".connection"); ! logger_gpsdata_ = Logger.getLogger(Gpsylon.class.getName()+".gpsdata"); } *************** *** 1654,1657 **** --- 1654,1659 ---- String gps_mode = resources_.getString(KEY_GPS_DEVICE_MODE); String gps_protocol = resources_.getString(KEY_GPS_DEVICE_PROTOCOL); + if(logger_connection_.isDebugEnabled()) + logger_connection_.debug("connecting in gps mode '" + gps_mode + "' with gps protocol '" + gps_protocol + "'"); // TODO check plausability (e.g. protocol is garmin, but // logfile for nmea is set, protocol garmin, but tcp is set, *************** *** 1717,1721 **** { if(logger_connection_.isDebugEnabled()) ! logger_connection_.debug("connecting to nmea device"); // if(Debug.DEBUG) // Debug.println("GPSMap_GPSConnection","connecting to nmea device"); --- 1719,1723 ---- { if(logger_connection_.isDebugEnabled()) ! logger_connection_.debug("connecting to nmea device " + serial_port_name); // if(Debug.DEBUG) // Debug.println("GPSMap_GPSConnection","connecting to nmea device"); *************** *** 1737,1741 **** { if(logger_connection_.isDebugEnabled()) ! logger_connection_.debug("connecting to garmin device"); // if(Debug.DEBUG) // Debug.println("GPSMap_GPSConnection","connecting to garmin device"); --- 1739,1743 ---- { if(logger_connection_.isDebugEnabled()) ! logger_connection_.debug("connecting to garmin device " + serial_port_name); // if(Debug.DEBUG) // Debug.println("GPSMap_GPSConnection","connecting to garmin device"); *************** *** 1758,1764 **** gps_device.init(environment); gps_data_processor_.setGPSDevice(gps_device); ! if(logger_connection_.isDebugEnabled()) ! logger_connection_.debug("connecting to gpsdevice on port " ! +serial_port_name +" at "+serial_port_speed+" baud"); // if(Debug.DEBUG) // Debug.println("GPSMap_GPSConnection","connecting to gpsdevice on port " --- 1760,1764 ---- gps_device.init(environment); gps_data_processor_.setGPSDevice(gps_device); ! logger_.info("Connecting to gpsdevice on port " +serial_port_name +" at "+serial_port_speed+" baud"); // if(Debug.DEBUG) // Debug.println("GPSMap_GPSConnection","connecting to gpsdevice on port " |
From: Christof D. <cd...@us...> - 2007-04-25 09:00:12
|
Update of /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/plugin In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17036/src/org/dinopolis/gpstool/plugin Modified Files: WriteTrackPlugin.java Log Message: fixed javadoc Index: WriteTrackPlugin.java =================================================================== RCS file: /cvsroot/gpsmap/gpstool/src/org/dinopolis/gpstool/plugin/WriteTrackPlugin.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WriteTrackPlugin.java 13 Dec 2006 10:41:12 -0000 1.2 --- WriteTrackPlugin.java 25 Apr 2007 09:00:10 -0000 1.3 *************** *** 61,75 **** public String[] getContentFileExtensions(); - //---------------------------------------------------------------------- - /** - * Parse the given input stream and return tracks. If no tracks could - * be read, an empty array (length of 0) is returned (not null!). - * - * @param in the inputstream to read the data from. - * @return an array of {@link - * org.dinopolis.gpstool.track.Track} objects. - * @throws IOException if an error occurs during reading. - */ public void writeTracks(OutputStream out, List tracks) throws IOException; --- 61,71 ---- public String[] getContentFileExtensions(); + /** + * Writes the given tracks to the output stream. + * @param out the output stream to write to. + * @param tracks the tracks to write to. + * @throws IOException if an error occurs. + */ public void writeTracks(OutputStream out, List tracks) throws IOException; |