Changeset 2512 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2009-11-24T10:45:04+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/Command.java
r2405 r2512 21 21 import org.openstreetmap.josm.gui.layer.Layer; 22 22 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 23 24 23 25 24 /** … … 151 150 abstract public MutableTreeNode description(); 152 151 153 154 155 152 } -
trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
r2198 r2512 14 14 * This is the common base class for {@see Command}s which manipulate {@see Conflict}s in 15 15 * addition to {@see OsmPrimitive}s. 16 * 16 * 17 17 * A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing 18 18 * it reconstitutes them. … … 37 37 /** 38 38 * remembers a conflict in the internal list of remembered conflicts 39 * 39 * 40 40 * @param c the remembered conflict 41 41 */ … … 49 49 * reconstitutes all remembered conflicts. Add the remembered conflicts to the 50 50 * set of conflicts of the {@see OsmDataLayer} this command was applied to. 51 * 51 * 52 52 */ 53 53 protected void reconstituteConflicts() { -
trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java
r2181 r2512 30 30 /** 31 31 * constructor 32 * 32 * 33 33 * @param my my node 34 34 * @param their their node … … 39 39 this.decision = decision; 40 40 } 41 42 41 43 42 @Override -
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r2468 r2512 50 50 /** 51 51 * Constructor. Deletes a collection of primitives in the current edit layer. 52 * 52 * 53 53 * @param data the primitives to delete. Must neither be null nor empty. 54 54 * @throws IllegalArgumentException thrown if data is null or empty … … 64 64 /** 65 65 * Constructor. Deletes a single primitive in the current edit layer. 66 * 66 * 67 67 * @param data the primitive to delete. Must not be null. 68 68 * @throws IllegalArgumentException thrown if data is null -
trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java
r2181 r2512 30 30 /** 31 31 * constructor 32 * 32 * 33 33 * @param my my node 34 34 * @param their their node … … 39 39 this.decision = decision; 40 40 } 41 42 41 43 42 @Override -
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r2495 r2512 54 54 */ 55 55 private List<OldState> oldState = new LinkedList<OldState>(); 56 57 56 58 57 public MoveCommand(OsmPrimitive osm, double x, double y) { -
trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java
r2414 r2512 65 65 * constructor 66 66 * @param primitive the primitive to purge 67 * 67 * 68 68 */ 69 69 public PurgePrimitivesCommand(OsmPrimitive primitive) { … … 75 75 * @param layer the OSM data layer 76 76 * @param primitive the primitive to purge 77 * 77 * 78 78 */ 79 79 public PurgePrimitivesCommand(OsmDataLayer layer, OsmPrimitive primitive) { … … 86 86 * @param layer the OSM data layer 87 87 * @param primitives the primitives to purge 88 * 88 * 89 89 */ 90 90 public PurgePrimitivesCommand(OsmDataLayer layer, Collection<OsmPrimitive> primitives) { … … 95 95 /** 96 96 * Replies a collection with the purged primitives 97 * 97 * 98 98 * @return a collection with the purged primitives 99 99 */ … … 235 235 * Use to inject a backreference data set used when the command 236 236 * is executed. 237 * 237 * 238 238 * @param ds the backreference data set 239 239 */ -
trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
r2163 r2512 50 50 this.mergedMembers = mergedMembers; 51 51 } 52 53 52 54 53 @Override -
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r2070 r2512 27 27 private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName()); 28 28 29 30 29 /** the conflict to resolve */ 31 30 private Conflict<OsmPrimitive> conflict; … … 34 33 private final List<TagMergeItem> mergeItems; 35 34 36 37 35 /** 38 36 * replies the number of decided conflicts 39 * 37 * 40 38 * @return the number of decided conflicts 41 39 */ … … 52 50 /** 53 51 * constructor 54 * 52 * 55 53 * @param my my primitive 56 54 * @param their their primitive … … 61 59 this.mergeItems = mergeItems; 62 60 } 63 64 61 65 62 @Override -
trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java
r2410 r2512 55 55 } 56 56 57 58 57 @Override 59 58 public MutableTreeNode description() { -
trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
r2381 r2512 35 35 private final List<Node> mergedNodeList; 36 36 37 38 37 /** 39 38 * … … 46 45 this.mergedNodeList = mergedNodeList; 47 46 } 48 49 47 50 48 @Override
Note:
See TracChangeset
for help on using the changeset viewer.