displayNameKey should have priority over displayName

eclipse-birt · Jan 21, 2019 · 6ecfb5a · 6ecfb5a
1 parent ba5c006
commit 6ecfb5a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.../org/eclipse/birt/report/designer/ui/cubebuilder/provider/TabularMeasureNodeProvider.java b/.../org/eclipse/birt/report/designer/ui/cubebuilder/provider/TabularMeasureNodeProvider.java
@@ -89,22 +89,22 @@ public Object getParent( Object model )
 	public String getNodeDisplayName( Object model )
 	{
 		MeasureHandle handle = (MeasureHandle) model;
-		if ( handle.getDisplayName( ) != null
-				&& handle.getDisplayName( ).trim( ).length( ) > 0 )
-		{
-			return handle.getDisplayName( );
-		}
 		if ( handle.getDisplayNameKey( ) != null )
 		{
 			String externalizedDisplayName = handle.getExternalizedValue(
 					ColumnHint.DISPLAY_NAME_ID_MEMBER,
 					ColumnHint.DISPLAY_NAME_MEMBER );
 			if ( externalizedDisplayName != null
-					&& externalizedDisplayName.trim( ).length( ) > 0 )
+					&& !externalizedDisplayName.trim( ).isEmpty( ) )
 			{
 				return externalizedDisplayName;
 			}
 		}
+		if ( handle.getDisplayName( ) != null
+				&& !handle.getDisplayName( ).trim( ).isEmpty( ) )
+		{
+			return handle.getDisplayName( );
+		}
 		return handle.getName( );
 	}