[jbehave-scm] [997] trunk/jbehave-core/src/java/org/jbehave/scenario: Minor cleanup to ensure we always work to interface contract whenever possible.

Sun, 26 Oct 2008 08:00:44 -0700

Title: [997] trunk/jbehave-core/src/java/org/jbehave/scenario: Minor cleanup to ensure we always work to interface contract whenever possible.

Diff

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/AbstractScenario.java (996 => 997)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/AbstractScenario.java	2008-10-26 14:20:59 UTC (rev 996)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/AbstractScenario.java	2008-10-26 15:00:41 UTC (rev 997)
@@ -1,14 +1,15 @@
 package org.jbehave.scenario;
 
+import static java.util.Arrays.asList;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import org.jbehave.scenario.definition.KeyWords;
 import org.jbehave.scenario.definition.StoryDefinition;
 import org.jbehave.scenario.parser.ScenarioNameResolver;
 import org.jbehave.scenario.steps.CandidateSteps;
 
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-
 /**
  * <p>
  * Abstract implementation of Scenario which is primarily intended as a base
@@ -61,7 +62,7 @@
         this.scenarioClass = scenarioClass;
         this.configuration = configuration;
         this.scenarioRunner = scenarioRunner;
-        this.candidateSteps.addAll(Arrays.asList(candidateSteps));
+        this.candidateSteps.addAll(asList(candidateSteps));
     }
 
     public void runScenario() throws Throwable {
@@ -72,6 +73,6 @@
     }
 
     public void addSteps(CandidateSteps... steps) {
-        this.candidateSteps.addAll(Arrays.asList(steps));
+        this.candidateSteps.addAll(asList(steps));
     }
 }

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/definition/StoryDefinition.java (996 => 997)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/definition/StoryDefinition.java	2008-10-26 14:20:59 UTC (rev 996)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/definition/StoryDefinition.java	2008-10-26 15:00:41 UTC (rev 997)
@@ -1,6 +1,7 @@
 package org.jbehave.scenario.definition;
 
-import java.util.Arrays;
+import static java.util.Arrays.asList;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -19,11 +20,11 @@
     }
     
     public StoryDefinition(Blurb blurb, ScenarioDefinition... scenarioDefinitions) {
-        this(blurb, Arrays.asList(scenarioDefinitions));
+        this(blurb, asList(scenarioDefinitions));
     }
     
     public StoryDefinition(ScenarioDefinition... scenarioDefinitions) {
-        this(Arrays.asList(scenarioDefinitions));
+        this(asList(scenarioDefinitions));
     }
 
     public Blurb getBlurb() {

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java (996 => 997)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java	2008-10-26 14:20:59 UTC (rev 996)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java	2008-10-26 15:00:41 UTC (rev 997)
@@ -139,7 +139,7 @@
 	}
 
 	private List<Step> stepsHaving(final Class<? extends Annotation> annotationClass, final StepPart forScenarios) {
-		ArrayList<Step> steps = new ArrayList<Step>();
+		List<Step> steps = new ArrayList<Step>();
         for (final Method method : this.getClass().getMethods()) {
 			if (method.isAnnotationPresent(annotationClass)) {				
 				steps.add(new Step() {
@@ -159,7 +159,7 @@
 	
 	
 	private List<Step> stepsHavingOutcome(final Class<? extends AfterScenario> annotationClass, final Outcome outcome, final StepPart forSuccessfulScenarios, final StepPart forUnsuccessfulScenarios) {
-		ArrayList<Step> steps = new ArrayList<Step>();
+		List<Step> steps = new ArrayList<Step>();
         for (final Method method : this.getClass().getMethods()) {
 			if (method.isAnnotationPresent(annotationClass) ) {				
 				AfterScenario annotation = method.getAnnotation(annotationClass);

Modified: trunk/jbehave-core/src/java/org/jbehave/scenario/steps/UnmatchedToPendingStepCreator.java (996 => 997)

--- trunk/jbehave-core/src/java/org/jbehave/scenario/steps/UnmatchedToPendingStepCreator.java	2008-10-26 14:20:59 UTC (rev 996)
+++ trunk/jbehave-core/src/java/org/jbehave/scenario/steps/UnmatchedToPendingStepCreator.java	2008-10-26 15:00:41 UTC (rev 997)
@@ -1,6 +1,7 @@
 package org.jbehave.scenario.steps;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.jbehave.scenario.definition.ScenarioDefinition;
 
@@ -8,7 +9,7 @@
 
     public Step[] createStepsFrom(ScenarioDefinition scenario,
             CandidateSteps... candidateSteps) {
-        ArrayList<Step> steps = new ArrayList<Step>();
+        List<Step> steps = new ArrayList<Step>();
         
         addAllNormalSteps(scenario, steps, candidateSteps);
         addBeforeAndAfterSteps(steps, candidateSteps);
@@ -16,7 +17,7 @@
         return steps.toArray(new Step[steps.size()]);
     }
 
-	private void addBeforeAndAfterSteps(ArrayList<Step> steps,
+	private void addBeforeAndAfterSteps(List<Step> steps,
 			CandidateSteps[] candidateSteps) {
 		for (CandidateSteps candidates : candidateSteps) {
 			steps.addAll(0, candidates.runBeforeScenario());
@@ -28,7 +29,7 @@
 	}
 
 	private void addAllNormalSteps(ScenarioDefinition scenario,
-			ArrayList<Step> steps, CandidateSteps... candidateSteps) {
+			List<Step> steps, CandidateSteps... candidateSteps) {
 		for (String stringStep : scenario.getSteps()) {
 			Step step = new PendingStep(stringStep);
             for (CandidateSteps candidates : candidateSteps) {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to