Ignore:
Timestamp:
2009-09-06T23:07:33+02:00 (15 years ago)
Author:
Gubaer
Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

    r1910 r2070  
    5252        return new DefaultMutableTreeNode(
    5353                new JLabel(
    54                         tr("Resolve conflicts in node list of of way {0}", conflict.getMy().id),
     54                        tr("Resolve conflicts in node list of of way {0}", conflict.getMy().getId()),
    5555                        ImageProvider.get("data", "object"),
    5656                        JLabel.HORIZONTAL
Note: See TracChangeset for help on using the changeset viewer.