Attachment 120259 Details for Bug 255553 – Patch

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

[patch] Patch

LineWidthTypeComp.txt (text/plain), 12.39 KB, created by Lidija Grahek

on 2008-12-11 17:05:43 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Lidija Grahek

Created: 2008-12-11 17:05:43 EST

Size: 12.39 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.diagram.ui
>Index: src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java,v
>retrieving revision 1.15
>diff -u -r1.15 ResizableCompartmentEditPart.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java	3 Oct 2006 15:02:04 -0000	1.15
>+++ src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java	11 Dec 2008 22:03:03 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2006 IBM Corporation and others.
>+ * 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
>@@ -11,7 +11,9 @@
> 
> package org.eclipse.gmf.runtime.diagram.ui.editparts;
> 
>+import org.eclipse.draw2d.Border;
> import org.eclipse.draw2d.IFigure;
>+import org.eclipse.draw2d.LineBorder;
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.gef.ExposeHelper;
>@@ -70,6 +72,8 @@
> 		refreshShowCompartmentTitle();
> 		refreshCollapsed();
> 		refreshRatio();
>+		refreshLineWidth();
>+		refreshLineType();		
> 	}
> 
> 	/**
>@@ -138,7 +142,11 @@
>                 NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
>                 NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
> 			refreshFont();
>-		} else
>+        } else if (NotationPackage.eINSTANCE.getLineStyle_LineWidth().equals(feature)){
>+			refreshLineWidth();
>+		} else if (NotationPackage.eINSTANCE.getLineTypeStyle_LineType().equals(feature)) {
>+			refreshLineType();
>+		} else 
> 			super.handleNotificationEvent(event);
> 	}
> 		
>@@ -229,6 +237,29 @@
> 		if (getCompartmentFigure()!=null)
> 			getCompartmentFigure().setFontColor(color);
> 	}
>+	
>+	/**
>+	 * Sets the line width for the shape's border
>+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineWidth(int)
>+	 */
>+	protected void setLineWidth(int width) {
>+		Border border = getFigure().getBorder();
>+		if (border instanceof LineBorder) {
>+			((LineBorder) border).setWidth(getMapMode().DPtoLP(width));
>+			getFigure().revalidate();
>+		}		
>+	}
>+	
>+	/**
>+	 * Sets the line type for the shape's border
>+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#setLineType(int)
>+	 */
>+	protected void setLineType(int type) {
>+		Border border = getFigure().getBorder();
>+		if (border instanceof LineBorder) {
>+			((LineBorder) border).setStyle(type);
>+		}
>+	}	
> 
> 	/**
> 	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#addNotationalListeners()
>#P org.eclipse.gmf.runtime.draw2d.ui
>Index: src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java,v
>retrieving revision 1.2
>diff -u -r1.2 OneLineBorder.java
>--- src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java	12 Sep 2005 21:27:42 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/draw2d/ui/figures/OneLineBorder.java	11 Dec 2008 22:03:03 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2003 IBM Corporation and others.
>+ * 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
>@@ -117,19 +117,31 @@
> 			tempRect.width--;
> 			tempRect.height--;
> 		}
>-		tempRect.shrink(getWidth() / 2, getWidth() / 2);
> 		graphics.setLineWidth(getWidth());
>+		graphics.setLineStyle(getStyle());
> 		switch (position) {
> 			case PositionConstants.TOP :
>-				graphics.drawLine(tempRect.getTopLeft(), tempRect.getTopRight());
>+				// move down by width/2 to ensure the border will fit;
>+				// no need to change x
>+				tempRect.y += getWidth() / 2;				
>+				graphics.drawLine(tempRect.getTopLeft(), tempRect.getTopRight());				
> 				break;
>-			case PositionConstants.BOTTOM :
>+			case PositionConstants.BOTTOM :	
>+				// move up by width/2 to ensure the border will fit;
>+				// no need to change x			
>+				tempRect.y -= getWidth() / 2;
> 				graphics.drawLine(tempRect.getBottomLeft(), tempRect.getBottomRight());
> 				break;
> 			case PositionConstants.LEFT :
>+				// move right by width/2 to ensure the border will fit;
>+				// no need to change y			
>+				tempRect.x += getWidth() / 2;
> 				graphics.drawLine(tempRect.getTopLeft(), tempRect.getBottomLeft());
> 				break;
> 			case PositionConstants.RIGHT :
>+				// move left by width/2 to ensure the border will fit;
>+				// no need to change y						
>+				tempRect.x -= getWidth() / 2;
> 				graphics.drawLine(tempRect.getTopRight(), tempRect.getBottomRight());
> 				break;
> 		}
>Index: src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java,v
>retrieving revision 1.7
>diff -u -r1.7 RectangularDropShadowLineBorder.java
>--- src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java	10 Dec 2008 21:50:44 -0000	1.7
>+++ src/org/eclipse/gmf/runtime/draw2d/ui/figures/RectangularDropShadowLineBorder.java	11 Dec 2008 22:03:03 -0000
>@@ -158,6 +158,7 @@
> 			tempRect.setBounds(getPaintRectangle(figure, insets));
> 			tempRect.shrink(getWidth()/2, getWidth()/2);
> 			g.setLineWidth(getWidth());
>+			g.setLineStyle(getStyle());
> 			g.drawRectangle(tempRect);			
> 		}
> 	}
>@@ -183,7 +184,8 @@
> 			tempRect.width -= mm.DPtoLP(getShadowWidth());
> 			tempRect.height -= mm.DPtoLP(getShadowHeight());
> 			tempRect.shrink(getWidth() / 2, getWidth() / 2);
>-			g.setLineWidth(getWidth());			
>+			g.setLineWidth(getWidth());	
>+			g.setLineStyle(getStyle());
> 
> 			if (getColor() != null) {
> 				g.setForegroundColor(getColor());
>Index: src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.draw2d.ui/src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java,v
>retrieving revision 1.3
>diff -u -r1.3 LineBorderEx.java
>--- src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java	4 Nov 2005 21:27:59 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/draw2d/ui/internal/figures/LineBorderEx.java	11 Dec 2008 22:03:03 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2004 IBM Corporation and others.
>+ * 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
>@@ -16,6 +16,7 @@
> 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;
> 
>@@ -70,14 +71,13 @@
> 	 */
> 	public void paint(IFigure figure, Graphics graphics, Insets insets) {
> 		tempRect.setBounds(getPaintRectangle(figure, insets));
>-		if (getWidth() % 2 == 1) {
>-			tempRect.width -= MapModeUtil.getMapMode(figure).DPtoLP(1);
>-			tempRect.height -= MapModeUtil.getMapMode(figure).DPtoLP(1);
>-		}
>-		int shrinkWidth = MapModeUtil.getMapMode(figure).DPtoLP( getWidth() / 2 );
>-		tempRect.shrink(shrinkWidth, shrinkWidth);
>+		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);
> 
>-		graphics.setLineWidth(getWidth());
>+		graphics.setLineWidth(lpWidth);
>+		graphics.setLineStyle(getStyle());
> 		if (getColor() != null)
> 			graphics.setForegroundColor(getColor());
> 
>#P org.eclipse.gmf.runtime.diagram.ui.geoshapes
>Index: src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeLineStyleBorder.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeLineStyleBorder.java,v
>retrieving revision 1.1
>diff -u -r1.1 GeoShapeLineStyleBorder.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeLineStyleBorder.java	3 May 2008 20:56:26 -0000	1.1
>+++ src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/draw2d/figures/GeoShapeLineStyleBorder.java	11 Dec 2008 22:03:03 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2004 IBM Corporation and others.
>+ * 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
>@@ -18,15 +18,13 @@
> import org.eclipse.draw2d.geometry.Rectangle;
> 
> /**
>- * Extends {@link org.eclipse.draw2d.LineBorder} to support line style.
>+ * 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.
> 	 * 
>@@ -36,25 +34,6 @@
> 		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)
>Index: src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.geoshapes/src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java,v
>retrieving revision 1.6
>diff -u -r1.6 ShadowRectangleEditPart.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java	10 Dec 2008 21:50:44 -0000	1.6
>+++ src/org/eclipse/gmf/runtime/diagram/ui/geoshapes/internal/editparts/ShadowRectangleEditPart.java	11 Dec 2008 22:03:03 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2003, 2005 IBM Corporation and others.
>+ * Copyright (c) 2003, 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
>@@ -57,5 +57,13 @@
> 		((RectangularDropShadowLineBorder)getFigure().getBorder()).setWidth(getMapMode().DPtoLP(width));
> 		getFigure().revalidate();
> 	}
>+	
>+	/**
>+	 * @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);
>+	}	
> 
> }

Flags:

ahunter.eclipse: iplog+

Actions: View | Diff

Attachments on bug 255553: 118081 | 120259