Changeset 33197 in osm for applications/editors/josm/plugins/opendata
- Timestamp:
- 2017-03-24T23:18:22+01:00 (7 years ago)
- Location:
- applications/editors/josm/plugins/opendata
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/opendata/build.xml
r33155 r33197 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <project name="opendata" default="dist" basedir="."> 3 <property name="plugin.main.version" value="11 606"/>3 <property name="plugin.main.version" value="11772"/> 4 4 <property name="plugin.author" value="Don-vip"/> 5 5 <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/> -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java
r33155 r33197 14 14 import java.util.Set; 15 15 16 import org.openstreetmap.josm.Main; 16 17 import org.openstreetmap.josm.actions.CombineWayAction.NodeGraph; 17 18 import org.openstreetmap.josm.command.Command; … … 131 132 completeTagCollectionForEditing(tagsToEdit); 132 133 133 CombinePrimitiveResolverDialog dialog = CombinePrimitiveResolverDialog.getInstance();134 CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(Main.parent); 134 135 dialog.getTagConflictResolverModel().populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues()); 135 136 dialog.setTargetPrimitive(targetWay);
Note:
See TracChangeset
for help on using the changeset viewer.