Attachment #109780 for bug #235303

Lines 17-23 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/edit/parts/EDataType2EditPart.java (-5 / +17 lines)
17	import org.eclipse.draw2d.Graphics;	17	import org.eclipse.draw2d.Graphics;
18	import org.eclipse.draw2d.IFigure;	18	import org.eclipse.draw2d.IFigure;
19	import org.eclipse.draw2d.PositionConstants;	19	import org.eclipse.draw2d.PositionConstants;
20	import org.eclipse.draw2d.RectangleFigure;
21	import org.eclipse.draw2d.StackLayout;	20	import org.eclipse.draw2d.StackLayout;
22	import org.eclipse.draw2d.ToolbarLayout;	21	import org.eclipse.draw2d.ToolbarLayout;
23	import org.eclipse.draw2d.geometry.Dimension;	22	import org.eclipse.draw2d.geometry.Dimension;
Lines 26-35 Link Here
26	import org.eclipse.emf.common.notify.Notification;	25	import org.eclipse.emf.common.notify.Notification;
27	import org.eclipse.emf.ecore.EObject;	26	import org.eclipse.emf.ecore.EObject;
28	import org.eclipse.emf.ecore.EcorePackage;	27	import org.eclipse.emf.ecore.EcorePackage;
		28	import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
29	import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;	29	import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
		30	import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
		31	import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
30	import org.eclipse.emf.ecoretools.diagram.edit.policies.EDataType2ItemSemanticEditPolicy;	32	import org.eclipse.emf.ecoretools.diagram.edit.policies.EDataType2ItemSemanticEditPolicy;
31	import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;	33	import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;
32	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;	34	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
		35	import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
33	import org.eclipse.gef.EditPart;	36	import org.eclipse.gef.EditPart;
34	import org.eclipse.gef.EditPolicy;	37	import org.eclipse.gef.EditPolicy;
35	import org.eclipse.gef.editpolicies.LayoutEditPolicy;	38	import org.eclipse.gef.editpolicies.LayoutEditPolicy;
Lines 106-115 Link Here
106	}	109	}
107		110
108	/**	111	/**
109	* @generated	112	* @generated NOT
110	*/	113	*/
111	protected IFigure createNodeShape() {	114	protected IFigure createNodeShape() {
112	DataTypeFigure figure = new DataTypeFigure();	115	DataTypeFigure figure = new DataTypeFigure();
		116	figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT));
113	return primaryShape = figure;	117	return primaryShape = figure;
114	}	118	}
115		119
Lines 175-184 Link Here
175	}	179	}
176		180
177	/**	181	/**
178	* @generated	182	* @generated NOT
179	*/	183	*/
180	protected NodeFigure createNodePlate() {	184	protected NodeFigure createNodePlate() {
181	DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));	185	DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
		186	AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		187	shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		188	result.setBorder(shadowBorder);
182	return result;	189	return result;
183	}	190	}
184		191
Lines 262-271 Link Here
262	}	269	}
263	}	270	}
264		271
		272	@Override
		273	public EditPolicy getPrimaryDragEditPolicy() {
		274	return new AlphaResizableShapeEditPolicy();
		275	}
		276
