Changeset 27243 in osm for applications/editors

Timestamp:

2011-12-15T18:35:55+01:00 (13 years ago)

Author:

stoecker

Message:

update to core changes

Location:

applications/editors/josm/plugins

Files:

• build.xml (modified) (2 diffs)
• osmarender/build.xml (modified) (1 diff)
• osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java (modified) (2 diffs)
• surveyor/build.xml (modified) (1 diff)
• surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java (modified) (2 diffs)
• undelete/build.xml (modified) (1 diff)
• undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java (modified) (2 diffs)

applications/editors/josm/plugins/build.xml

@@ -31 +31 @@
         <ant antfile="build.xml" target="dist" dir="globalsat"/>
         <ant antfile="build.xml" target="dist" dir="gpxfilter"/>
-        <ant antfile="build.xml" target="dist" dir="gpxpoints"/>
         <ant antfile="build.xml" target="dist" dir="graphview"/>
         <ant antfile="build.xml" target="dist" dir="imageryadjust"/>
@@ -120 +119 @@
         <ant antfile="build.xml" target="clean" dir="globalsat"/>
         <ant antfile="build.xml" target="clean" dir="gpxfilter"/>
-        <ant antfile="build.xml" target="clean" dir="gpxpoints"/>
         <ant antfile="build.xml" target="clean" dir="graphview"/>
         <ant antfile="build.xml" target="clean" dir="imageryadjust"/>

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

@@ -34 +34 @@
     <property name="xslt" location="./xslt"/>
     <property name="commit.message" value="Fixed #4360 - osmarender plugin does not load"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4645"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>

applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java

@@ -35 +35 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.io.OsmWriter;
+import org.openstreetmap.josm.io.OsmWriterFactory;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -63 +64 @@
             try {
                 // write to plugin dir
-                OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(getPluginDir()+File.separator+"data.osm")), false, "0.6");
+                OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(new FileOutputStream(getPluginDir()+File.separator+"data.osm")), false, "0.6");
                 w.header();
 

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

@@ -32 +32 @@
     <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="4549"/>
+    <property name="plugin.main.version" value="4645"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>

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

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.OsmWriter;
+import org.openstreetmap.josm.io.OsmWriterFactory;
 
 /**
@@ -52 +53 @@
             System.out.println("AutoSaving osm data to file " + file.getAbsolutePath());
             synchronized(SurveyorLock.class) {
-                OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.getVersion());
+                OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.getVersion());
                 w.header();
                 w.writeDataSources(dataset);

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

@@ -32 +32 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4602"/>
     <!--
       ************************************************

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java

@@ -219 +219 @@
                       hPrimitive1=h.getLatest();
                       hPrimitive2=h.getByVersion(h.getNumVersions()-1);
-                      
+
                       Relation rel = new Relation(id, (int) hPrimitive1.getVersion());
-                      
+
                       HistoryRelation hRel = (HistoryRelation) hPrimitive2;
-                      
+
                       List<RelationMember> members = new ArrayList<RelationMember>(hRel.getNumMembers());
                       for (org.openstreetmap.josm.data.osm.history.RelationMember m : hRel.getMembers()) {
@@ -237 +237 @@
                         members.add(new RelationMember(m.getRole(), p));
                       }
-                      
+
                       rel.setMembers(members);
-                      
+
                       primitive=rel;
                   }
 
-                  User user = User.createOsmUser(hPrimitive1.getUid(), hPrimitive1.getUser());
+                  User user = hPrimitive1.getUser();
 
                   primitive.setUser(user);