Ignore:
Timestamp:
2009-11-24T10:45:04+01:00 (15 years ago)
Author:
stoecker
Message:

i18n updated, fixed files to reduce problems when applying patches, fix #4017

Location:
trunk/src/org/openstreetmap/josm/command
Files:
11 edited

Legend:

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

    r2405 r2512  
    2121import org.openstreetmap.josm.gui.layer.Layer;
    2222import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    23 
    2423
    2524/**
     
    151150    abstract public MutableTreeNode description();
    152151
    153 
    154 
    155152}
  • trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java

    r2198 r2512  
    1414 * This is the common base class for {@see Command}s which manipulate {@see Conflict}s in
    1515 * addition to {@see OsmPrimitive}s.
    16  * 
     16 *
    1717 * A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing
    1818 * it reconstitutes them.
     
    3737    /**
    3838     * remembers a conflict in the internal list of remembered conflicts
    39      * 
     39     *
    4040     * @param c the remembered conflict
    4141     */
     
    4949     * reconstitutes all remembered conflicts. Add the remembered conflicts to the
    5050     * set of conflicts of the {@see OsmDataLayer} this command was applied to.
    51      * 
     51     *
    5252     */
    5353    protected void reconstituteConflicts() {
  • trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

    r2181 r2512  
    3030    /**
    3131     * constructor
    32      * 
     32     *
    3333     * @param my  my node
    3434     * @param their  their node
     
    3939        this.decision = decision;
    4040    }
    41 
    4241
    4342    @Override
  • trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

    r2468 r2512  
    5050    /**
    5151     * Constructor. Deletes a collection of primitives in the current edit layer.
    52      * 
     52     *
    5353     * @param data the primitives to delete. Must neither be null nor empty.
    5454     * @throws IllegalArgumentException thrown if data is null or empty
     
    6464    /**
    6565     * Constructor. Deletes a single primitive in the current edit layer.
    66      * 
     66     *
    6767     * @param data  the primitive to delete. Must not be null.
    6868     * @throws IllegalArgumentException thrown if data is null
  • trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

    r2181 r2512  
    3030    /**
    3131     * constructor
    32      * 
     32     *
    3333     * @param my  my node
    3434     * @param their  their node
     
    3939        this.decision = decision;
    4040    }
    41 
    4241
    4342    @Override
  • trunk/src/org/openstreetmap/josm/command/MoveCommand.java

    r2495 r2512  
    5454     */
    5555    private List<OldState> oldState = new LinkedList<OldState>();
    56 
    5756
    5857    public MoveCommand(OsmPrimitive osm, double x, double y) {
  • trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java

    r2414 r2512  
    6565     * constructor
    6666     * @param primitive the primitive to purge
    67      * 
     67     *
    6868     */
    6969    public PurgePrimitivesCommand(OsmPrimitive primitive) {
     
    7575     * @param layer the OSM data layer
    7676     * @param primitive the primitive to purge
    77      * 
     77     *
    7878     */
    7979    public PurgePrimitivesCommand(OsmDataLayer layer, OsmPrimitive primitive) {
     
    8686     * @param layer the OSM data layer
    8787     * @param primitives the primitives to purge
    88      * 
     88     *
    8989     */
    9090    public PurgePrimitivesCommand(OsmDataLayer layer, Collection<OsmPrimitive> primitives) {
     
    9595    /**
    9696     * Replies a collection with the purged primitives
    97      * 
     97     *
    9898     * @return a collection with the purged primitives
    9999     */
     
    235235     * Use to inject a backreference data set used when the command
    236236     * is executed.
    237      * 
     237     *
    238238     * @param ds the backreference data set
    239239     */
  • trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java

    r2163 r2512  
    5050        this.mergedMembers = mergedMembers;
    5151    }
    52 
    5352
    5453    @Override
  • trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

    r2070 r2512  
    2727    private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());
    2828
    29 
    3029    /** the conflict to resolve */
    3130    private Conflict<OsmPrimitive> conflict;
     
    3433    private final List<TagMergeItem> mergeItems;
    3534
    36 
    3735    /**
    3836     * replies the number of decided conflicts
    39      * 
     37     *
    4038     * @return the number of decided conflicts
    4139     */
     
    5250    /**
    5351     * constructor
    54      * 
     52     *
    5553     * @param my  my primitive
    5654     * @param their  their primitive
     
    6159        this.mergeItems = mergeItems;
    6260    }
    63 
    6461
    6562    @Override
  • trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

    r2410 r2512  
    5555    }
    5656
    57 
    5857    @Override
    5958    public MutableTreeNode description() {
  • trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

    r2381 r2512  
    3535    private final List<Node> mergedNodeList;
    3636
    37 
    3837    /**
    3938     *
     
    4645        this.mergedNodeList = mergedNodeList;
    4746    }
    48 
    4947
    5048    @Override
Note: See TracChangeset for help on using the changeset viewer.