Changeset 11874 in josm

Timestamp:

2017-04-09T17:24:39+02:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD

Location:

trunk

Files:

• src/org/openstreetmap/josm/command/SequenceCommand.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

@@ -28 +28 @@
     private final String name;
     /** Determines if the sequence execution should continue after one of its commands fails. */
-    public boolean continueOnError;
+    protected final boolean continueOnError;
+
+    /**
+     * Create the command by specifying the list of commands to execute.
+     * @param name The description text
+     * @param sequenz The sequence that should be executed
+     * @param continueOnError Determines if the sequence execution should continue after one of its commands fails
+     * @since 11874
+     */
+    public SequenceCommand(String name, Collection<Command> sequenz, boolean continueOnError) {
+        this.name = name;
+        this.sequence = sequenz.toArray(new Command[sequenz.size()]);
+        this.continueOnError = continueOnError;
+    }
 
     /**
@@ -36 +49 @@
      */
     public SequenceCommand(String name, Collection<Command> sequenz) {
-        super();
-        this.name = name;
-        this.sequence = sequenz.toArray(new Command[sequenz.size()]);
+        this(name, sequenz, false);
     }
 

trunk/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java

@@ -122 +122 @@
         FailingCommand command2 = new FailingCommand();
         TestCommand command3 = new TestCommand(null);
-        SequenceCommand command = new SequenceCommand("seq", Arrays.<Command>asList(command1, command2, command3));
-        command.continueOnError = true;
+        SequenceCommand command = new SequenceCommand("seq", Arrays.<Command>asList(command1, command2, command3), true);
         assertTrue(command.executeCommand());
         assertTrue(command1.executed);