Add a new interface ISimpleComboDescriptorProvider.

eclipse-birt · Nov 2, 2012 · 8069736 · 8069736
1 parent f3a2772
commit 8069736
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/...report/designer/internal/ui/views/attributes/provider/ISimpleComboDescriptorProvider.java b/...report/designer/internal/ui/views/attributes/provider/ISimpleComboDescriptorProvider.java
@@ -0,0 +1,12 @@
+
+package org.eclipse.birt.report.designer.internal.ui.views.attributes.provider;
+
+public interface ISimpleComboDescriptorProvider extends IDescriptorProvider
+{
+
+	public String[] getItems( );
+
+	public boolean isEditable( );
+
+	public boolean isSpecialProperty( );
+}
diff --git a/...designer/internal/ui/views/attributes/provider/SimpleComboPropertyDescriptorProvider.java b/...designer/internal/ui/views/attributes/provider/SimpleComboPropertyDescriptorProvider.java
@@ -38,7 +38,7 @@
 import org.eclipse.birt.report.model.api.metadata.IPredefinedStyle;
 
 public class SimpleComboPropertyDescriptorProvider extends
-		PropertyDescriptorProvider
+		PropertyDescriptorProvider implements ISimpleComboDescriptorProvider
 {
 
 	public SimpleComboPropertyDescriptorProvider( String property,

diff --git a/...rt/report/designer/internal/ui/views/attributes/widget/SimpleComboPropertyDescriptor.java b/...rt/report/designer/internal/ui/views/attributes/widget/SimpleComboPropertyDescriptor.java
@@ -15,6 +15,7 @@
 
 import org.eclipse.birt.report.designer.internal.ui.swt.custom.FormWidgetFactory;
 import org.eclipse.birt.report.designer.internal.ui.views.attributes.page.WidgetUtil;
+import org.eclipse.birt.report.designer.internal.ui.views.attributes.provider.ISimpleComboDescriptorProvider;
 import org.eclipse.birt.report.designer.internal.ui.views.attributes.provider.PropertyDescriptorProvider;
 import org.eclipse.birt.report.designer.internal.ui.views.attributes.provider.SimpleComboPropertyDescriptorProvider;
 import org.eclipse.birt.report.designer.ui.views.attributes.providers.ChoiceSetFactory;
@@ -185,9 +186,9 @@ public void addStyle( int style )
 
 	protected void refresh( String value )
 	{
-		if ( getDescriptorProvider( ) instanceof SimpleComboPropertyDescriptorProvider )
+		if ( getDescriptorProvider( ) instanceof ISimpleComboDescriptorProvider )
 		{
-			String[] items = ( (SimpleComboPropertyDescriptorProvider) getDescriptorProvider( ) ).getItems( );
+			String[] items = ( (ISimpleComboDescriptorProvider) getDescriptorProvider( ) ).getItems( );
 			combo.setItems( items );
 			boolean stateFlag = ( ( value == null ) == combo.getEnabled( ) );
 			if ( stateFlag )
@@ -198,12 +199,12 @@ protected void refresh( String value )
 				combo.setEnabled( false );
 			}
 
-			boolean isEditable =  ( (SimpleComboPropertyDescriptorProvider) getDescriptorProvider( ) ).isEditable( ) ;
+			boolean isEditable = ( (ISimpleComboDescriptorProvider) getDescriptorProvider( ) ).isEditable( );
 			setComboEditable( isEditable );
 
 			int sindex = Arrays.asList( items ).indexOf( oldValue );
 
-			if ( ( (SimpleComboPropertyDescriptorProvider) getDescriptorProvider( ) ).isSpecialProperty( )
+			if ( ( (ISimpleComboDescriptorProvider) getDescriptorProvider( ) ).isSpecialProperty( )
 					&& sindex < 0 )
 			{
 				if ( value != null && value.length( ) > 0 )
@@ -225,7 +226,7 @@ protected void refresh( String value )
 
 	protected void setComboEditable( boolean isEditable )
 	{
-		combo.setEditable(isEditable);
+		combo.setEditable( isEditable );
 		if ( focusListener != null )
 		{
 			combo.removeFocusListener( focusListener );