Revised text of checkbox "auto primary key", and disabled the

aggregation function of the measure if the option is checked.
- Bugzilla Bug (s) Resolved:
None
- Description:

3 files changed, 16 insertions, 2 deletions

diff --git a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/MeasureDialog.java b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/MeasureDialog.java
index 1661a8e..993182f 100644
--- a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/MeasureDialog.java
+++ b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/dialog/MeasureDialog.java
@@ -73,6 +73,7 @@ public class MeasureDialog extends TitleAreaDialog
 {
 
 	private boolean isEdit = false;
+	private boolean isAutoPrimaryKeyChecked = false;
 	private Combo typeCombo;
 	private Text expressionText;
 	private Combo functionCombo;
@@ -198,6 +199,11 @@ public class MeasureDialog extends TitleAreaDialog
 		this.input = input;
 	}
 
+	public void setAutoPrimaryKeyStatus( boolean isChecked )
+	{
+		this.isAutoPrimaryKeyChecked = isChecked;
+	}
+
 	/*
 	 * (non-Javadoc) Method declared on Dialog.
 	 */
@@ -485,6 +491,7 @@ public class MeasureDialog extends TitleAreaDialog
 			}
 
 		} );
+		functionCombo.setEnabled( !isAutoPrimaryKeyChecked );
 
 		Label typeLabel = new Label( group, SWT.NONE );
 		typeLabel.setText( Messages.getString( "MeasureDialog.Label.DataType" ) ); //$NON-NLS-1$
@@ -519,7 +526,6 @@ public class MeasureDialog extends TitleAreaDialog
 			public void modifyText( ModifyEvent e )
 			{
 				checkOkButtonStatus( );
-
 			}
 
 		} );
diff --git a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/nls/messages.properties b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/nls/messages.properties
index 6b32107..3ace103 100644
--- a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/nls/messages.properties
+++ b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/nls/messages.properties
@@ -75,7 +75,7 @@ SimpleCubeBuilder.Title.Title=Cross Tab Cube Builder
 SimpleCubeBuilder.Title.Message=Organize your data for the cross tab by specifying grouping hierarchies and summary data fields.
 SimpleCubeBuilder.Title=Cross Tab Cube Builder
 SimpleCubeBuilder.Label.Name=Name:
-DatasetSelectionPage.Label.Auto.Primary.Key=&Check this option if the data in the primary dataset has been grouped and aggregated in a way that matches the cube definition.
+DatasetSelectionPage.Label.Auto.Primary.Key=&Check this option to avoid preaggregation in primary data set during cube generation.
 DatasetSelectionPage.Text.Auto.Primary.Key=Hint - If this option is checked, BIRT will skip the grouping and aggregation calculation during cube generation to achieve better cube generation performance.
 DatasetSelectionPage.Combo.NewDataSet0=<New Data Set...>
 GroupsPage.Button.Add=&Add
diff --git a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/page/CubeGroupContent.java b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/page/CubeGroupContent.java
index 80199cd..a4d0743 100644
--- a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/page/CubeGroupContent.java
+++ b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/src/org/eclipse/birt/report/designer/ui/cubebuilder/page/CubeGroupContent.java
@@ -687,6 +687,7 @@ public class CubeGroupContent extends Composite implements Listener
 									{
 										MeasureDialog dialog = new MeasureDialog( false );
 										dialog.setInput( measure );
+										dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 										if ( dialog.open( ) == Window.CANCEL )
 										{
 											SessionHandleAdapter.getInstance( )
@@ -792,6 +793,7 @@ public class CubeGroupContent extends Composite implements Listener
 									{
 										MeasureDialog dialog = new MeasureDialog( false );
 										dialog.setInput( measure );
+										dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 										if ( dialog.open( ) == Window.CANCEL )
 										{
 											SessionHandleAdapter.getInstance( )
@@ -865,6 +867,7 @@ public class CubeGroupContent extends Composite implements Listener
 									{
 										MeasureDialog dialog = new MeasureDialog( false );
 										dialog.setInput( measure );
+										dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 										if ( dialog.open( ) == Window.CANCEL )
 										{
 											SessionHandleAdapter.getInstance( )
@@ -1681,6 +1684,7 @@ public class CubeGroupContent extends Composite implements Listener
 								measure );
 						MeasureDialog dialog = new MeasureDialog( true );
 						dialog.setInput( measure );
+						dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 						if ( dialog.open( ) == Window.CANCEL )
 						{
 							stack.rollback( );
@@ -1709,6 +1713,7 @@ public class CubeGroupContent extends Composite implements Listener
 								.add( IMeasureGroupModel.MEASURES_PROP, measure );
 						MeasureDialog dialog = new MeasureDialog( true );
 						dialog.setInput( measure );
+						dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 						if ( dialog.open( ) == Window.CANCEL )
 						{
 							stack.rollback( );
@@ -2185,6 +2190,7 @@ public class CubeGroupContent extends Composite implements Listener
 							{
 								MeasureDialog dialog = new MeasureDialog( false );
 								dialog.setInput( measure );
+								dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 								if ( dialog.open( ) == Window.CANCEL )
 								{
 									stack.rollback( );
@@ -2239,6 +2245,7 @@ public class CubeGroupContent extends Composite implements Listener
 							{
 								MeasureDialog dialog = new MeasureDialog( false );
 								dialog.setInput( measure );
+								dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 								if ( dialog.open( ) == Window.CANCEL )
 								{
 									stack.rollback( );
@@ -2463,6 +2470,7 @@ public class CubeGroupContent extends Composite implements Listener
 				stack.startTrans( "" ); //$NON-NLS-1$
 				MeasureDialog dialog = new MeasureDialog( false );
 				dialog.setInput( level );
+				dialog.setAutoPrimaryKeyStatus( input.autoPrimaryKey( ) );
 				if ( dialog.open( ) == Window.OK )
 				{
 					stack.commit( );