Attachment #118081 for bug #255553

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




/******************************************************************************
 * Copyright (c) 2008 IBM Corporation and others.
 * 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

import org.eclipse.draw2d.geometry.Rectangle;

/**
 * Extends {@link org.eclipse.draw2d.LineBorder} to customize painting.
 * 
 * @author Anthony Hunter
 * @since 2.1
 */
public class GeoShapeLineStyleBorder extends LineBorder {

	private int style = Graphics.LINE_SOLID;

	/**
	 * Constructs a default black LineBorder with a width of one pixel.
	 * 

		super();
	}

	/**
	 * Get the line style of this border.
	 * 
	 * @return The line style of this border.
	 */
	public int getStyle() {
		return style;
	}

	/**
	 * Set the line style of this border.
	 * 
	 * @param style
	 *            The line style of this border.
	 */
	public void setStyle(int style) {
		this.style = style;
	}

	/*
	 * @see org.eclipse.draw2d.LineBorder#paint(org.eclipse.draw2d.IFigure,
	 *      org.eclipse.draw2d.Graphics, org.eclipse.draw2d.geometry.Insets)




	public IFigure getContentPane() {
		return ((GeoShapeFigure) getFigure()).getContentPane();
	}
	
	/**
	 * Sets the line width to the border as well.
	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#setLineWidth(int)
	 */
	protected void setLineWidth(int width) {
		super.setLineWidth(width);
		((RectangularDropShadowLineBorder)getFigure().getBorder()).setWidth(getMapMode().DPtoLP(width));
		getFigure().revalidate();
	}
	
	/** Sets the line type to the border.
	 * @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#setLineType(int)
	 */
	protected void setLineType(int lineType) {
		super.setLineType(lineType);
		((RectangularDropShadowLineBorder)getFigure().getBorder()).setStyle(lineType);
	}	

}

Lines 1-5 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java (-2 / +34 lines)
1	/******************************************************************************	1	/******************************************************************************
2	* Copyright (c) 2002, 2006 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 11-17 Link Here
11		11
12	package org.eclipse.gmf.runtime.diagram.ui.editparts;	12	package org.eclipse.gmf.runtime.diagram.ui.editparts;
13		13
		14	import org.eclipse.draw2d.Border;
14	import org.eclipse.draw2d.IFigure;	15	import org.eclipse.draw2d.IFigure;
		16	import org.eclipse.draw2d.LineBorder;
15	import org.eclipse.emf.common.notify.Notification;	17	import org.eclipse.emf.common.notify.Notification;
16	import org.eclipse.emf.ecore.EObject;	18	import org.eclipse.emf.ecore.EObject;
17	import org.eclipse.gef.ExposeHelper;	19	import org.eclipse.gef.ExposeHelper;
Lines 70-75 Link Here
70	refreshShowCompartmentTitle();	72	refreshShowCompartmentTitle();
71	refreshCollapsed();	73	refreshCollapsed();
72	refreshRatio();	74	refreshRatio();
		75	refreshLineWidth();
		76	refreshLineType();
73	}	77	}
74		78
75	/**	79	/**
Lines 138-144 Link Here
138	NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) \|\|	142	NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) \|\|
139	NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {	143	NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
140	refreshFont();	144	refreshFont();
141	} else	145	} else if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)){
		146	refreshLineWidth();
		147	} else if (NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(feature)) {
		148	refreshLineType();
		149	} else
142	super.handleNotificationEvent(event);	150	super.handleNotificationEvent(event);
143	}	151	}
144		152
Lines 229-234 Link Here
229	if (getCompartmentFigure()!=null)	237	if (getCompartmentFigure()!=null)
230	getCompartmentFigure().setFontColor(color);	238	getCompartmentFigure().setFontColor(color);
231	}	239	}
		240
		241	/**
		242	* Sets the line width for the shape's border
		243	* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineWidth(int)
		244	*/
		245	protected void setLineWidth(int width) {
		246	Border border = getFigure().getBorder();
		247	if (border instanceof LineBorder) {
		248	((LineBorder) border).setWidth(getMapMode().DPtoLP(width));
		249	getFigure().revalidate();
		250	}
		251	}
		252
		253	/**
		254	* Sets the line type for the shape's border
		255	* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineType(int)
		256	*/
		257	protected void setLineType(int type) {
		258	Border border = getFigure().getBorder();
		259	if (border instanceof LineBorder) {
		260	((LineBorder) border).setStyle(type);
		261	//getFigure().repaint();
		262	}
		263	}