265	/**	277	/**
266	* @generated	278	* @generated NOT
267	*/	279	*/
268	public class DataTypeFigure extends RectangleFigure {	280	public class DataTypeFigure extends GradientRectangleFigure {
269		281
270	/**	282	/**
271	* @generated	283	* @generated





import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EClass2ItemSemanticEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;
import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
import org.eclipse.emf.ecoretools.diagram.providers.EcoreElementTypes;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;

	}

	/**
	 * @generated NOT
	 */
	protected IFigure createNodeShape() {
		ClassFigure figure = new ClassFigure();
		figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT)); 
		return primaryShape = figure;
	}


	}

	/**
	 * @generated NOT
	 */
	protected NodeFigure createNodePlate() {
		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
		AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		result.setBorder(shadowBorder);
		return result;
	}


		}
	}

	@Override
	public EditPolicy getPrimaryDragEditPolicy() {
		return new AlphaResizableShapeEditPolicy();
	}

	/**
	 * @generated NOT
	 */
	public class ClassFigure extends GradientRectangleFigure {

		/**
		 * @generated




import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.MarginBorder;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EAnnotationItemSemanticEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;
import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
import org.eclipse.emf.ecoretools.diagram.providers.EcoreElementTypes;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;

import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

	}

	/**
	 * @generated NOT
	 */
	protected IFigure createNodeShape() {
		AnnotationFigure figure = new AnnotationFigure();
		figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT)); 
		return primaryShape = figure;
	}


				return getPrimaryShape().getPointsList();
			}
		};
		AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		result.setBorder(shadowBorder);
		return result;
	}


		super.refreshVisuals();
	}

	@Override
	public EditPolicy getPrimaryDragEditPolicy() {
		return new AlphaResizableShapeEditPolicy();
	}

	/**
	 * @generated NOT
	 */
	public class AnnotationFigure extends GradientRectangleFigure {

		/**
		 * @generated

			desiredBounds.addPoint(point5);

			graphics.fillPolygon(desiredBounds);

			if (shouldUseGradient()) {
				// fill gradient
				// get gradient rectangle
				Rectangle gradientRectangle = r.getCopy();
				gradientRectangle.crop(new Insets(BENT_CORNER_HEIGHT, 0, 0, 0));
				// draw gradient rectangle
				graphics.pushState();
				graphics.setBackgroundColor(DiagramColorConstants.white);
				graphics.setForegroundColor(getBackgroundColor());
				graphics.fillGradient(gradientRectangle, true);
				graphics.popState();
			}
		}

		@Override




import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
import org.eclipse.emf.ecoretools.diagram.edit.figures.PackageLabelRectangle;
import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EPackage2ItemSemanticEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.OpenDiagramEditPolicy;
import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.Request;

	}

	/**
	 * @generated NOT
	 */
	protected IFigure createNodeShape() {
		PackageFigure figure = new PackageFigure();
		figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT)); 
		return primaryShape = figure;
	}


				return points;
			}
		};
		AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		result.setBorder(shadowBorder);
        return result;
	}

	/**

		super.refreshVisuals();
	}

	@Override
	public EditPolicy getPrimaryDragEditPolicy() {
		return new AlphaResizableShapeEditPolicy();
	}

	/**
	 * @generated NOT
	 */
	public class PackageFigure extends GradientRectangleFigure {

		/**
		 * @generated NOT
		 */
		private GradientRectangleFigure fFigurePackageBodyRectangle;

		/**
		 * @generated

		private void createContents() {

			packageLabelRectangle0 = new PackageLabelRectangle();
			packageLabelRectangle0.setLineWidth(1);

			packageLabelRectangle0.setBorder(new MarginBorder(getMapMode().DPtoLP(5), getMapMode().DPtoLP(5), getMapMode().DPtoLP(5), getMapMode().DPtoLP(5)));


			constraintFillerFigure0.grabExcessVerticalSpace = false;
			this.add(fillerFigure0, constraintFillerFigure0);

			fFigurePackageBodyRectangle = new GradientRectangleFigure();
			fFigurePackageBodyRectangle.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT));
			fFigurePackageBodyRectangle.setLineWidth(1);

			GridData constraintFFigurePackageBodyRectangle = new GridData();
			constraintFFigurePackageBodyRectangle.verticalAlignment = GridData.FILL;





import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EEnumItemSemanticEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;
import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
import org.eclipse.emf.ecoretools.diagram.providers.EcoreElementTypes;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;

	}

	/**
	 * @generated NOT
	 */
	protected IFigure createNodeShape() {
		EnumerationFigure figure = new EnumerationFigure();
		figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT)); 
		return primaryShape = figure;
	}


	}

	/**
	 * @generated NOT
	 */
	protected NodeFigure createNodePlate() {
		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
		AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		result.setBorder(shadowBorder);
		return result;
	}


		super.refreshVisuals();
	}

	@Override
	public EditPolicy getPrimaryDragEditPolicy() {
		return new AlphaResizableShapeEditPolicy();
	}

	/**
	 * @generated NOT
	 */
	public class EnumerationFigure extends GradientRectangleFigure {

		/**
		 * @generated





import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EClassItemSemanticEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;
import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
import org.eclipse.emf.ecoretools.diagram.providers.EcoreElementTypes;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;

	}

	/**
	 * @generated NOT
	 */
	protected IFigure createNodeShape() {
		ClassFigure figure = new ClassFigure();
		figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT)); 
		return primaryShape = figure;
	}


	}

	/**
	 * @generated NOT
	 */
	protected NodeFigure createNodePlate() {
		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
		AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		result.setBorder(shadowBorder);
		return result;
	}


		super.refreshVisuals();
	}

	@Override
	public EditPolicy getPrimaryDragEditPolicy() {
		return new AlphaResizableShapeEditPolicy();
	}

	/**
	 * @generated NOT
	 */
	public class ClassFigure extends GradientRectangleFigure {

		/**
		 * @generated

Lines 17-23 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/edit/parts/EDataTypeEditPart.java (-5 / +17 lines)
17	import org.eclipse.draw2d.Graphics;	17	import org.eclipse.draw2d.Graphics;
18	import org.eclipse.draw2d.IFigure;	18	import org.eclipse.draw2d.IFigure;
19	import org.eclipse.draw2d.PositionConstants;	19	import org.eclipse.draw2d.PositionConstants;
20	import org.eclipse.draw2d.RectangleFigure;
21	import org.eclipse.draw2d.StackLayout;	20	import org.eclipse.draw2d.StackLayout;
22	import org.eclipse.draw2d.ToolbarLayout;	21	import org.eclipse.draw2d.ToolbarLayout;
23	import org.eclipse.draw2d.geometry.Dimension;	22	import org.eclipse.draw2d.geometry.Dimension;
Lines 26-35 Link Here
26	import org.eclipse.emf.common.notify.Notification;	25	import org.eclipse.emf.common.notify.Notification;
27	import org.eclipse.emf.ecore.EObject;	26	import org.eclipse.emf.ecore.EObject;
28	import org.eclipse.emf.ecore.EcorePackage;	27	import org.eclipse.emf.ecore.EcorePackage;
		28	import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
29	import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;	29	import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
		30	import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
		31	import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
30	import org.eclipse.emf.ecoretools.diagram.edit.policies.EDataTypeItemSemanticEditPolicy;	32	import org.eclipse.emf.ecoretools.diagram.edit.policies.EDataTypeItemSemanticEditPolicy;
31	import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;	33	import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;
32	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;	34	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
		35	import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
33	import org.eclipse.gef.EditPart;	36	import org.eclipse.gef.EditPart;
34	import org.eclipse.gef.EditPolicy;	37	import org.eclipse.gef.EditPolicy;
35	import org.eclipse.gef.editpolicies.LayoutEditPolicy;	38	import org.eclipse.gef.editpolicies.LayoutEditPolicy;
Lines 106-115 Link Here
106	}	109	}
107		110
108	/**	111	/**
109	* @generated	112	* @generated NOT
110	*/	113	*/
111	protected IFigure createNodeShape() {	114	protected IFigure createNodeShape() {
112	DataTypeFigure figure = new DataTypeFigure();	115	DataTypeFigure figure = new DataTypeFigure();
		116	figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT));
113	return primaryShape = figure;	117	return primaryShape = figure;
114	}	118	}
115		119
Lines 175-184 Link Here
175	}	179	}
176		180
177	/**	181	/**
178	* @generated	182	* @generated NOT
179	*/	183	*/
180	protected NodeFigure createNodePlate() {	184	protected NodeFigure createNodePlate() {
181	DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));	185	DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
		186	AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		187	shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		188	result.setBorder(shadowBorder);
