Merge "455295: You should be able to choose the base color of the ColorPickerEditor https://bugs.eclipse.org/bugs/show_bug.cgi?id=455295 - Addition of a constructor allowing the edittion of the base color" into streams/1.0-maintenance

1 files changed, 15 insertions, 0 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java
index 0f96ad77657..44749f7f164 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/infra/gmfdiag/widgets/editors/ColorPickerEditor.java
@@ -77,6 +77,21 @@ public class ColorPickerEditor extends AbstractValueEditor implements IChangeLis
 		});

 	}

 

+	/**

+	 * 

+	 * Constructor. Allows to choose the default color of the button, else it be black.

+	 *

+	 * @param parent

+	 * @param style

+	 * @param defaultColor

+	 *            {@link FigureUtilities#colorToInteger(Color)}

+	 */

+	public ColorPickerEditor(Composite parent, int style, int defaultColor) {

+		this(parent, style);

+		this.defaultColor = defaultColor;

+		doSetColor(defaultColor);

+	}

+

 	@Override

 	protected void doBinding() {

 		// We don't do a real databinding here