232		264
233	/**	265	/**
234	* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#addNotationalListeners()	266	* @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#addNotationalListeners()




/*******************************************************************************
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 * 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


private int width = 1;
private Color color;
private int style = Graphics.LINE_SOLID;

/**
 * Constructs a LineBorder with the specified color and of the specified width and style.
 *
 * @param color The color of the border.
 * @param width The width of the border in pixels.
 * @param style The style of the border. For the list of valid values, see 
 * {@link org.eclipse.draw2d.Graphics}
 * @since 3.5
 */
public LineBorder(Color color, int width, int style) {
	setColor(color);
	setWidth(width);
	setStyle(style);
}


/**
 * Constructs a LineBorder with the specified color and of the specified width.

 * @since 2.0
 */
public LineBorder(Color color, int width) {
	this(color, width, Graphics.LINE_SOLID);
	setWidth(width);
}

/**

	}
	tempRect.shrink(getWidth() / 2, getWidth() / 2);
	graphics.setLineWidth(getWidth());
	graphics.setLineStyle(getStyle());
	if (getColor() != null)
		graphics.setForegroundColor(getColor());
	graphics.drawRectangle(tempRect);

 * @param width The line width
 */
public void setWidth(int width) {
	if (width > 0) {
		this.width = width;
	}
}

/**
 * Returns the line style for this border.
 * @return The line style for this border
 * @since 3.5
 */
public int getStyle() {
	return style;
}

/**
 * Sets the line type of this border.
 * @param style For the list of valid values, see {@link org.eclipse.draw2d.Graphics}
 * @since 3.5
 */
public void setStyle(int style) {
	this.style = style;
}

}

Lines 1-5 Link Here

