From 46363028bd5bf73382b34c2fafdf7b12447841c6 Mon Sep 17 00:00:00 2001 From: sjaakd Date: Thu, 8 Dec 2016 22:47:48 +0100 Subject: [PATCH] #988 Strange enters in templates --- .../mapstruct/ap/internal/model/macro/CommonMacros.ftl | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl index c79a8e66e..2a52ed235 100644 --- a/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl +++ b/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl @@ -26,6 +26,8 @@ a local variable. Note that the local variable assignemnt is inside the IF statement for the source presence check. Note also, that the else clause contains the default variable assignment if present. + + TODO: is only used by collection mapping currently.. should perhas be moved to there and not in common --> <#macro handleNullCheck> <#if sourcePresenceCheckerReference??> @@ -93,18 +95,14 @@ Performs a default assignment with a default value. purpose: To handle the writing to a field or using a method. The line is not closed with ';' --> -<#macro handleWrite> - <#t><#if fieldAssignment> = <#nested><#else>( <#nested> ) - +<#macro handleWrite><#if fieldAssignment> = <#nested><#else>( <#nested> ) <#-- macro: handleWriteAccesing purpose: To handle accesing the write target type --> -<#macro handleWriteAccesing> - <#t><#if fieldAssignment><#else>() - +<#macro handleWriteAccesing><#if fieldAssignment><#else>() <#-- macro: initTargetObject