#6 Fixing indentation in template; Removing dead template code

This commit is contained in:
Gunnar Morling 2013-04-30 22:40:04 +02:00
parent 707338cad7
commit e577f197b1

View File

@ -28,11 +28,11 @@ import java.util.Date;
) )
public class ${implementationName} implements ${interfaceName} { public class ${implementationName} implements ${interfaceName} {
<#list usedMapperTypes as mapperType> <#list usedMapperTypes as mapperType>
private final ${mapperType.name} ${mapperType.name?uncap_first} = new ${mapperType.name}(); private final ${mapperType.name} ${mapperType.name?uncap_first} = new ${mapperType.name}();
</#list> </#list>
<#list beanMappings as beanMapping> <#list beanMappings as beanMapping>
<#if beanMapping.mappingMethod.generationRequired == true> <#if beanMapping.mappingMethod.generationRequired == true>
<#if beanMapping.iterableMapping == true> <#if beanMapping.iterableMapping == true>
@Override @Override
@ -68,8 +68,6 @@ public class ${implementationName} implements ${interfaceName} {
<#else> <#else>
${beanMapping.targetType.name?uncap_first}.set${propertyMapping.targetName?cap_first}( ${propertyMapping.toConversion} ); ${beanMapping.targetType.name?uncap_first}.set${propertyMapping.targetName?cap_first}( ${propertyMapping.toConversion} );
</#if> </#if>
<#elseif propertyMapping.converterType??>
${beanMapping.targetType.name?uncap_first}.set${propertyMapping.targetName?cap_first}( new ${propertyMapping.converterType.name}().from( ${beanMapping.mappingMethod.parameterName}.get${propertyMapping.sourceName?cap_first}() ) );
<#-- invoke mapping method --> <#-- invoke mapping method -->
<#elseif propertyMapping.mappingMethod??> <#elseif propertyMapping.mappingMethod??>
${beanMapping.targetType.name?uncap_first}.set${propertyMapping.targetName?cap_first}( <#if propertyMapping.mappingMethod.declaringMapper??>${propertyMapping.mappingMethod.declaringMapper.name?uncap_first}.</#if>${propertyMapping.mappingMethod.name}( ${beanMapping.mappingMethod.parameterName}.get${propertyMapping.sourceName?cap_first}() ) ); ${beanMapping.targetType.name?uncap_first}.set${propertyMapping.targetName?cap_first}( <#if propertyMapping.mappingMethod.declaringMapper??>${propertyMapping.mappingMethod.declaringMapper.name?uncap_first}.</#if>${propertyMapping.mappingMethod.name}( ${beanMapping.mappingMethod.parameterName}.get${propertyMapping.sourceName?cap_first}() ) );
@ -110,6 +108,7 @@ public class ${implementationName} implements ${interfaceName} {
${beanMapping.sourceType.name} ${beanMapping.sourceType.name?uncap_first} = new ${beanMapping.sourceType.name}(); ${beanMapping.sourceType.name} ${beanMapping.sourceType.name?uncap_first} = new ${beanMapping.sourceType.name}();
<#list beanMapping.propertyMappings as propertyMapping> <#list beanMapping.propertyMappings as propertyMapping>
<#-- primitive conversion -->
<#if propertyMapping.fromConversion??> <#if propertyMapping.fromConversion??>
<#if propertyMapping.sourceType.primitive == true> <#if propertyMapping.sourceType.primitive == true>
if( ${beanMapping.reverseMappingMethod.parameterName}.get${propertyMapping.targetName?cap_first}() != null ) { if( ${beanMapping.reverseMappingMethod.parameterName}.get${propertyMapping.targetName?cap_first}() != null ) {
@ -118,8 +117,6 @@ public class ${implementationName} implements ${interfaceName} {
<#else> <#else>
${beanMapping.sourceType.name?uncap_first}.set${propertyMapping.sourceName?cap_first}( ${propertyMapping.fromConversion} ); ${beanMapping.sourceType.name?uncap_first}.set${propertyMapping.sourceName?cap_first}( ${propertyMapping.fromConversion} );
</#if> </#if>
<#elseif propertyMapping.converterType??>
${beanMapping.sourceType.name?uncap_first}.set${propertyMapping.sourceName?cap_first}( new ${propertyMapping.converterType.name}().to( ${beanMapping.reverseMappingMethod.parameterName}.get${propertyMapping.targetName?cap_first}() ) );
<#-- invoke mapping method --> <#-- invoke mapping method -->
<#elseif propertyMapping.reverseMappingMethod??> <#elseif propertyMapping.reverseMappingMethod??>
${beanMapping.sourceType.name?uncap_first}.set${propertyMapping.sourceName?cap_first}( <#if propertyMapping.reverseMappingMethod.declaringMapper??>${propertyMapping.reverseMappingMethod.declaringMapper.name?uncap_first}.</#if>${propertyMapping.reverseMappingMethod.name}( ${beanMapping.reverseMappingMethod.parameterName}.get${propertyMapping.targetName?cap_first}() ) ); ${beanMapping.sourceType.name?uncap_first}.set${propertyMapping.sourceName?cap_first}( <#if propertyMapping.reverseMappingMethod.declaringMapper??>${propertyMapping.reverseMappingMethod.declaringMapper.name?uncap_first}.</#if>${propertyMapping.reverseMappingMethod.name}( ${beanMapping.reverseMappingMethod.parameterName}.get${propertyMapping.targetName?cap_first}() ) );
@ -133,6 +130,5 @@ public class ${implementationName} implements ${interfaceName} {
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#list>
</#list>
} }