Changeset 5266 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
- Timestamp:
- 2012-06-03T16:41:25+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r5132 r5266 61 61 * 62 62 * There is a singleton instance of this dialog which can be retrieved using 63 * {@ see#getInstance()}.63 * {@link #getInstance()}. 64 64 * 65 65 * The dialog uses two models: one for resolving tag conflicts, the other 66 66 * for resolving conflicts in relation memberships. For both models there are accessors, 67 * i.e {@ see #getTagConflictResolverModel()} and {@see#getRelationMemberConflictResolverModel()}.67 * i.e {@link #getTagConflictResolverModel()} and {@link #getRelationMemberConflictResolverModel()}. 68 68 * 69 69 * Models have to be <strong>populated</strong> before the dialog is launched. Example: … … 76 76 * 77 77 * You should also set the target primitive which other primitives (ways or nodes) are 78 * merged to, see {@ see#setTargetPrimitive(OsmPrimitive)}.79 * 80 * After the dialog is closed use {@ see#isCanceled()} to check whether the user canceled81 * the dialog. If it wasn't canceled you may build a collection of {@ seeCommand} objects78 * merged to, see {@link #setTargetPrimitive(OsmPrimitive)}. 79 * 80 * After the dialog is closed use {@link #isCanceled()} to check whether the user canceled 81 * the dialog. If it wasn't canceled you may build a collection of {@link Command} objects 82 82 * which reflect the conflict resolution decisions the user made in the dialog: 83 * see {@ see#buildResolutionCommands()}83 * see {@link #buildResolutionCommands()} 84 84 * 85 85 *
Note:
See TracChangeset
for help on using the changeset viewer.