Changeset 29854 in osm for applications/editors/josm/plugins/surveyor

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

applications/editors/josm/plugins/surveyor

Files:

• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java (modified) (2 diffs)
• src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java (modified) (2 diffs)
• src/org/dinopolis/util/collection/Tuple.java (modified) (3 diffs)
• src/test (deleted)

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

@@ -7 +7 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="6162"/>
     <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
 

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java

@@ -8 +8 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.text.MessageFormat;
 import java.util.Date;
@@ -13 +14 @@
 import java.util.TimerTask;
 
-import javax.swing.AbstractAction;
 import javax.swing.AbstractButton;
-import java.awt.event.KeyEvent;
 
-import at.dallermassl.josm.plugin.surveyor.action.SetWaypointAction;
+import livegps.LiveGpsLayer;
+
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.tools.Shortcut;
-
-import livegps.LiveGpsLayer;
 
 /**

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java

@@ -75 +75 @@
             GpxWriter gpxWriter = new GpxWriter(out);
             gpxWriter.write(gpsLayer.data);
+            gpxWriter.close();
             tmpFile.renameTo(file);
         } catch (IOException ioExc) {

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -53 +52 @@
      */
     public void actionPerformed(GpsActionEvent event) {
-        LatLon coordinates = event.getCoordinates();
         //System.out.println(getClass().getSimpleName() + " KOORD: " + coordinates.lat() + ", " + coordinates.lon());
         String markerTitle = getParameters().get(0);

applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/collection/Tuple.java

@@ -11 +11 @@
  *
  * @author cdaller
- *
+ * @deprecated Should be replaced by {@link org.openstreetmap.josm.tools.Pair}
  */
 public class Tuple<T1 extends Object, T2 extends Object> implements Map.Entry<T1, T2>{
     T1 first;
     T2 second;
-
-    /**
-     * Default Constructor
-     */
-    public Tuple() {
-    }
 
     /**
@@ -102 +96 @@
      * @see java.lang.Object#equals(java.lang.Object)
      */
-    @SuppressWarnings("unchecked")
     @Override
     public boolean equals(Object obj) {
@@ -111 +104 @@
         if (getClass() != obj.getClass())
             return false;
-        final Tuple other = (Tuple) obj;
+        final Tuple<?, ?> other = (Tuple<?, ?>) obj;
         if (this.first == null) {
             if (other.first != null)