- Summary: Improper message avoids editing group in cube.

- Bugzilla Bug (s) Resolved: - Description: Fix the logic of checking duplicate dimension name.
eclipse-birt · Sep 7, 2011 · f9867dc · f9867dc
1 parent 63866a7
commit f9867dc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...i.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/GroupDialog.java b/...i.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/GroupDialog.java
@@ -802,7 +802,15 @@ protected boolean checkDuplicateName( String name )
 	{
 		try
 		{
-			if(SessionHandleAdapter.getInstance( ).getReportDesignHandle( ).findDimension( name )!=null)
+			DimensionHandle dimension = SessionHandleAdapter.getInstance( )
+					.getReportDesignHandle( )
+					.findDimension( name );
+			DimensionHandle input = null;
+			if ( hierarchy != null )
+			{
+				input = (DimensionHandle) hierarchy.getContainer( );
+			}
+			if ( dimension != null && dimension != input )
 				return true;
 		}
 		catch ( Exception e )

diff --git a/...builder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/GroupRenameDialog.java b/...builder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/GroupRenameDialog.java
@@ -128,7 +128,8 @@ else if ( !UIUtil.validateDimensionName( text.getText( ) ) )
 					getButton( IDialogConstants.OK_ID ).setEnabled( false );
 					setErrorMessage( Messages.getString( "RenameInputDialog.Message.NumericName" ) ); //$NON-NLS-1$
 				}
-				else if(checkDuplicateName(text.getText( ))){
+				else if ( checkDuplicateName( text.getText( ) ) )
+				{
 					getButton( IDialogConstants.OK_ID ).setEnabled( false );
 					setErrorMessage( Messages.getString( "RenameInputDialog.Message.DuplicateName" ) ); //$NON-NLS-1$
 				}
@@ -173,7 +174,10 @@ protected boolean checkDuplicateName( String name )
 	{
 		try
 		{
-			if(SessionHandleAdapter.getInstance( ).getReportDesignHandle( ).findDimension( name )!=null)
+			DimensionHandle handle = SessionHandleAdapter.getInstance( )
+					.getReportDesignHandle( )
+					.findDimension( name );
+			if ( handle != null && handle != dimension )
 				return true;
 		}
 		catch ( Exception e )