Changeset 6887 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

Timestamp:

2014-02-26T23:45:59+01:00 (10 years ago)

Author:

Don-vip

Message:

package refactoring of conflict commands => move all of them to new package command.conflict (some plugins have to be updated)

Location:

trunk/src/org/openstreetmap/josm/command/conflict

Files:

• . (added)
• ConflictAddCommand.java (moved) (moved from trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java ) (6 diffs)

trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.command;
+package org.openstreetmap.josm.command.conflict;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -16 +17 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
+/**
+ * Command used to add a new conflict.
+ * @since 1857
+ */
 public class ConflictAddCommand extends Command {
     private Conflict<? extends OsmPrimitive> conflict;
 
+    /**
+     * Constructs a new {@code ConflictAddCommand}.
+     * @param layer the data layer. Must not be null.
+     * @param conflict the conflict to add
+     */
     public ConflictAddCommand(OsmDataLayer layer, Conflict<? extends OsmPrimitive> conflict) {
         super(layer);
@@ -37 +47 @@
         );
     }
-    @Override public boolean executeCommand() {
+
+    @Override
+    public boolean executeCommand() {
         try {
             getLayer().getConflicts().add(conflict);
@@ -47 +59 @@
     }
 
-    @Override public void undoCommand() {
+    @Override
+    public void undoCommand() {
         if (! Main.map.mapView.hasLayer(getLayer())) {
             Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
@@ -58 +71 @@
     }
 
-    @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+    @Override
+    public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
         // nothing to fill
     }