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

Timestamp:

2010-01-30T20:10:15+01:00 (14 years ago)

Author:

jttt

Message:

Adapted for JOSM r2907

Location:

applications/editors/josm/plugins/surveyor

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java (modified) (2 diffs)
• src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java (modified) (2 diffs)
• src/at/dallermassl/josm/plugin/surveyor/SurveyorLock.java (added)
• src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java (modified) (3 diffs)
• src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java (modified) (3 diffs)

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

@@ -33 +33 @@
         <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="2830" />
+        <property name="plugin.main.version" value="2907" />
 
 

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

@@ -14 +14 @@
 
 import javax.swing.JOptionPane;
-
-import livegps.LiveGpsLock;
 
 import org.openstreetmap.josm.Main;
@@ -53 +51 @@
             File tmpFile = new File(file.getAbsoluteFile()+".tmp");
             System.out.println("AutoSaving osm data to file " + file.getAbsolutePath());
-            synchronized(LiveGpsLock.class) {
+            synchronized(SurveyorLock.class) {
                 OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.getVersion());
                 w.header();

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

@@ -15 +15 @@
 
 import javax.swing.JOptionPane;
-
-import livegps.LiveGpsLock;
 
 import org.openstreetmap.josm.Main;
@@ -76 +74 @@
             PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(tmpFile)));
             GpxWriter gpxWriter = new GpxWriter(out);
-            synchronized(LiveGpsLock.class) {
-                gpxWriter.write(gpsLayer.data);
-            }
+            gpxWriter.write(gpsLayer.data);
             tmpFile.renameTo(file);
         } catch (IOException ioExc) {

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

@@ -10 +10 @@
 import java.util.Map.Entry;
 
-import livegps.LiveGpsLock;
-
 import org.dinopolis.util.collection.Tuple;
 import org.openstreetmap.josm.Main;
@@ -20 +18 @@
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
 import at.dallermassl.josm.plugin.surveyor.SurveyorAction;
+import at.dallermassl.josm.plugin.surveyor.SurveyorLock;
 
 /**
@@ -69 +68 @@
             node.put(entry.getKey(), entry.getValue());
         }
-        synchronized(LiveGpsLock.class) {
+        synchronized(SurveyorLock.class) {
             DataSet ds = Main.main.getCurrentDataSet();
             if(ds != null)

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

@@ -12 +12 @@
 
 import livegps.LiveGpsLayer;
-import livegps.LiveGpsLock;
 
 import org.openstreetmap.josm.Main;
@@ -24 +23 @@
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
+import at.dallermassl.josm.plugin.surveyor.SurveyorLock;
 import at.dallermassl.josm.plugin.surveyor.SurveyorPlugin;
 import at.dallermassl.josm.plugin.surveyor.action.gui.WaypointDialog;
@@ -86 +86 @@
         if(iconName != null)
             waypoint.attr.put("sym", iconName);
-        synchronized(LiveGpsLock.class) {
+        synchronized(SurveyorLock.class) {
             //layer.data.add(new Marker(event.getCoordinates(), markerText, iconName));
             layer.data.add(new Marker(event.getCoordinates(), markerText, iconName, null, -1.0, 0.0));