Changeset 28172 in osm for applications/editors
- Timestamp:
- 2012-03-31T23:23:15+02:00 (12 years ago)
- Location:
- applications/editors/josm/plugins/opendata
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/opendata/build.xml
r28152 r28172 28 28 <property name="commit.message" value="Commit message"/> 29 29 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 30 <property name="plugin.main.version" value="51 24"/>30 <property name="plugin.main.version" value="5132"/> 31 31 <!-- should not be necessary to change the following properties --> 32 32 <property name="josm" location="../../core/dist/josm-custom.jar"/> … … 177 177 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/> 178 178 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 179 <attribute name="Plugin-Requires" value="jts"/> 179 180 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 180 181 </manifest> -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java
r28044 r28172 28 28 import java.util.Set; 29 29 30 import org.openstreetmap.josm.actions.CombineWayAction;31 30 import org.openstreetmap.josm.actions.CombineWayAction.NodeGraph; 32 31 import org.openstreetmap.josm.command.Command; … … 34 33 import org.openstreetmap.josm.corrector.UserCancelException; 35 34 import org.openstreetmap.josm.data.osm.Node; 35 import org.openstreetmap.josm.data.osm.OsmPrimitive; 36 36 import org.openstreetmap.josm.data.osm.Relation; 37 37 import org.openstreetmap.josm.data.osm.TagCollection; … … 148 148 dialog.getTagConflictResolverModel().populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues()); 149 149 dialog.setTargetPrimitive(targetWay); 150 Set<Relation> parentRelations = CombineWayAction.getParentRelations(ways);150 Set<Relation> parentRelations = OsmPrimitive.getParentRelations(ways); 151 151 dialog.getRelationMemberConflictResolverModel().populate( 152 152 parentRelations,
Note:
See TracChangeset
for help on using the changeset viewer.