Changeset 12588 in osm for applications/editors/josm/plugins/globalsat

Timestamp:

2008-12-25T19:01:06+01:00 (16 years ago)

Author:

stoecker

Message:

updated a lot

Location:

applications/editors/josm/plugins/globalsat

Files:

• build.xml (modified) (1 diff)
• src/org/kaintoch/gps/globalsat/dg100/GpsRec.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/globalsat/build.xml

@@ -51 +51 @@
         <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
         <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Mainversion" value="1180"/>
       </manifest>
     </jar>

applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/GpsRec.java

@@ -32 +32 @@
         private int dg100TypeOfNextRec = -1;
         // calculated data
-        private Date dateTime = null;
+        private Calendar dateTime = null;
 
         public GpsRec()
@@ -265 +265 @@
                         SimpleDateFormat sdf = new SimpleDateFormat(dateTimeFormat);
                         //logger.info(gsTime + " " + gsDate);
-                        Calendar cal = GregorianCalendar.getInstance();
-                        cal.setTime(dateTime);
-                        dateTimeString = sdf.format(cal.getTime());
+                        dateTimeString = sdf.format(dateTime.getTime());
                 }
                 return dateTimeString;
@@ -316 +314 @@
                 int MM = (dg100Date - DD * 10000) / 100;
                 int YY = dg100Date - DD * 10000 - MM * 100;
-                dateTime = new Date(100 + YY, MM - 1, DD, hh, mm, ss);
+                dateTime = GregorianCalendar.getInstance();
+                dateTime.set(2000 + YY, MM, DD, hh, mm, ss);
         }
 
@@ -415 +414 @@
          * @return Returns the dateTime.
          */
-        public Date getDateTime()
+        public Calendar getDateTime()
         {
                 return dateTime;

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java

@@ -23 +23 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.tools.Shortcut;
 
 import gnu.io.*;
@@ -108 +109 @@
     class GlobalsatImportAction extends JosmAction{
         public GlobalsatImportAction(){
-            super(tr("Globalsat Import"), "globalsatImport", tr("Import Data from Globalsat Datalogger DG100 into GPXLayer."), KeyEvent.VK_I, KeyEvent.CTRL_MASK, false);
+            super(tr("Globalsat Import"), "globalsatImport",
+            tr("Import Data from Globalsat Datalogger DG100 into GPXLayer."),
+            Shortcut.registerShortcut("menu:globalsatimport", tr("Menu: {0}", tr("Globalsat Import")),
+            KeyEvent.VK_I, Shortcut.GROUP_MENU), false);
         }
         public void actionPerformed(ActionEvent e){