Commit bec0550a authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents c78d9188 3535b9f4

src/main/java/com/inteligr8/activiti/doclet/ActivitiDocFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ class ActivitiDocFilter { 
			}

		}

		

		this.logger.info("delegates: {}", delegateMethodElements);

		this.logger.info("delegates: {}: {}", beanId, delegateMethodElements);

		

		// getAllMembers() will get inherited methods

		for (Element memberElement : this.docenv.getElementUtils().getAllMembers(classElement)) {

src/main/resources/templates/bean.md.ftl

+4 −4
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ ${r"${"}${beanId}${r"}"} 


<#if delegateMethod?? || executionListenerMethod?? || taskListenerMethod??>

<#assign taskUses = [] />

<#if delegateMethod??><#assign taskUses = taskUses + ["**Service Task**"] /></#if>

<#if executionListenerMethod??><#assign taskUses = taskUses + ["**Execution Listener**"] /></#if>

<#if taskListenerMethod??><#assign taskUses = taskUses + ["**Task Listener**"] /></#if>

<#if delegateMethod??><#assign taskUses = taskUses + ["**Service Task**"] /><#assign _delegateMethod = delegateMethod /></#if>

<#if executionListenerMethod??><#assign taskUses = taskUses + ["**Execution Listener**"] /><#assign _delegateMethod = executionListenerMethod /></#if>

<#if taskListenerMethod??><#assign taskUses = taskUses + ["**Task Listener**"] /><#assign _delegateMethod = taskListenerMethod /></#if>

You may use it in a ${taskUses?join(" or ")}.

<@sigdoc sig=delegateMethod showParams=false/>

<@sigdoc sig=_delegateMethod showParams=false/>

</#if></#if><#if (methods?size > 0)>



## Expression Uses