Attachment 90514 Details for Bug 220029 – public GraphVisitor and Edge#setPoints()

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

[patch] public GraphVisitor and Edge#setPoints()

Draw2D_patch (text/plain), 7.97 KB, created by Alex Boyko

on 2008-02-22 15:47:33 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Boyko

Created: 2008-02-22 15:47:33 EST

Size: 7.97 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.draw2d
>Index: src/org/eclipse/draw2d/graph/ConvertCompoundGraph.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/graph/ConvertCompoundGraph.java,v
>retrieving revision 1.1
>diff -u -r1.1 ConvertCompoundGraph.java
>--- src/org/eclipse/draw2d/graph/ConvertCompoundGraph.java	14 Feb 2006 20:19:44 -0000	1.1
>+++ src/org/eclipse/draw2d/graph/ConvertCompoundGraph.java	22 Feb 2008 20:13:46 -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
>@@ -118,7 +118,7 @@
> 	}
> }
> 
>-void revisit(DirectedGraph g) {
>+public void revisit(DirectedGraph g) {
> 	for (int i = 0; i < g.edges.size(); i++) {
> 		Edge e = g.edges.getEdge(i);
> 		if (e.source instanceof SubgraphBoundary) {
>Index: src/org/eclipse/draw2d/graph/GraphVisitor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/graph/GraphVisitor.java,v
>retrieving revision 1.1
>diff -u -r1.1 GraphVisitor.java
>--- src/org/eclipse/draw2d/graph/GraphVisitor.java	14 Feb 2006 20:19:44 -0000	1.1
>+++ src/org/eclipse/draw2d/graph/GraphVisitor.java	22 Feb 2008 20:13:46 -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
>@@ -13,21 +13,22 @@
> /**
>  * Performs some action on a Graph.
>  * @author Randy Hudson
>- * @since 2.1.2
>+ * @since 3.4
>  */
>-abstract class GraphVisitor {
>+public abstract class GraphVisitor {
> 
> /**
>  * Act on the given directed graph.
>  * @param g the graph
>+ * @since 3.4
>  */
>-void visit(DirectedGraph g) { }
>+public void visit(DirectedGraph g) { }
> 
> /**
>  * Called in reverse order of visit.
>- * @since 3.1
>  * @param g the graph to act upon
>+ * @since 3.4
>  */
>-void revisit(DirectedGraph g) { }
>+public void revisit(DirectedGraph g) { }
> 
> }
>Index: src/org/eclipse/draw2d/graph/VerticalPlacement.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/graph/VerticalPlacement.java,v
>retrieving revision 1.1
>diff -u -r1.1 VerticalPlacement.java
>--- src/org/eclipse/draw2d/graph/VerticalPlacement.java	14 Feb 2006 20:19:44 -0000	1.1
>+++ src/org/eclipse/draw2d/graph/VerticalPlacement.java	22 Feb 2008 20:13:46 -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
>@@ -20,7 +20,7 @@
>  */
> class VerticalPlacement extends GraphVisitor {
> 
>-void visit(DirectedGraph g) {
>+public void visit(DirectedGraph g) {
> 	Insets pad;
> 	int currentY = g.getMargin().top;
> 	int row, rowHeight;
>Index: src/org/eclipse/draw2d/graph/TransposeMetrics.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/graph/TransposeMetrics.java,v
>retrieving revision 1.1
>diff -u -r1.1 TransposeMetrics.java
>--- src/org/eclipse/draw2d/graph/TransposeMetrics.java	14 Feb 2006 20:19:44 -0000	1.1
>+++ src/org/eclipse/draw2d/graph/TransposeMetrics.java	22 Feb 2008 20:13:46 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005 IBM Corporation and others.
>+ * Copyright (c) 2005, 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
>@@ -65,6 +65,9 @@
> 			temp = vnode.y;
> 			vnode.y = vnode.x;
> 			vnode.x = temp;
>+			temp = vnode.width;
>+			vnode.width = vnode.height;
>+			vnode.height = temp;
> 		}
> 	}
> 	g.size.transpose();
>Index: src/org/eclipse/draw2d/graph/Edge.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/graph/Edge.java,v
>retrieving revision 1.13
>diff -u -r1.13 Edge.java
>--- src/org/eclipse/draw2d/graph/Edge.java	24 Feb 2006 17:16:19 -0000	1.13
>+++ src/org/eclipse/draw2d/graph/Edge.java	22 Feb 2008 20:13:46 -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
>@@ -322,7 +322,12 @@
> 	this.padding = padding;
> }
> 
>-void setPoints(PointList points) {
>+/**
>+ * Sets the points for the edge
>+ * @param points the points
>+ * @since 3.4
>+ */
>+public void setPoints(PointList points) {
> 	this.points = points;
> 	start = points.getFirstPoint();
> 	end = points.getLastPoint();
>Index: src/org/eclipse/draw2d/graph/CompoundVerticalPlacement.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/graph/CompoundVerticalPlacement.java,v
>retrieving revision 1.1
>diff -u -r1.1 CompoundVerticalPlacement.java
>--- src/org/eclipse/draw2d/graph/CompoundVerticalPlacement.java	14 Feb 2006 20:19:44 -0000	1.1
>+++ src/org/eclipse/draw2d/graph/CompoundVerticalPlacement.java	22 Feb 2008 20:13:46 -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
>@@ -22,7 +22,7 @@
>  * @see GraphVisitor#visit(DirectedGraph)
>  * Extended to set subgraph values.
>  */
>-void visit(DirectedGraph dg) {
>+public void visit(DirectedGraph dg) {
> 	CompoundDirectedGraph g = (CompoundDirectedGraph)dg;
> 	super.visit(g);
> 	for (int i = 0; i < g.subgraphs.size(); i++) {
>Index: src/org/eclipse/draw2d/geometry/PrecisionRectangle.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/geometry/PrecisionRectangle.java,v
>retrieving revision 1.18
>diff -u -r1.18 PrecisionRectangle.java
>--- src/org/eclipse/draw2d/geometry/PrecisionRectangle.java	2 Jan 2008 18:51:55 -0000	1.18
>+++ src/org/eclipse/draw2d/geometry/PrecisionRectangle.java	22 Feb 2008 20:13:46 -0000
>@@ -376,4 +376,13 @@
> 	return preciseHeight;
> }
> 
>+/**
>+ * @see org.eclipse.draw2d.geometry.Rectangle#setSize(org.eclipse.draw2d.geometry.Dimension)
>+ */
>+public Rectangle setSize(Dimension d) {
>+	preciseWidth = d.preciseWidth();
>+	preciseHeight = d.preciseHeight();
>+	return super.setSize(d);
>+}
>+
> }

Flags:

aboyko: review?

Actions: View | Diff

Attachments on bug 220029: 90514