Attachment 162004 Details for Bug 278585 – updated patch

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

updated patch

clipboard.txt (text/plain), 1.37 KB, created by Ian Bull

on 2010-03-15 00:59:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Bull

Created: 2010-03-15 00:59:00 EDT

Size: 1.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.zest.core
>Index: src/org/eclipse/zest/core/viewers/internal/AbstractStylingModelFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.zest.core/src/org/eclipse/zest/core/viewers/internal/AbstractStylingModelFactory.java,v
>retrieving revision 1.13
>diff -u -r1.13 AbstractStylingModelFactory.java
>--- src/org/eclipse/zest/core/viewers/internal/AbstractStylingModelFactory.java	24 Jul 2009 19:13:37 -0000	1.13
>+++ src/org/eclipse/zest/core/viewers/internal/AbstractStylingModelFactory.java	15 Mar 2010 04:58:23 -0000
>@@ -178,11 +178,23 @@
> 				return oldConnection;
> 			}
> 		}
>+		IFigureProvider figureProvider = null;
>+		if (getLabelProvider() instanceof IFigureProvider) {
>+			figureProvider = (IFigureProvider) getLabelProvider();
>+		}
> 		if (sn == null) {
>-			sn = createNode(graph, source);
>+			if (figureProvider != null) {
>+				sn = createNode(graph, source, figureProvider.getFigure(source));
>+			} else {
>+				sn = createNode(graph, source);
>+			}
> 		}
> 		if (dn == null) {
>-			dn = createNode(graph, dest);
>+			if (figureProvider != null) {
>+				dn = createNode(graph, dest, figureProvider.getFigure(dest));
>+			} else {
>+				dn = createNode(graph, dest);
>+			}
> 		}
> 		GraphConnection c = viewer.addGraphModelConnection(element, sn, dn);
> 		styleItem(c);

Actions: View

Attachments on bug 278585: 137812 | 162004