- Revision
- 1191
- Author
- paul
- Date
- 2009-08-25 13:39:06 -0500 (Tue, 25 Aug 2009)
Log Message
step monitor not a mandatory ctor param anymore
Modified Paths
- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java
- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java
Diff
Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java (1190 => 1191)
--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java 2009-08-25 18:28:03 UTC (rev 1190) +++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/CandidateStep.java 2009-08-25 18:39:06 UTC (rev 1191) @@ -20,22 +20,32 @@ private final String stepAsString; private final Method method; private final CandidateSteps steps; - private final StepMonitor stepMonitor; + private StepMonitor stepMonitor = new SilentStepMonitor(); private final ParameterConverters parameterConverters; private final String[] startingWords; private final Pattern pattern; public CandidateStep(String stepAsString, Method method, CandidateSteps steps, StepPatternBuilder patterBuilder, StepMonitor stepMonitor, ParameterConverters parameterConverters, String... startingWords) { + this(stepAsString,method,steps, patterBuilder, parameterConverters, startingWords); + setStepMonitor(stepMonitor); + } + + public CandidateStep(String stepAsString, Method method, CandidateSteps steps, StepPatternBuilder patterBuilder, + ParameterConverters parameterConverters, String... startingWords) { this.stepAsString = stepAsString; this.method = method; this.steps = steps; - this.stepMonitor = stepMonitor; this.parameterConverters = parameterConverters; this.startingWords = startingWords; this.pattern = patterBuilder.buildPattern(stepAsString); } + + public void setStepMonitor(StepMonitor stepMonitor) { + this.stepMonitor = stepMonitor; + } + public boolean matches(String step) { String word = findStartingWord(step); if (word == null) {
Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java (1190 => 1191)
--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java 2009-08-25 18:28:03 UTC (rev 1190) +++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/steps/Steps.java 2009-08-25 18:39:06 UTC (rev 1191) @@ -130,9 +130,11 @@ void createCandidateStep(List<CandidateStep> steps, Method method, String stepAsString) { checkForDuplicateCandidateSteps(steps, stepAsString); - steps.add(new CandidateStep(stepAsString, method, this, configuration - .getPatternBuilder(), configuration.getMonitor(), configuration - .getParameterConverters(), configuration.getStartingWords())); + CandidateStep step = new CandidateStep(stepAsString, method, this, configuration + .getPatternBuilder(), configuration + .getParameterConverters(), configuration.getStartingWords()); + step.setStepMonitor(configuration.getMonitor()); + steps.add(step); } private void checkForDuplicateCandidateSteps(List<CandidateStep> steps, @@ -154,7 +156,7 @@ } if (method.isAnnotationPresent(Alias.class)) { createCandidateStep(steps, method, method.getAnnotation(Alias.class).value()); - } + } } public List<Step> runBeforeScenario() {
To unsubscribe from this list please visit:
