Selecting duplicate name of data model and data set that always gets the

first column in data binding dlg.
eclipse-birt · Jul 22, 2014 · 5e0c0f3 · 5e0c0f3
1 parent e843311
commit 5e0c0f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...report/designer/internal/ui/views/attributes/provider/BindingGroupDescriptorProvider.java b/...report/designer/internal/ui/views/attributes/provider/BindingGroupDescriptorProvider.java
@@ -63,7 +63,7 @@ public String getText( Object element )
 			{
 				BindingInfo info = (BindingInfo) element;
 				String datasetName = info.getBindingValue( );
-				if ( !info.isDataSet() )
+				if ( !info.isDataSet( ) )
 				{
 					if ( !NONE.equals( datasetName ) )
 					{
@@ -120,8 +120,7 @@ protected List getAvailableDataBindingReferenceList(
 		if ( ExtendedDataModelUIAdapterHelper.getInstance( ).getAdapter( ) != null )
 		{
 			List temp = ( ExtendedDataModelUIAdapterHelper.getInstance( )
-					.getAdapter( )
-					.getAvailableBindingReferenceList( element ) );
+					.getAdapter( ).getAvailableBindingReferenceList( element ) );
 			bindingRef.removeAll( temp );
 			bindingRef.addAll( temp );
 		}
@@ -796,6 +795,6 @@ public String getText( int key )
 
 	public boolean enableBindingButton( )
 	{
-		return null != ( (BindingInfo) load( ) ).getBindingValue( );
+		return !NullDatasetChoice.bindingValue.equals( ( (BindingInfo) load( ) ).getBindingValue( ) );
 	}
 }
diff --git a/...ipse/birt/report/designer/internal/ui/views/attributes/widget/BindingGroupDescriptor.java b/...ipse/birt/report/designer/internal/ui/views/attributes/widget/BindingGroupDescriptor.java
@@ -257,7 +257,7 @@ else if ( oldInfo.getBindingType( ) == ReportItemHandle.DATABINDING_TYPE_REPORT_
 					}
 					else
 					{
-						datasetCombo.setSelection( new StructuredSelection( info ) );
+						selectDatasetType( info );
 					}
 					break;
 				}