Changeset 5266 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2012-06-03T16:41:25+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/AddCommand.java
r5112 r5266 20 20 * way. 21 21 * 22 * See {@ seeChangeCommand} for comments on relation back references.22 * See {@link ChangeCommand} for comments on relation back references. 23 23 * 24 24 * @author imi -
trunk/src/org/openstreetmap/josm/command/Command.java
r5060 r5266 35 35 * one atomic action on a specific dataset, such as move or delete. 36 36 * 37 * The command remembers the {@ seeOsmDataLayer} it is operating on.37 * The command remembers the {@link OsmDataLayer} it is operating on. 38 38 * 39 39 * @author imi -
trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
r4191 r5266 10 10 11 11 /** 12 * This is the common base class for {@ seeCommand}s which manipulate {@seeConflict}s in13 * addition to {@ seeOsmPrimitive}s.12 * This is the common base class for {@link Command}s which manipulate {@link Conflict}s in 13 * addition to {@link OsmPrimitive}s. 14 14 * 15 15 * A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing … … 44 44 /** 45 45 * reconstitutes all remembered conflicts. Add the remembered conflicts to the 46 * set of conflicts of the {@ seeOsmDataLayer} this command was applied to.46 * set of conflicts of the {@link OsmDataLayer} this command was applied to. 47 47 * 48 48 */ -
trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java
r4918 r5266 14 14 15 15 /** 16 * Represents a the resolution of a conflict between the coordinates of two {@ seeNode}s16 * Represents a the resolution of a conflict between the coordinates of two {@link Node}s 17 17 * 18 18 */ -
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r5077 r5266 239 239 * If a way is deleted, only the way and no nodes are deleted. 240 240 * 241 * @param layer the {@ seeOsmDataLayer} in whose context primitives are deleted. Must not be null.241 * @param layer the {@link OsmDataLayer} in whose context primitives are deleted. Must not be null. 242 242 * @param selection The list of all object to be deleted. 243 243 * @param silent Set to true if the user should not be bugged with additional dialogs … … 270 270 * can be deleted too. A node can be deleted if 271 271 * <ul> 272 * <li>it is untagged (see {@ seeNode#isTagged()}</li>272 * <li>it is untagged (see {@link Node#isTagged()}</li> 273 273 * <li>it is not referred to by other non-deleted primitives outside of <code>primitivesToDelete</code></li> 274 274 * <ul> … … 310 310 * they are part of a relation, inform the user and do not delete. 311 311 * 312 * @param layer the {@ seeOsmDataLayer} in whose context the primitives are deleted312 * @param layer the {@link OsmDataLayer} in whose context the primitives are deleted 313 313 * @param selection the objects to delete. 314 314 * @param alsoDeleteNodesInWay <code>true</code> if nodes should be deleted as well … … 329 329 * they are part of a relation, inform the user and do not delete. 330 330 * 331 * @param layer the {@ seeOsmDataLayer} in whose context the primitives are deleted331 * @param layer the {@link OsmDataLayer} in whose context the primitives are deleted 332 332 * @param selection the objects to delete. 333 333 * @param alsoDeleteNodesInWay <code>true</code> if nodes should be deleted as well -
trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java
r4918 r5266 16 16 17 17 /** 18 * Represents a the resolution of a conflict between the coordinates of two {@ seeNode}s18 * Represents a the resolution of a conflict between the coordinates of two {@link Node}s 19 19 * 20 20 */ -
trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
r4918 r5266 16 16 17 17 /** 18 * Represents a command for to set the modified flag {@ seeOsmPrimitive}18 * Represents a command for to set the modified flag {@link OsmPrimitive} 19 19 * 20 20 * -
trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
r4918 r5266 18 18 /** 19 19 * Represent a command for resolving conflicts in the member lists of two 20 * {@ seeRelation}s.20 * {@link Relation}s. 21 21 * 22 22 */ -
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r4918 r5266 18 18 19 19 /** 20 * Represents a the resolution of a tag conflict in an {@ seeOsmPrimitive}20 * Represents a the resolution of a tag conflict in an {@link OsmPrimitive} 21 21 * 22 22 */ … … 25 25 private Conflict<? extends OsmPrimitive> conflict; 26 26 27 /** the list of merge decisions, represented as {@ seeTagMergeItem}s */27 /** the list of merge decisions, represented as {@link TagMergeItem}s */ 28 28 private final List<TagMergeItem> mergeItems; 29 29 … … 48 48 * @param my my primitive 49 49 * @param their their primitive 50 * @param mergeItems the list of merge decisions, represented as {@ seeTagMergeItem}s50 * @param mergeItems the list of merge decisions, represented as {@link TagMergeItem}s 51 51 */ 52 52 public TagConflictResolveCommand(Conflict<? extends OsmPrimitive> conflict, List<TagMergeItem> mergeItems) { -
trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
r4918 r5266 14 14 15 15 /** 16 * Represents a command for resolving a version conflict between two {@ seeOsmPrimitive}16 * Represents a command for resolving a version conflict between two {@link OsmPrimitive} 17 17 * 18 18 * -
trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
r4918 r5266 17 17 /** 18 18 * Represent a command for resolving conflicts in the node list of two 19 * {@ seeWay}s.19 * {@link Way}s. 20 20 * 21 21 */
Note:
See TracChangeset
for help on using the changeset viewer.