From db21597e8d7c8c22c8cd2c8adb306d7d4807efd3 Mon Sep 17 00:00:00 2001 From: Laurent Wouters Date: Thu, 27 Feb 2014 08:30:37 +0100 Subject: 425584: Fixed issue with 0-length dashes https://bugs.eclipse.org/bugs/show_bug.cgi?id=425584 Signed-off-by: Laurent Wouters --- .../infra/gmfdiag/common/editpart/ConnectionEditPart.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java index b9b684d1143..4b51871b97b 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java @@ -44,6 +44,16 @@ public abstract class ConnectionEditPart extends ConnectionNodeEditPart implemen */ protected static final String LINE_DASH_GAP = "lineDashGap"; + /** + * Minimum length of dashes for dashed connectors + */ + protected static final int LINE_DASH_MIN_LENGTH = 2; + + /** + * Minimum length of the gapas between dashes + */ + protected static final int LINE_GAP_MIN_LENGTH = 2; + public ConnectionEditPart(View view) { super(view); } @@ -63,7 +73,7 @@ public abstract class ConnectionEditPart extends ConnectionNodeEditPart implemen int lineDashLength = extract((IntValueStyle)connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_LENGTH)); int lineDashGap = extract((IntValueStyle)connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_GAP)); if(lineStyle != null) { - setupLineStyle(edge, lineStyle, connector.getLineWidth(), lineDashLength, lineDashGap); + setupLineStyle(edge, lineStyle, connector.getLineWidth(), lineDashLength < LINE_DASH_MIN_LENGTH ? LINE_DASH_MIN_LENGTH : lineDashLength, lineDashGap < LINE_GAP_MIN_LENGTH ? LINE_GAP_MIN_LENGTH : lineDashGap); } else { edge.resetStyle(); } -- cgit v1.2.3