commit 842d21956c65226921ec6816dc932fd139e18969 Author: Mauro Talevi <mauro.tal...@aquilonia.org> AuthorDate: Sun Jul 8 15:06:48 2012 +0200 Commit: Mauro Talevi <mauro.tal...@aquilonia.org> CommitDate: Sun Jul 8 15:06:48 2012 +0200
JBEHAVE-233: Use configured parameter prefix in the step scanner. diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java index 8491a82..b3d7fe5 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/JBehaveProject.java @@ -163,6 +163,10 @@ public class JBehaveProject { return project; } + public ProjectPreferences getProjectPreferences() { + return projectPreferences; + } + public StepLocator getStepLocator() { return new StepLocator(this); } diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/scanner/StepScannerStyled.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/scanner/StepScannerStyled.java index d42938d..f8b3276 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/scanner/StepScannerStyled.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/editor/story/scanner/StepScannerStyled.java @@ -117,7 +117,7 @@ public class StepScannerStyled extends AbstractStoryPartBasedScanner { log.debug("Token is an identifier <{}>", f(content)); - if(content.startsWith("$")) { + if(content.startsWith(jbehaveProject.getProjectPreferences().getParameterPrefix())) { emit(emitter, parameterToken, offset, content.length()); } else { diff --git a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/step/ParametrizedStep.java b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/step/ParametrizedStep.java index 64b19d2..8032a11 100644 --- a/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/step/ParametrizedStep.java +++ b/jbehave-eclipse/org.jbehave.eclipse/src/org/jbehave/eclipse/step/ParametrizedStep.java @@ -89,7 +89,7 @@ public class ParametrizedStep { } @Override public String toString() { - return "<<"+(isIdentifier?"$":"")+value()+">>"; + return "<<"+(isIdentifier?parameterPrefix:"")+value()+">>"; } public boolean regionMatches(int toffset, String other, int ooffset, int len) { return content.regionMatches(offset + toffset, other, ooffset, len); @@ -329,7 +329,7 @@ public class ParametrizedStep { for(int i = tokenIndex; i< getTokenCount(); i++) { token = getToken(i); if(token.isIdentifier) - builder.append("$"); + builder.append(parameterPrefix); builder.append(token.value()); } return builder.toString();