182	return result;	189	return result;
183	}	190	}
184		191
Lines 260-269 Link Here
260	super.refreshVisuals();	267	super.refreshVisuals();
261	}	268	}
262		269
		270	@Override
		271	public EditPolicy getPrimaryDragEditPolicy() {
		272	return new AlphaResizableShapeEditPolicy();
		273	}
		274
263	/**	275	/**
264	* @generated	276	* @generated NOT
265	*/	277	*/
266	public class DataTypeFigure extends RectangleFigure {	278	public class DataTypeFigure extends GradientRectangleFigure {
267		279
268	/**	280	/**
269	* @generated	281	* @generated

Lines 15-20 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/edit/parts/EPackageContentsEditPart.java (+3 lines)
15	package org.eclipse.emf.ecoretools.diagram.edit.parts;	15	package org.eclipse.emf.ecoretools.diagram.edit.parts;
16		16
17	import org.eclipse.draw2d.IFigure;	17	import org.eclipse.draw2d.IFigure;
		18	import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaXYLayoutEditPolicy;
18	import org.eclipse.emf.ecoretools.diagram.edit.policies.EPackageContentsCanonicalEditPolicy;	19	import org.eclipse.emf.ecoretools.diagram.edit.policies.EPackageContentsCanonicalEditPolicy;
19	import org.eclipse.emf.ecoretools.diagram.edit.policies.EPackageContentsItemSemanticEditPolicy;	20	import org.eclipse.emf.ecoretools.diagram.edit.policies.EPackageContentsItemSemanticEditPolicy;
20	import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoretoolsEditPolicyRoles;	21	import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoretoolsEditPolicyRoles;
Lines 75-80 Link Here
75	installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());	76	installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CreationEditPolicy());
76	installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new PackageDiagramDragDropEditPolicy());	77	installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new PackageDiagramDragDropEditPolicy());
77	installEditPolicy(EcoretoolsEditPolicyRoles.PSEUDO_CANONICAL_ROLE, new EPackageContentsCanonicalEditPolicy());	78	installEditPolicy(EcoretoolsEditPolicyRoles.PSEUDO_CANONICAL_ROLE, new EPackageContentsCanonicalEditPolicy());
		79	installEditPolicy(EditPolicy.LAYOUT_ROLE, new AlphaXYLayoutEditPolicy());
		80	// EPackageCompartment can not be connected !
78	}	81	}
79		82
80	/**	83	/**





package org.eclipse.emf.ecoretools.diagram.edit.parts;

import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaXYLayoutEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EPackageCanonicalEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EPackageItemSemanticEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoretoolsEditPolicyRoles;
import org.eclipse.emf.ecoretools.diagram.edit.policies.PackageDiagramDragDropEditPolicy;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.notation.View;

		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EPackageItemSemanticEditPolicy());
		installEditPolicy(EcoretoolsEditPolicyRoles.PSEUDO_CANONICAL_ROLE, new EPackageCanonicalEditPolicy());
		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new PackageDiagramDragDropEditPolicy());
		installEditPolicy(EditPolicy.LAYOUT_ROLE, new AlphaXYLayoutEditPolicy());

		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);
	}





import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.StackLayout;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecoretools.diagram.edit.figures.AlphaDropShadowBorder;
import org.eclipse.emf.ecoretools.diagram.edit.figures.FigureFromLabelUtils;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GradientRectangleFigure;
import org.eclipse.emf.ecoretools.diagram.edit.policies.AlphaResizableShapeEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EEnum2ItemSemanticEditPolicy;
import org.eclipse.emf.ecoretools.diagram.edit.policies.EcoreTextSelectionEditPolicy;
import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
import org.eclipse.emf.ecoretools.diagram.providers.EcoreElementTypes;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;

	}

	/**
	 * @generated NOT
	 */
	protected IFigure createNodeShape() {
		EnumerationFigure figure = new EnumerationFigure();
		figure.setShouldUseGradient((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT)); 
		return primaryShape = figure;
	}


	}

	/**
	 * @generated NOT
	 */
	protected NodeFigure createNodePlate() {
		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
		AlphaDropShadowBorder shadowBorder = new AlphaDropShadowBorder();
		shadowBorder.setShouldDrawDropShadow((Boolean) getViewer().getProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		result.setBorder(shadowBorder);
		return result;
	}


		}
	}

	@Override
	public EditPolicy getPrimaryDragEditPolicy() {
		return new AlphaResizableShapeEditPolicy();
	}

	/**
	 * @generated NOT
	 */
	public class EnumerationFigure extends GradientRectangleFigure {

		/**
		 * @generated




import java.util.List;

import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcoreFactory;

 */
public class EPackage2ViewFactory extends AbstractShapeViewFactory {

	static final Color THIS_FORE = ColorConstants.darkGray;

	static final Color THIS_BACK = new Color(null, 183, 167, 200);

	static final int fontHeight = 10;


Lines 18-23 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/view/factories/EAnnotationReferencesViewFactory.java (-1 / +2 lines)
18	import java.util.List;	18	import java.util.List;
19		19
20	import org.eclipse.core.runtime.IAdaptable;	20	import org.eclipse.core.runtime.IAdaptable;
		21	import org.eclipse.draw2d.ColorConstants;
21	import org.eclipse.emf.ecoretools.diagram.edit.parts.EAnnotationReferencesEditPart;	22	import org.eclipse.emf.ecoretools.diagram.edit.parts.EAnnotationReferencesEditPart;
22	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;	23	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
23	import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;	24	import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;
Lines 33-39 Link Here
33	*/	34	*/
34	public class EAnnotationReferencesViewFactory extends ConnectionViewFactory {	35	public class EAnnotationReferencesViewFactory extends ConnectionViewFactory {
35		36
36	static final Color THIS_FORE = new Color(null, 0, 0, 0);	37	static final Color THIS_FORE = ColorConstants.darkGray;
37		38
38	@Override	39	@Override
39	protected void initializeFromPreferences(View view) {	40	protected void initializeFromPreferences(View view) {

Lines 18-23 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/view/factories/EClassESuperTypesViewFactory.java (-1 / +2 lines)
18	import java.util.List;	18	import java.util.List;
19		19
20	import org.eclipse.core.runtime.IAdaptable;	20	import org.eclipse.core.runtime.IAdaptable;
		21	import org.eclipse.draw2d.ColorConstants;
21	import org.eclipse.emf.ecoretools.diagram.edit.parts.EClassESuperTypesEditPart;	22	import org.eclipse.emf.ecoretools.diagram.edit.parts.EClassESuperTypesEditPart;
22	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;	23	import org.eclipse.emf.ecoretools.diagram.part.EcoreVisualIDRegistry;
23	import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;	24	import org.eclipse.gmf.runtime.diagram.ui.view.factories.ConnectionViewFactory;
Lines 34-40 Link Here
34	*/	35	*/
35	public class EClassESuperTypesViewFactory extends ConnectionViewFactory {	36	public class EClassESuperTypesViewFactory extends ConnectionViewFactory {
36		37
37	static final Color THIS_FORE = new Color(null, 0, 0, 0);	38	static final Color THIS_FORE = ColorConstants.darkGray;
38		39
39	@Override	40	@Override
40	protected void initializeFromPreferences(View view) {	41	protected void initializeFromPreferences(View view) {

Lines 18-23 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/view/factories/EReferenceViewFactory.java (-1 / +2 lines)
18	import java.util.List;	18	import java.util.List;
19		19
20	import org.eclipse.core.runtime.IAdaptable;	20	import org.eclipse.core.runtime.IAdaptable;
		21	import org.eclipse.draw2d.ColorConstants;
21	import org.eclipse.emf.ecore.EObject;	22	import org.eclipse.emf.ecore.EObject;
22	import org.eclipse.emf.ecoretools.diagram.edit.parts.EReferenceEditPart;	23	import org.eclipse.emf.ecoretools.diagram.edit.parts.EReferenceEditPart;
23	import org.eclipse.emf.ecoretools.diagram.edit.parts.EReferenceLowerBoundUpperBoundEditPart;	24	import org.eclipse.emf.ecoretools.diagram.edit.parts.EReferenceLowerBoundUpperBoundEditPart;
Lines 39-45 Link Here
39	*/	40	*/
40	public class EReferenceViewFactory extends ConnectionViewFactory {	41	public class EReferenceViewFactory extends ConnectionViewFactory {
41		42
42	static final Color THIS_FORE = new Color(null, 0, 0, 0);	43	static final Color THIS_FORE = ColorConstants.darkGray;
43		44
44	static final int fontHeight = 10;	45	static final int fontHeight = 10;
45		46

Lines 18-23 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/view/factories/EAnnotationViewFactory.java (-1 / +2 lines)
18	import java.util.List;	18	import java.util.List;
19		19
20	import org.eclipse.core.runtime.IAdaptable;	20	import org.eclipse.core.runtime.IAdaptable;
		21	import org.eclipse.draw2d.ColorConstants;
21	import org.eclipse.emf.ecore.EAnnotation;	22	import org.eclipse.emf.ecore.EAnnotation;
22	import org.eclipse.emf.ecore.EObject;	23	import org.eclipse.emf.ecore.EObject;
23	import org.eclipse.emf.ecore.EcoreFactory;	24	import org.eclipse.emf.ecore.EcoreFactory;
Lines 41-47 Link Here
41	*/	42	*/
42	public class EAnnotationViewFactory extends AbstractShapeViewFactory {	43	public class EAnnotationViewFactory extends AbstractShapeViewFactory {
43		44
44	static final Color THIS_FORE = new Color(null, 0, 0, 0);	45	static final Color THIS_FORE = ColorConstants.darkGray;
45		46
46	static final Color THIS_BACK = new Color(null, 232, 211, 223);	47	static final Color THIS_BACK = new Color(null, 232, 211, 223);
47		48

Lines 1-5 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/preferences/DiagramPreferenceInitializer.java (-2 / +7 lines)
1	/***********************************************************************	1	/***********************************************************************
2	* Copyright (c) 2007 Anyware Technologies	2	* Copyright (c) 2007, 2008 Anyware Technologies
3	*	3	*
4	* All rights reserved. This program and the accompanying materials	4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0	5	* are made available under the terms of the Eclipse Public License v1.0
Lines 24-30 Link Here
24	public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer {	24	public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer {
25		25
26	/**	26	/**
27	* @generated	27	* Initialize new preferences added to support Sexy UI feature
		28	*
		29	* @generated NOT
28	*/	30	*/
29	@Override	31	@Override
30	public void initializeDefaultPreferences() {	32	public void initializeDefaultPreferences() {
Lines 34-39 Link Here
34	DiagramAppearancePreferencePage.initDefaults(store);	36	DiagramAppearancePreferencePage.initDefaults(store);
35	DiagramConnectionsPreferencePage.initDefaults(store);	37	DiagramConnectionsPreferencePage.initDefaults(store);
36	DiagramRulersAndGridPreferencePage.initDefaults(store);	38	DiagramRulersAndGridPreferencePage.initDefaults(store);
		39
		40	store.setDefault(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT, true);
		41	store.setDefault(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER, true);
37	}	42	}
38		43
39	/**	44	/**

Lines 1-5 Link Here

(-)src/org/eclipse/emf/ecoretools/diagram/preferences/DiagramAppearancePreferencePage.java (-1 / +64 lines)
1	/***********************************************************************	1	/***********************************************************************
2	* Copyright (c) 2007 Anyware Technologies	2	* Copyright (c) 2007, 2008 Anyware Technologies
3	*	3	*
4	* All rights reserved. This program and the accompanying materials	4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0	5	* are made available under the terms of the Eclipse Public License v1.0
Lines 16-31 Link Here
16		16
17	import org.eclipse.emf.ecoretools.diagram.part.EcoreDiagramEditorPlugin;	17	import org.eclipse.emf.ecoretools.diagram.part.EcoreDiagramEditorPlugin;
18	import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;	18	import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;
		19	import org.eclipse.jface.preference.BooleanFieldEditor;
		20	import org.eclipse.swt.SWT;
		21	import org.eclipse.swt.custom.StyledText;
		22	import org.eclipse.swt.layout.GridData;
		23	import org.eclipse.swt.layout.GridLayout;
		24	import org.eclipse.swt.widgets.Composite;
		25	import org.eclipse.swt.widgets.Group;
		26	import org.eclipse.swt.widgets.Label;
19		27
20	/**	28	/**
21	* @generated	29	* @generated
22	*/	30	*/
23	public class DiagramAppearancePreferencePage extends AppearancePreferencePage {	31	public class DiagramAppearancePreferencePage extends AppearancePreferencePage {
24		32
		33	private BooleanFieldEditor fillFigureUsingGradient = null;
		34	private BooleanFieldEditor useShadowOnBorder = null;
		35
25	/**	36	/**
26	* @generated	37	* @generated
27	*/	38	*/
28	public DiagramAppearancePreferencePage() {	39	public DiagramAppearancePreferencePage() {
29	setPreferenceStore(EcoreDiagramEditorPlugin.getInstance().getPreferenceStore());	40	setPreferenceStore(EcoreDiagramEditorPlugin.getInstance().getPreferenceStore());
30	}	41	}
		42
		43	/*
		44	* (non-Javadoc)
		45	*
		46	* @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#
		47	* addFields(org.eclipse.swt.widgets.Composite)
		48	*/
		49	protected void addFields(Composite parent) {
		50	Composite main = createPageLayout(parent);
		51	createFontAndColorGroup(main);
		52	createSexyUIGroup(main);
		53	}
		54
		55	/**
		56	* Create the sexyUI group for the preference page
		57	*
		58	* @param parent
		59	* @return composite fontAndColourGroup
		60	*/
		61	protected Composite createSexyUIGroup(Composite parent) {
		62
		63	Group group = new Group(parent, SWT.NONE);
		64	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		65	group.setLayout(new GridLayout(3, false));
		66	Composite composite = new Composite(group, SWT.NONE);
		67	GridLayout gridLayout = new GridLayout(3, false);
		68	composite.setLayout(gridLayout);
		69	GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
		70	gridData.grabExcessHorizontalSpace = true;
		71	gridData.horizontalSpan = 3;
		72	composite.setLayoutData(gridData);
		73	group.setText("Sexy UI - Figures rendering");
		74
		75	fillFigureUsingGradient = new BooleanFieldEditor(
		76	IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT, "Use gradient to fill figures", composite);
		77	addField(fillFigureUsingGradient);
		78
		79	useShadowOnBorder = new BooleanFieldEditor(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER,
		80	"Show shadow on border", composite);
		81	addField(useShadowOnBorder);
		82
		83	createNoteComposite(parent.getFont(), group, "Note:", "those preferences will take effect only on new diagrams.");
		84
		85	GridLayout layout = new GridLayout();
		86	layout.numColumns = 3;
		87	layout.marginWidth = 0;
		88	layout.marginHeight = 0;
		89	layout.horizontalSpacing = 8;
		90	composite.setLayout(layout);
		91
		92	return group;
		93	}
31	}	94	}




/***********************************************************************
 * Copyright (c) 2007, 2008 Anyware Technologies
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0

import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecoretools.diagram.navigator.EcoreNavigatorItem;
import org.eclipse.emf.ecoretools.diagram.outline.EcoreDiagramOutlinePage;
import org.eclipse.emf.ecoretools.diagram.preferences.IEcoreToolsPreferenceConstants;
import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.workspace.EMFCommandOperation;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.MouseWheelHandler;
import org.eclipse.gef.MouseWheelZoomHandler;
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;
import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.dnd.TransferData;
import org.eclipse.swt.widgets.Shell;

	}

	/**
	 * Store Sexy UI preferences at the Viewer level so that it can be reached later by controllers.
	 * 
	 * @see org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor#initializeGraphicalViewerContents()
	 */
	@Override
	protected void initializeGraphicalViewerContents() {
		// Sexy UI preferences
		getGraphicalViewer().setProperty(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT, EcoreDiagramEditorPlugin.getInstance().getPreferenceStore().getBoolean(IEcoreToolsPreferenceConstants.PREF_FILL_FIGURE_USING_GRADIENT));
		getGraphicalViewer().setProperty(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER, EcoreDiagramEditorPlugin.getInstance().getPreferenceStore().getBoolean(IEcoreToolsPreferenceConstants.PREF_USE_SHADOW_ON_BORDER));
		super.initializeGraphicalViewerContents();
		// Scroll-wheel Zoom
		getGraphicalViewer().setProperty(MouseWheelHandler.KeyGenerator.getKey(SWT.CTRL), MouseWheelZoomHandler.SINGLETON);
	}

	@Override




/***********************************************************************
 * Copyright (c) 2008 Anyware Technologies
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *    Simon Bernard (Anyware Technologies) - initial API and implementation
 *
 * $Id$
 **********************************************************************/
package org.eclipse.emf.ecoretools.diagram.edit.policies;

import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GhostRectangleFigure;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;

/**
 * ResizableShapeEditPolicy which draw rectangle feedback with alpha property
 * instead of XOR<br>
 * Useful to have a best display with gradient figure <br>
 * creation : 17 mai. 08
 * 
 * @author <a href="mailto:simon.bernard@anyware-tech.com">Simon Bernard</a>
 */
public class AlphaResizableShapeEditPolicy extends ResizableShapeEditPolicy {

	@Override
	protected IFigure createDragSourceFeedbackFigure() {
		// Use a ghost rectangle for feedback
		RectangleFigure r = new GhostRectangleFigure();
		r.setBounds(getInitialFeedbackBounds());
		addFeedback(r);
		return r;
	}

}




/***********************************************************************
 * Copyright (c) 2008 Anyware Technologies
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *    Simon Bernard (Anyware Technologies) - initial API and implementation
 *
 * $Id$
 **********************************************************************/
package org.eclipse.emf.ecoretools.diagram.edit.policies;

import org.eclipse.draw2d.IFigure;
import org.eclipse.emf.ecoretools.diagram.edit.figures.GhostRectangleFigure;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;

/**
 * XYLayoutEditPolicy which draw rectangle feedback with alpha property instead
 * of XOR<br>
 * Useful to have a best display with gradient figure <br>
 * creation : 17 mai. 08
 * 
 * @author <a href="mailto:simon.bernard@anyware-tech.com">Simon Bernard</a>
 */
public class AlphaXYLayoutEditPolicy extends XYLayoutEditPolicy {

	@Override
	protected IFigure createSizeOnDropFeedback(CreateRequest createRequest) {
		GhostRectangleFigure feedack = new GhostRectangleFigure();
		addFeedback(feedack);
		return feedack;
	}

}




/***********************************************************************
 * Copyright (c) 2008 Anyware Technologies
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *    Simon Bernard (Anyware Technologies) - initial API and implementation
 *
 * $Id$
 **********************************************************************/
package org.eclipse.emf.ecoretools.diagram.edit.figures;

import org.eclipse.draw2d.AbstractBackground;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants;
import org.eclipse.gmf.runtime.draw2d.ui.figures.DropShadowBorder;
import org.eclipse.gmf.runtime.draw2d.ui.figures.IPolygonAnchorableFigure;
import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
import org.eclipse.swt.graphics.Color;

/**
 * A border using a shadow<br>
 * creation : 17 mai. 08
 * 
 * @author <a href="mailto:simon.bernard@anyware-tech.com">Simon Bernard</a>
 */
public class AlphaDropShadowBorder extends AbstractBackground implements DropShadowBorder {

	private static final int DEFAULT_SHIFT_VALUE = 1;

	private static final Color SHADOW_COLOR = DiagramColorConstants.diagramDarkGray;

	private static final int DEFAULT_TRANSPARENCY = 65;

	private boolean shouldDrawShadow = true;

	private int shift = DEFAULT_SHIFT_VALUE;

	public void setShouldDrawDropShadow(boolean drawDropShadow) {
		shouldDrawShadow = drawDropShadow;
	}

	public boolean shouldDrawDropShadow() {
		return shouldDrawShadow;
	}

	/**
	 * Method for determining the inset the border will take up on the shape.
	 * 
	 * @param figure
	 *            Figure that will be inset from the border
	 * @return Insets the Insets for the border on the given figure.
	 */
	public Insets getInsets(IFigure figure) {
		Insets insetsNew = new Insets();
		insetsNew.top = 0;
		insetsNew.left = 0;
		insetsNew.bottom = MapModeUtil.getMapMode(figure).DPtoLP(shift * 2);
		insetsNew.right = MapModeUtil.getMapMode(figure).DPtoLP(shift * 2);
		return insetsNew;
	}

	public Insets getTransparentInsets(IFigure figure) {
		Insets insetsNew = new Insets();
		insetsNew.top = 0;
		insetsNew.left = 0;
		insetsNew.bottom = MapModeUtil.getMapMode(figure).DPtoLP(shift * 2);
		insetsNew.right = MapModeUtil.getMapMode(figure).DPtoLP(shift * 2);
		return insetsNew;
	}

	@Override
	public void paintBackground(IFigure figure, Graphics graphics, Insets insets) {
		if (shouldDrawDropShadow()) {
			graphics.pushState();
			graphics.setBackgroundColor(SHADOW_COLOR);
			graphics.setAlpha(DEFAULT_TRANSPARENCY);

			if (figure instanceof IPolygonAnchorableFigure) {
				PointList polygonPoints = ((IPolygonAnchorableFigure) figure).getPolygonPoints();
				polygonPoints.translate(shift, shift);
				graphics.fillPolygon(polygonPoints);
				polygonPoints.translate(shift, shift);
				graphics.fillPolygon(polygonPoints);
			} else {
				Rectangle bounds = figure.getBounds().getCopy();
				bounds.translate(shift, shift);
				graphics.fillRoundRectangle(bounds, 0, 0);
				bounds.translate(shift, shift);
				graphics.fillRoundRectangle(bounds, 0, 0);
			}

			graphics.popState();
		}
	}
}




/***********************************************************************
 * Copyright (c) 2008 Anyware Technologies
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *    Simon Bernard (Anyware Technologies) - initial API and implementation
 *
 * $Id$
 **********************************************************************/
package org.eclipse.emf.ecoretools.diagram.edit.figures;

import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants;

/**
 * A "ghost" rectangleFigure <br>
 * Useful for feedback on figures which use gradient <br>
 * creation : 17 mai. 08
 * 
 * @author <a href="mailto:simon.bernard@anyware-tech.com">Simon Bernard</a>
 */
public class GhostRectangleFigure extends RectangleFigure {

	public GhostRectangleFigure() {
		setBackgroundColor(DiagramColorConstants.diagramGray);
		setForegroundColor(DiagramColorConstants.black);
		setLineStyle(Graphics.LINE_DOT);
	}

	@Override
	protected void fillShape(Graphics graphics) {
		graphics.pushState();
		graphics.setAlpha(125);
		super.fillShape(graphics);
		graphics.popState();
	}
}




/***********************************************************************
 * Copyright (c) 2008 Anyware Technologies
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *    Jacques Lescot (Anyware Technologies) - initial API and implementation
 *
 * $Id$
 **********************************************************************/
package org.eclipse.emf.ecoretools.diagram.preferences;

/**
 * Defines custom preference constants for the Ecore Tools graphical editor
 * <p>
 * This interface defines constants only, it is <EM>not</EM> intended to be implemented by clients.
 * </p>
 * 
 * @author Jacques Lescot
 */
public interface IEcoreToolsPreferenceConstants {

	/** use Gradient to render figures - Appearance Preference */
	public static final String PREF_FILL_FIGURE_USING_GRADIENT = "Appearance.fillFigureUsingGradient"; //$NON-NLS-1$

	/** use Shadow on borders when rendering figures - Appearance Preference */
	public static final String PREF_USE_SHADOW_ON_BORDER = "Appearance.useShadowOnBorder"; //$NON-NLS-1$
}




/***********************************************************************
 * Copyright (c) 2008 Anyware Technologies
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *    Simon Bernard (Anyware Technologies) - initial API and implementation
 *
 * $Id$
 **********************************************************************/
package org.eclipse.emf.ecoretools.diagram.edit.figures;

import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants;

/**
 * A Rectangle which is draw with gradient property<br>
 * creation : 17 mai. 08
 * 
 * @author <a href="mailto:simon.bernard@anyware-tech.com">Simon Bernard</a>
 */
public class GradientRectangleFigure extends RectangleFigure {

	private boolean useGradient = true;
	
	/**
	 * Sets whether the gradient should be used when rendering the figure
	 * 
	 * @param drawDropShadow 
	 */
	public void setShouldUseGradient(boolean shouldUseGradient) {
		this.useGradient = shouldUseGradient;
	}
	
	/**
	 * @return true if gradient should be used when rendering the figure
	 */
	public boolean shouldUseGradient() {
		return useGradient;
	}
	
	@Override
	protected void fillShape(Graphics graphics) {
		if (shouldUseGradient()) {
			graphics.pushState();
			graphics.setBackgroundColor(DiagramColorConstants.white);
			graphics.setForegroundColor(getBackgroundColor());
			graphics.fillGradient(getBounds(), true);
			graphics.popState();
		} else {
			super.fillShape(graphics);
		}
	}

	@Override
	protected void outlineShape(Graphics graphics) {
		super.outlineShape(graphics);
	}
}

Return to bug 235303

Added Link Here

(-)custom-src/org/eclipse/emf/ecoretools/diagram/edit/policies/AlphaResizableShapeEditPolicy.java (+40 lines)
1	/***********************************************************************
2	* Copyright (c) 2008 Anyware Technologies
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Simon Bernard (Anyware Technologies) - initial API and implementation
11	*
12	* $Id$
13	**********************************************************************/
14	package org.eclipse.emf.ecoretools.diagram.edit.policies;
15
16	import org.eclipse.draw2d.IFigure;
17	import org.eclipse.draw2d.RectangleFigure;
18	import org.eclipse.emf.ecoretools.diagram.edit.figures.GhostRectangleFigure;
19	import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
20
21	/**
22	* ResizableShapeEditPolicy which draw rectangle feedback with alpha property
23	* instead of XOR<br>
24	* Useful to have a best display with gradient figure <br>
25	* creation : 17 mai. 08
26	*
27	* @author <a href="mailto:simon.bernard@anyware-tech.com">Simon Bernard</a>
28	*/
29	public class AlphaResizableShapeEditPolicy extends ResizableShapeEditPolicy {
30
31	@Override
32	protected IFigure createDragSourceFeedbackFigure() {
33	// Use a ghost rectangle for feedback
34	RectangleFigure r = new GhostRectangleFigure();
35	r.setBounds(getInitialFeedbackBounds());
36	addFeedback(r);
37	return r;
38	}
39
40	}