Fixed Error when select xtab measure and show as Chart.[T58087]

eclipse-birt · Mar 25, 2013 · eb73359 · eb73359
1 parent 0ffdf33
commit eb73359
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/...irt.report.model/src/org/eclipse/birt/report/model/core/namespace/AbstractNameHelper.java b/...irt.report.model/src/org/eclipse/birt/report/model/core/namespace/AbstractNameHelper.java
@@ -149,13 +149,18 @@ public NameSpace getNameSpace( int nameSpaceID )
 	{
 		return getNameContext( nameSpaceID ).getNameSpace( );
 	}
-
+	
 	public void makeUniqueName( int namespaceId, DesignElement element )
+	{
+		this.makeUniqueName( namespaceId, element, null );
+	}
+
+	public void makeUniqueName( int namespaceId, DesignElement element, String prefix )
 	{
 		if ( element == null )
 			return;
 
-		String name = getUniqueName( namespaceId, element );
+		String name = getUniqueName( namespaceId, element, prefix );
 		if ( name == null )
 			return;
 

diff --git a/...lipse.birt.report.model/src/org/eclipse/birt/report/model/core/namespace/INameHelper.java b/...lipse.birt.report.model/src/org/eclipse/birt/report/model/core/namespace/INameHelper.java
@@ -88,6 +88,18 @@ public interface INameHelper
 
 	public void makeUniqueName( int namespaceId, DesignElement element );
 
+	/**
+	 * make the unique name of element with the given name prefix
+	 * 
+	 * @param namespaceId
+	 *        the name space id
+	 * @param element
+	 *        the design element.
+	 * @param prefix
+	 *        the name prefix
+	 */
+	public void makeUniqueName( int namespaceId, DesignElement element, String prefix );
+
 	/**
 	 * remove a element from cached namespace
 	 * 

diff --git a/....birt.report.model/src/org/eclipse/birt/report/model/core/namespace/NameExecutorImpl.java b/....birt.report.model/src/org/eclipse/birt/report/model/core/namespace/NameExecutorImpl.java
@@ -281,7 +281,7 @@ public void makeUniqueName( String prefix )
 
 		if ( nameHelper != null )
 		{
-			nameHelper.makeUniqueName( namespaceId, focus );
+			nameHelper.makeUniqueName( namespaceId, focus, prefix);
 		}
 	}