Changeset 27243 in osm for applications/editors


Ignore:
Timestamp:
2011-12-15T18:35:55+01:00 (13 years ago)
Author:
stoecker
Message:

update to core changes

Location:
applications/editors/josm/plugins
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/build.xml

    r27119 r27243  
    3131        <ant antfile="build.xml" target="dist" dir="globalsat"/>
    3232        <ant antfile="build.xml" target="dist" dir="gpxfilter"/>
    33         <ant antfile="build.xml" target="dist" dir="gpxpoints"/>
    3433        <ant antfile="build.xml" target="dist" dir="graphview"/>
    3534        <ant antfile="build.xml" target="dist" dir="imageryadjust"/>
     
    120119        <ant antfile="build.xml" target="clean" dir="globalsat"/>
    121120        <ant antfile="build.xml" target="clean" dir="gpxfilter"/>
    122         <ant antfile="build.xml" target="clean" dir="gpxpoints"/>
    123121        <ant antfile="build.xml" target="clean" dir="graphview"/>
    124122        <ant antfile="build.xml" target="clean" dir="imageryadjust"/>
  • applications/editors/josm/plugins/osmarender/build.xml

    r27019 r27243  
    3434    <property name="xslt" location="./xslt"/>
    3535    <property name="commit.message" value="Fixed #4360 - osmarender plugin does not load"/>
    36     <property name="plugin.main.version" value="4549"/>
     36    <property name="plugin.main.version" value="4645"/>
    3737    <target name="init">
    3838        <mkdir dir="${plugin.build.dir}"/>
  • applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java

    r23192 r27243  
    3535import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
    3636import org.openstreetmap.josm.io.OsmWriter;
     37import org.openstreetmap.josm.io.OsmWriterFactory;
    3738import org.openstreetmap.josm.plugins.Plugin;
    3839import org.openstreetmap.josm.plugins.PluginInformation;
     
    6364            try {
    6465                // write to plugin dir
    65                 OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(getPluginDir()+File.separator+"data.osm")), false, "0.6");
     66                OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(new FileOutputStream(getPluginDir()+File.separator+"data.osm")), false, "0.6");
    6667                w.header();
    6768
  • applications/editors/josm/plugins/surveyor/build.xml

    r26991 r27243  
    3232    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4549"/>
     34    <property name="plugin.main.version" value="4645"/>
    3535    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    3636    <property name="plugin.dist.dir" value="../../dist"/>
  • applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java

    r19681 r27243  
    1919import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    2020import org.openstreetmap.josm.io.OsmWriter;
     21import org.openstreetmap.josm.io.OsmWriterFactory;
    2122
    2223/**
     
    5253            System.out.println("AutoSaving osm data to file " + file.getAbsolutePath());
    5354            synchronized(SurveyorLock.class) {
    54                 OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.getVersion());
     55                OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.getVersion());
    5556                w.header();
    5657                w.writeDataSources(dataset);
  • applications/editors/josm/plugins/undelete/build.xml

    r27019 r27243  
    3232    <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4549"/>
     34    <property name="plugin.main.version" value="4602"/>
    3535    <!--
    3636      ************************************************
  • applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java

    r26196 r27243  
    219219                      hPrimitive1=h.getLatest();
    220220                      hPrimitive2=h.getByVersion(h.getNumVersions()-1);
    221                      
     221
    222222                      Relation rel = new Relation(id, (int) hPrimitive1.getVersion());
    223                      
     223
    224224                      HistoryRelation hRel = (HistoryRelation) hPrimitive2;
    225                      
     225
    226226                      List<RelationMember> members = new ArrayList<RelationMember>(hRel.getNumMembers());
    227227                      for (org.openstreetmap.josm.data.osm.history.RelationMember m : hRel.getMembers()) {
     
    237237                        members.add(new RelationMember(m.getRole(), p));
    238238                      }
    239                      
     239
    240240                      rel.setMembers(members);
    241                      
     241
    242242                      primitive=rel;
    243243                  }
    244244
    245                   User user = User.createOsmUser(hPrimitive1.getUid(), hPrimitive1.getUser());
     245                  User user = hPrimitive1.getUser();
    246246
    247247                  primitive.setUser(user);
Note: See TracChangeset for help on using the changeset viewer.