(-)src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java (-4 / +16 lines)
1	/******************************************************************************	1	/******************************************************************************
2	* Copyright (c) 2002, 2003 IBM Corporation and others.	2	* Copyright (c) 2002, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 117-135 Link Here
117	tempRect.width--;	117	tempRect.width--;
118	tempRect.height--;	118	tempRect.height--;
119	}	119	}
120	tempRect.shrink(getWidth() / 2, getWidth() / 2);
121	graphics.setLineWidth(getWidth());	120	graphics.setLineWidth(getWidth());
		121	graphics.setLineStyle(getStyle());
122	switch (position) {	122	switch (position) {
123	case PositionConstants.TOP :	123	case PositionConstants.TOP :
124	graphics.drawLine(tempRect.getTopLeft(), tempRect.getTopRight());	124	// move down by width/2 to ensure the border will fit;
		125	// no need to change x
		126	tempRect.y += getWidth() / 2;
		127	graphics.drawLine(tempRect.getTopLeft(), tempRect.getTopRight());
125	break;	128	break;
126	case PositionConstants.BOTTOM :	129	case PositionConstants.BOTTOM :
		130	// move up by width/2 to ensure the border will fit;
		131	// no need to change x
		132	tempRect.y -= getWidth() / 2;
127	graphics.drawLine(tempRect.getBottomLeft(), tempRect.getBottomRight());	133	graphics.drawLine(tempRect.getBottomLeft(), tempRect.getBottomRight());
128	break;	134	break;
129	case PositionConstants.LEFT :	135	case PositionConstants.LEFT :
		136	// move right by width/2 to ensure the border will fit;
		137	// no need to change y
		138	tempRect.x += getWidth() / 2;
130	graphics.drawLine(tempRect.getTopLeft(), tempRect.getBottomLeft());	139	graphics.drawLine(tempRect.getTopLeft(), tempRect.getBottomLeft());
131	break;	140	break;
132	case PositionConstants.RIGHT :	141	case PositionConstants.RIGHT :
		142	// move left by width/2 to ensure the border will fit;
		143	// no need to change y
		144	tempRect.x -= getWidth() / 2;
133	graphics.drawLine(tempRect.getTopRight(), tempRect.getBottomRight());	145	graphics.drawLine(tempRect.getTopRight(), tempRect.getBottomRight());
134	break;	146	break;
135	}	147	}




/******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * 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

	 * Constructs a LineBorder 
	 * of the specified width.
	 *
	 * @param w  Width of inset for border in logic points
	 * 
	 */
	public RectangularDropShadowLineBorder(int w) {

	 * @return Insets the Insets for the border on the given figure.
	 */
	public Insets getInsets(IFigure figure) {
		// take into account line width
		Insets insetsNew = new Insets(getWidth());		
		IMapMode mm = MapModeUtil.getMapMode(figure);
		insetsNew.bottom += mm.DPtoLP(getShadowHeight());
		insetsNew.right += mm.DPtoLP(getShadowWidth());

		return insetsNew;
	}

	 * @param insets Insets value that contrains how the border will be painted.
	 */
	public void paintLineBorder(IFigure figure, Graphics g, Insets insets) {

		// will not paint line border if width is 0
		if (getWidth() > 0) { 
			tempRect.setBounds(getPaintRectangle(figure, insets));
			tempRect.shrink(getWidth()/2, getWidth()/2);
			g.setLineWidth(getWidth());
			g.setLineStyle(getStyle());
			g.drawRectangle(tempRect);			
		}
	}
	

			tempRect.setBounds(getPaintRectangle(figure, insets));
			tempRect.width -= mm.DPtoLP(getShadowWidth());
			tempRect.height -= mm.DPtoLP(getShadowHeight());
			tempRect.shrink(getWidth() / 2, getWidth() / 2);
				tempRect.width -= mm.DPtoLP(1);
				tempRect.height -= mm.DPtoLP(1);
			}
			tempRect.shrink(mm.DPtoLP(getWidth() / 2), mm.DPtoLP(getWidth() / 2));
			g.setLineWidth(getWidth());
			g.setLineStyle(getStyle());			

			if (getColor() != null) {
				g.setForegroundColor(getColor());

	 * Overridden method for painting the border on the shape.
	 * @param figure Figure that the border will be painted on
	 * @param g Graphics context 
	 * @param insets Insets value that constrains how the border will be painted.
	 */
	public void paint(IFigure figure, Graphics g, Insets insets) {


	}

	/**
	 * @return Returns the drop shadow image.
	 */
	protected RectangularDropShadow getDropShadow() {
		return dropShadow;




/******************************************************************************
 * Copyright (c) 2002, 2008 IBM Corporation and others.
 * 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

import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.LineBorder;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;
import org.eclipse.swt.graphics.Color;


	 */
	public void paint(IFigure figure, Graphics graphics, Insets insets) {
		tempRect.setBounds(getPaintRectangle(figure, insets));
		IMapMode mm = MapModeUtil.getMapMode(figure);
		// width is in pixels (as stated in constructors), convert it
		int lpWidth = mm.DPtoLP(getWidth());
		tempRect.shrink(lpWidth / 2, lpWidth / 2);
		int shrinkWidth = MapModeUtil.getMapMode(figure).DPtoLP( getWidth() / 2 );
		tempRect.shrink(shrinkWidth, shrinkWidth);

		graphics.setLineWidth(lpWidth);
		graphics.setLineStyle(getStyle());
		if (getColor() != null)
			graphics.setForegroundColor(getColor());


Return to bug 255553

Lines 47-51 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java (+18 lines)
47	public IFigure getContentPane() {	47	public IFigure getContentPane() {
48	return ((GeoShapeFigure) getFigure()).getContentPane();	48	return ((GeoShapeFigure) getFigure()).getContentPane();
49	}	49	}
		50
		51	/**
		52	* Sets the line width to the border as well.
		53	* @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#setLineWidth(int)
		54	*/
		55	protected void setLineWidth(int width) {
		56	super.setLineWidth(width);
		57	((RectangularDropShadowLineBorder)getFigure().getBorder()).setWidth(getMapMode().DPtoLP(width));
		58	getFigure().revalidate();
		59	}
		60
		61	/** Sets the line type to the border.
		62	* @see org.eclipse.gmf.runtime.diagram.ui.geoshapes.internal.editparts.GeoShapeEditPart#setLineType(int)
		63	*/
		64	protected void setLineType(int lineType) {
		65	super.setLineType(lineType);
		66	((RectangularDropShadowLineBorder)getFigure().getBorder()).setStyle(lineType);
		67	}
50		68
51	}	69	}

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/LineBorder.java (-4 / +41 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 23-28 Link Here
23		23
24	private int width = 1;	24	private int width = 1;
25	private Color color;	25	private Color color;
		26	private int style = Graphics.LINE_SOLID;
		27
		28	/**
		29	* Constructs a LineBorder with the specified color and of the specified width and style.
		30	*
		31	* @param color The color of the border.
		32	* @param width The width of the border in pixels.
		33	* @param style The style of the border. For the list of valid values, see
		34	* {@link org.eclipse.draw2d.Graphics}
		35	* @since 3.5
		36	*/
		37	public LineBorder(Color color, int width, int style) {
		38	setColor(color);
		39	setWidth(width);
		40	setStyle(style);
		41	}
		42
26		43
27	/**	44	/**
28	* Constructs a LineBorder with the specified color and of the specified width.	45	* Constructs a LineBorder with the specified color and of the specified width.
Lines 32-39 Link Here
32	* @since 2.0	49	* @since 2.0
33	*/	50	*/
34	public LineBorder(Color color, int width) {	51	public LineBorder(Color color, int width) {
35	setColor(color);	52	this(color, width, Graphics.LINE_SOLID);
36	setWidth(width);
37	}	53	}
38		54
39	/**	55	/**
Lines 109-114 Link Here
109	}	125	}
110	tempRect.shrink(getWidth() / 2, getWidth() / 2);	126	tempRect.shrink(getWidth() / 2, getWidth() / 2);
111	graphics.setLineWidth(getWidth());	127	graphics.setLineWidth(getWidth());
		128	graphics.setLineStyle(getStyle());
112	if (getColor() != null)	129	if (getColor() != null)
113	graphics.setForegroundColor(getColor());	130	graphics.setForegroundColor(getColor());
114	graphics.drawRectangle(tempRect);	131	graphics.drawRectangle(tempRect);
Lines 127-133 Link Here
127	* @param width The line width	144	* @param width The line width
128	*/	145	*/
129	public void setWidth(int width) {	146	public void setWidth(int width) {
130	this.width = width;	147	if (width > 0) {
		148	this.width = width;
		149	}
		150	}
		151
		152	/**
		153	* Returns the line style for this border.
		154	* @return The line style for this border
		155	* @since 3.5
		156	*/
		157	public int getStyle() {
		158	return style;
		159	}
		160
		161	/**
		162	* Sets the line type of this border.
		163	* @param style For the list of valid values, see {@link org.eclipse.draw2d.Graphics}
		164	* @since 3.5
		165	*/
		166	public void setStyle(int style) {
		167	this.style = style;
131	}	168	}
132		169
133	}	170	}