Attachment 105132 Details for Bug 224116 – org.eclipse.zest.core

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

[patch] org.eclipse.zest.core

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

on 2008-06-17 01:25:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Bull

Created: 2008-06-17 01:25:35 EDT

Size: 7.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.zest.core
>Index: src/org/eclipse/zest/core/widgets/GraphNode.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/GraphNode.java,v
>retrieving revision 1.34
>diff -u -r1.34 GraphNode.java
>--- src/org/eclipse/zest/core/widgets/GraphNode.java	12 Jan 2008 01:47:49 -0000	1.34
>+++ src/org/eclipse/zest/core/widgets/GraphNode.java	17 Jun 2008 05:24:54 -0000
>@@ -21,22 +21,24 @@
> import org.eclipse.draw2d.geometry.Point;
> import org.eclipse.draw2d.geometry.PrecisionPoint;
> import org.eclipse.draw2d.geometry.Rectangle;
>-import org.eclipse.zest.core.widgets.internal.GraphLabel;
>-import org.eclipse.zest.layouts.LayoutEntity;
>-import org.eclipse.zest.layouts.constraints.LayoutConstraint;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.FontData;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.widgets.Display;
>+import org.eclipse.zest.core.widgets.internal.GraphLabel;
>+import org.eclipse.zest.layouts.LayoutEntity;
>+import org.eclipse.zest.layouts.constraints.LayoutConstraint;
> 
>-/**
>+/*
>  * Simple node class which has the following properties: color, size, location,
>  * and a label. It also has a list of connections and anchors.
>  * 
>  * @author Chris Callendar
>+ * 
>  * @author Del Myers
>+ * 
>  * @author Ian Bull
>  */
> public class GraphNode extends GraphItem {
>@@ -421,7 +423,6 @@
> 		if (highlighted == HIGHLIGHT_ON) {
> 			return;
> 		}
>-		highlighted = HIGHLIGHT_ON;
> 		// @tag ADJACENT : Removed highlight adjacent
> 		/*
> 		if (ZestStyles.checkStyle(getNodeStyle(), ZestStyles.NODES_HIGHLIGHT_ADJACENT)) {
>@@ -437,12 +438,13 @@
> 			}
> 		}
> 		*/
>-		updateFigureForModel(getNodeFigure());
> 		if (parent.getItemType() == GraphItem.CONTAINER) {
> 			((GraphContainer) parent).highlightNode(this);
> 		} else {
> 			((Graph) parent).highlightNode(this);
> 		}
>+		highlighted = HIGHLIGHT_ON;
>+		updateFigureForModel(getNodeFigure());
> 	}
> 
> 	/**
>@@ -455,7 +457,6 @@
> 		if (highlighted == HIGHLIGHT_NONE) {
> 			return;
> 		}
>-		highlighted = HIGHLIGHT_NONE;
> 		// @tag ADJACENT : Removed highlight adjacent
> 		/*
> 		if (!highlightedAdjacently) {
>@@ -485,6 +486,7 @@
> 		} else {
> 			((Graph) parent).unhighlightNode(this);
> 		}
>+		highlighted = HIGHLIGHT_NONE;
> 		updateFigureForModel(nodeFigure);
> 
> 	}
>Index: src/org/eclipse/zest/core/widgets/Graph.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/Graph.java,v
>retrieving revision 1.36
>diff -u -r1.36 Graph.java
>--- src/org/eclipse/zest/core/widgets/Graph.java	12 Sep 2007 20:44:39 -0000	1.36
>+++ src/org/eclipse/zest/core/widgets/Graph.java	17 Jun 2008 05:24:54 -0000
>@@ -32,15 +32,6 @@
> import org.eclipse.draw2d.geometry.Dimension;
> import org.eclipse.draw2d.geometry.Point;
> import org.eclipse.draw2d.geometry.Rectangle;
>-import org.eclipse.zest.core.widgets.internal.RevealListener;
>-import org.eclipse.zest.core.widgets.internal.ZestRootLayer;
>-import org.eclipse.zest.layouts.InvalidLayoutConfiguration;
>-import org.eclipse.zest.layouts.LayoutAlgorithm;
>-import org.eclipse.zest.layouts.LayoutEntity;
>-import org.eclipse.zest.layouts.LayoutRelationship;
>-import org.eclipse.zest.layouts.LayoutStyles;
>-import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
>-import org.eclipse.zest.layouts.constraints.LayoutConstraint;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.PaintEvent;
> import org.eclipse.swt.events.PaintListener;
>@@ -53,11 +44,21 @@
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Event;
> import org.eclipse.swt.widgets.Item;
>+import org.eclipse.zest.core.widgets.internal.RevealListener;
>+import org.eclipse.zest.core.widgets.internal.ZestRootLayer;
>+import org.eclipse.zest.layouts.InvalidLayoutConfiguration;
>+import org.eclipse.zest.layouts.LayoutAlgorithm;
>+import org.eclipse.zest.layouts.LayoutEntity;
>+import org.eclipse.zest.layouts.LayoutRelationship;
>+import org.eclipse.zest.layouts.LayoutStyles;
>+import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
>+import org.eclipse.zest.layouts.constraints.LayoutConstraint;
> 
>-/**
>+/*
>  * Holds the nodes and connections for the graph.
>  * 
>  * @author Chris Callendar
>+ * 
>  * @author Ian Bull
>  */
> public class Graph extends FigureCanvas implements IContainer {
>@@ -726,7 +727,7 @@
> 	 */
> 	void highlightEdge(GraphConnection connection) {
> 		IFigure figure = connection.getConnectionFigure();
>-		if (figure != null) {
>+		if (figure != null && !connection.isHighlighted()) {
> 			zestRootLayer.highlightConnection(figure);
> 		}
> 	}
>@@ -738,7 +739,7 @@
> 	 */
> 	void unhighlightEdge(GraphConnection connection) {
> 		IFigure figure = connection.getConnectionFigure();
>-		if (figure != null) {
>+		if (figure != null && connection.isHighlighted()) {
> 			zestRootLayer.unHighlightConnection(figure);
> 		}
> 	}
>@@ -750,7 +751,7 @@
> 	 */
> 	void highlightNode(GraphNode node) {
> 		IFigure figure = node.getNodeFigure();
>-		if (figure != null) {
>+		if (figure != null && !node.isHighlighted()) {
> 			zestRootLayer.highlightNode(figure);
> 		}
> 	}
>@@ -762,7 +763,7 @@
> 	 */
> 	void highlightNode(GraphContainer node) {
> 		IFigure figure = node.getNodeFigure();
>-		if (figure != null) {
>+		if (figure != null && !node.isHighlighted()) {
> 			zestRootLayer.highlightNode(figure);
> 		}
> 	}
>@@ -774,7 +775,7 @@
> 	 */
> 	void unhighlightNode(GraphContainer node) {
> 		IFigure figure = node.getNodeFigure();
>-		if (figure != null) {
>+		if (figure != null && node.isHighlighted()) {
> 			zestRootLayer.unHighlightNode(figure);
> 		}
> 	}
>@@ -786,7 +787,7 @@
> 	 */
> 	void unhighlightNode(GraphNode node) {
> 		IFigure figure = node.getNodeFigure();
>-		if (figure != null) {
>+		if (figure != null && node.isHighlighted()) {
> 			zestRootLayer.unHighlightNode(figure);
> 		}
> 	}
>Index: src/org/eclipse/zest/core/widgets/internal/ZestRootLayer.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.zest.core/src/org/eclipse/zest/core/widgets/internal/ZestRootLayer.java,v
>retrieving revision 1.5
>diff -u -r1.5 ZestRootLayer.java
>--- src/org/eclipse/zest/core/widgets/internal/ZestRootLayer.java	12 Sep 2007 20:44:39 -0000	1.5
>+++ src/org/eclipse/zest/core/widgets/internal/ZestRootLayer.java	17 Jun 2008 05:24:54 -0000
>@@ -12,15 +12,12 @@
> import org.eclipse.draw2d.FreeformLayer;
> import org.eclipse.draw2d.IFigure;
> 
>-/**
>- * The root figure for Zest.  The figure is broken up into four segments, 
>- * 1. The Connections
>- * 2. The Nodes
>- * 3. The Highlighted Connections
>- * 4. The Highlighted Nodes
>+/*
>+ * The root figure for Zest. The figure is broken up into four segments, 1. The
>+ * Connections 2. The Nodes 3. The Highlighted Connections 4. The Highlighted
>+ * Nodes
>  * 
>  * @author Ian Bull
>- * 
>  */
> public class ZestRootLayer extends FreeformLayer {
> 
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.zest.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.24
>diff -u -r1.24 MANIFEST.MF
>--- META-INF/MANIFEST.MF	14 Dec 2007 15:16:57 -0000	1.24
>+++ META-INF/MANIFEST.MF	17 Jun 2008 05:24:54 -0000
>@@ -11,7 +11,9 @@
> Eclipse-LazyStart: false
> Export-Package: org.eclipse.zest.core.messages,
>  org.eclipse.zest.core.viewers,
>- org.eclipse.zest.core.widgets
>+ org.eclipse.zest.core.viewers.internal,
>+ org.eclipse.zest.core.widgets,
>+ org.eclipse.zest.core.widgets.internal
> Import-Package: com.ibm.icu.text
> Bundle-RequiredExecutionEnvironment: J2SE-1.4
> Bundle-ClassPath: .

Actions: View | Diff

Attachments on bug 224116: 93610 | 105132 | 105133