=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatIdentifier.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatIdentifier.java 2016-03-01 07:51:42 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatIdentifier.java 2016-03-03 05:02:44 +0000 @@ -30,6 +30,7 @@ import com.google.common.collect.Lists; import org.hisp.dhis.common.IdentifiableObject; +import org.springframework.util.StringUtils; import java.util.ArrayList; import java.util.List; @@ -88,4 +89,17 @@ return new ArrayList<>(); } + + public String getIdentifiersWithName( T object ) + { + List identifiers = getIdentifiers( object ); + String name = StringUtils.isEmpty( object.getDisplayName() ) ? null : object.getDisplayName(); + + if ( name == null ) + { + return identifiers.toString(); + } + + return name + " " + identifiers.toString(); + } } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java 2016-03-03 03:10:04 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java 2016-03-03 05:02:44 +0000 @@ -472,7 +472,7 @@ if ( ref == null && refObject != null && !Preheat.isDefault( refObject ) ) { preheatErrorReports.add( new PreheatErrorReport( identifier, object.getClass(), ErrorCode.E5001, - identifier.getIdentifiers( refObject ), identifier.getIdentifiers( object ), p.getName() ) ); + identifier.getIdentifiersWithName( refObject ), identifier.getIdentifiersWithName( object ), p.getName() ) ); } } else @@ -489,7 +489,7 @@ if ( ref == null && refObject != null ) { preheatErrorReports.add( new PreheatErrorReport( identifier, object.getClass(), ErrorCode.E5001, - identifier.getIdentifiers( refObject ), identifier.getIdentifiers( object ), p.getCollectionName() ) ); + identifier.getIdentifiersWithName( refObject ), identifier.getIdentifiersWithName( object ), p.getCollectionName() ) ); } else { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-03-03 03:10:04 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-03-03 05:02:44 +0000 @@ -185,7 +185,7 @@ if ( object == null ) { objectBundleValidation.addErrorReport( klass, ErrorCode.E5000, bundle.getPreheatIdentifier(), - bundle.getPreheatIdentifier().getIdentifiers( identifiableObject ) ); + bundle.getPreheatIdentifier().getIdentifiersWithName( identifiableObject ) ); iterator.remove(); } }