- Revision
- 1106
- Author
- mauro
- Date
- 2009-02-22 11:26:01 -0600 (Sun, 22 Feb 2009)
Log Message
Added view enum to stepdoc context to toggle between views.
Modified Paths
- trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocContext.java
- trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocController.java
- trunk/web/web-waffle/src/main/webapp/ftl/scenario/stepdoc.ftl
Diff
Modified: trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocContext.java (1105 => 1106)
--- trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocContext.java 2009-02-22 15:10:29 UTC (rev 1105) +++ trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocContext.java 2009-02-22 17:26:01 UTC (rev 1106) @@ -1,6 +1,7 @@ package org.jbehave.web.waffle.controllers; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.lang.builder.ToStringBuilder; @@ -8,9 +9,11 @@ public class StepdocContext { + public enum View { SIMPLE, METHODS } + private List<Stepdoc> stepdocs = new ArrayList<Stepdoc>(); - private boolean methodsShown = false; - + private View view = View.SIMPLE; + public StepdocContext() { } @@ -26,14 +29,18 @@ this.stepdocs.clear(); } - public boolean isMethodsShown() { - return methodsShown; + public List<View> getViews(){ + return Arrays.asList(View.values()); } + + public View getView() { + return view; + } - public void setMethodsShown(boolean methodsShown) { - this.methodsShown = methodsShown; + public void setView(View view) { + this.view = view; } - + @Override public String toString() { return ToStringBuilder.reflectionToString(this);
Modified: trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocController.java (1105 => 1106)
--- trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocController.java 2009-02-22 15:10:29 UTC (rev 1105) +++ trunk/web/web-waffle/src/main/java/org/jbehave/web/waffle/controllers/StepdocController.java 2009-02-22 17:26:01 UTC (rev 1106) @@ -27,6 +27,11 @@ stepdocContext.addStepdocs(stepdocGenerator.generate(steps.getClass())); } + @ActionMethod + public void toggle() { + // used to toggle context view + } + public StepdocContext getStepdocContext() { return stepdocContext; }
Modified: trunk/web/web-waffle/src/main/webapp/ftl/scenario/stepdoc.ftl (1105 => 1106)
--- trunk/web/web-waffle/src/main/webapp/ftl/scenario/stepdoc.ftl 2009-02-22 15:10:29 UTC (rev 1105) +++ trunk/web/web-waffle/src/main/webapp/ftl/scenario/stepdoc.ftl 2009-02-22 17:26:01 UTC (rev 1106) @@ -9,13 +9,17 @@ <div id="content"> <form action="" - <#assign stepdocs = stepdocContext.stepdocs /> - <#assign methodsShown = stepdocContext.methodsShown /> + <#assign stepdocs = stepdocContext.stepdocs /> + <#assign view = stepdocContext.view /> <#if (stepdocs.size() > 0) > <div id="stepdocs"> <fieldset> <legend><@i.messageFor "stepdocs" "Stepdocs"/></legend> <p> + <@w.selectSingle "stepdocContext.view" w.asNameableValues(stepdocContext.getViews(),"name()","name()") stepdocContext.getView() /></td></tr> + <a "updateView" "Update View"/></a> + </p> + <p> <pre class="brush: plain"> <#list stepdocs as stepdoc> ${stepdoc.annotation.simpleName} ${stepdoc.pattern} @@ -25,7 +29,7 @@ ${alias} </#list> </#if> - <#if (methodsShown) > + <#if (view == 'METHODS') > ${stepdoc.method} </#if> </#list>
To unsubscribe from this list please visit:
