- Summary: Using different markers for series does not work for flash

chart. (T40700) - Description: Flash charts don't support this behavior. We should disable setting multiple markers in this way for Flash Charts.
eclipse-birt · Sep 25, 2012 · ee7863f · ee7863f
1 parent f694dec
commit ee7863f
Showing 1 changed file with 42 additions and 37 deletions.
diff --git a/...n/src/org/eclipse/birt/chart/ui/swt/wizard/format/popup/series/LineSeriesMarkerSheet.java b/...n/src/org/eclipse/birt/chart/ui/swt/wizard/format/popup/series/LineSeriesMarkerSheet.java
@@ -182,42 +182,7 @@ public void handleEvent( Event event )
 			cnvMarkers.getVerticalBar( ).addSelectionListener( this );
 		}
 
-		btnAdd = new Button( grpTop, SWT.NONE );
-		{
-			btnAdd.setText( Messages.getString( "LineSeriesMarkerSheet.Label.Add" ) ); //$NON-NLS-1$
-			btnAdd.addSelectionListener( this );
-		}
-
-		newMarkerEditor = new MarkerEditorComposite( grpTop,
-				createMarker( ),
-				getContext( ),
-				getDefaultMarker( ) );
-		if ( markerTypeSet != null )
-		{
-			newMarkerEditor.setSupportedMarkerTypes( markerTypeSet );
-		}
-		if ( outlineText != null )
-		{
-			newMarkerEditor.setOutlineText( outlineText );
-		}
-
-		btnRemove = new Button( grpTop, SWT.NONE );
-		{
-			btnRemove.setText( Messages.getString( "LineSeriesMarkerSheet.Label.Remove" ) ); //$NON-NLS-1$
-			btnRemove.addSelectionListener( this );
-		}
-
-		btnUp = new Button( grpTop, SWT.ARROW | SWT.UP );
-		{
-			btnUp.setToolTipText( Messages.getString( "PaletteEditorComposite.Lbl.Up" ) ); //$NON-NLS-1$
-			btnUp.addSelectionListener( this );
-		}
-
-		btnDown = new Button( grpTop, SWT.ARROW | SWT.DOWN );
-		{
-			btnDown.setToolTipText( Messages.getString( "PaletteEditorComposite.Lbl.Down" ) ); //$NON-NLS-1$
-			btnDown.addSelectionListener( this );
-		}
+		createButtonGroup( grpTop );
 
 		// This control needs to be repainted by gc
 		if ( markerTypeSet != null )
@@ -434,6 +399,46 @@ public void widgetDefaultSelected( SelectionEvent e )
 
 	}
 
+	protected void createButtonGroup( Group grpTop )
+	{
+		btnAdd = new Button( grpTop, SWT.NONE );
+		{
+			btnAdd.setText( Messages.getString( "LineSeriesMarkerSheet.Label.Add" ) ); //$NON-NLS-1$
+			btnAdd.addSelectionListener( this );
+		}
+
+		newMarkerEditor = new MarkerEditorComposite( grpTop,
+				createMarker( ),
+				getContext( ),
+				getDefaultMarker( ) );
+		if ( markerTypeSet != null )
+		{
+			newMarkerEditor.setSupportedMarkerTypes( markerTypeSet );
+		}
+		if ( outlineText != null )
+		{
+			newMarkerEditor.setOutlineText( outlineText );
+		}
+
+		btnRemove = new Button( grpTop, SWT.NONE );
+		{
+			btnRemove.setText( Messages.getString( "LineSeriesMarkerSheet.Label.Remove" ) ); //$NON-NLS-1$
+			btnRemove.addSelectionListener( this );
+		}
+
+		btnUp = new Button( grpTop, SWT.ARROW | SWT.UP );
+		{
+			btnUp.setToolTipText( Messages.getString( "PaletteEditorComposite.Lbl.Up" ) ); //$NON-NLS-1$
+			btnUp.addSelectionListener( this );
+		}
+
+		btnDown = new Button( grpTop, SWT.ARROW | SWT.DOWN );
+		{
+			btnDown.setToolTipText( Messages.getString( "PaletteEditorComposite.Lbl.Down" ) ); //$NON-NLS-1$
+			btnDown.addSelectionListener( this );
+		}
+	}
+
 	private Marker createMarker( )
 	{
 		Marker marker;
@@ -577,7 +582,7 @@ void mouseDown( MouseEvent e )
 		}
 	}
 
-	private void setEnabledState( )
+	protected void setEnabledState( )
 	{
 		if ( iSelectedIndex < 0 )
 		{