Changeset 12588 in osm for applications/editors/josm/plugins/globalsat/src
- Timestamp:
- 2008-12-25T19:01:06+01:00 (16 years ago)
- Location:
- applications/editors/josm/plugins/globalsat/src/org
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/GpsRec.java
r10378 r12588 32 32 private int dg100TypeOfNextRec = -1; 33 33 // calculated data 34 private DatedateTime = null;34 private Calendar dateTime = null; 35 35 36 36 public GpsRec() … … 265 265 SimpleDateFormat sdf = new SimpleDateFormat(dateTimeFormat); 266 266 //logger.info(gsTime + " " + gsDate); 267 Calendar cal = GregorianCalendar.getInstance(); 268 cal.setTime(dateTime); 269 dateTimeString = sdf.format(cal.getTime()); 267 dateTimeString = sdf.format(dateTime.getTime()); 270 268 } 271 269 return dateTimeString; … … 316 314 int MM = (dg100Date - DD * 10000) / 100; 317 315 int YY = dg100Date - DD * 10000 - MM * 100; 318 dateTime = new Date(100 + YY, MM - 1, DD, hh, mm, ss); 316 dateTime = GregorianCalendar.getInstance(); 317 dateTime.set(2000 + YY, MM, DD, hh, mm, ss); 319 318 } 320 319 … … 415 414 * @return Returns the dateTime. 416 415 */ 417 public DategetDateTime()416 public Calendar getDateTime() 418 417 { 419 418 return dateTime; -
applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java
r11555 r12588 23 23 import org.openstreetmap.josm.actions.JosmAction; 24 24 import org.openstreetmap.josm.data.gpx.GpxData; 25 import org.openstreetmap.josm.tools.Shortcut; 25 26 26 27 import gnu.io.*; … … 108 109 class GlobalsatImportAction extends JosmAction{ 109 110 public GlobalsatImportAction(){ 110 super(tr("Globalsat Import"), "globalsatImport", tr("Import Data from Globalsat Datalogger DG100 into GPXLayer."), KeyEvent.VK_I, KeyEvent.CTRL_MASK, false); 111 super(tr("Globalsat Import"), "globalsatImport", 112 tr("Import Data from Globalsat Datalogger DG100 into GPXLayer."), 113 Shortcut.registerShortcut("menu:globalsatimport", tr("Menu: {0}", tr("Globalsat Import")), 114 KeyEvent.VK_I, Shortcut.GROUP_MENU), false); 111 115 } 112 116 public void actionPerformed(ActionEvent e){
Note:
See TracChangeset
for help on using the changeset viewer.