Attachment #90514 for bug #220029

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

View | Details | Raw Unified | Return to bug 220029
Collapse All | Expand All

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/graph/ConvertCompoundGraph.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2005 IBM Corporation and others.	2	* Copyright (c) 2003, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 118-124 Link Here
118	}	118	}
119	}	119	}
120		120
121	void revisit(DirectedGraph g) {	121	public void revisit(DirectedGraph g) {
122	for (int i = 0; i < g.edges.size(); i++) {	122	for (int i = 0; i < g.edges.size(); i++) {
123	Edge e = g.edges.getEdge(i);	123	Edge e = g.edges.getEdge(i);
124	if (e.source instanceof SubgraphBoundary) {	124	if (e.source instanceof SubgraphBoundary) {




/*******************************************************************************
 * 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

/**
 * Performs some action on a Graph.
 * @author Randy Hudson
 * @since 3.4
 */
public abstract class GraphVisitor {

/**
 * Act on the given directed graph.
 * @param g the graph
 * @since 3.4
 */
public void visit(DirectedGraph g) { }

/**
 * Called in reverse order of visit.
 * @since 3.1
 * @param g the graph to act upon
 * @since 3.4
 */
public void revisit(DirectedGraph g) { }

}

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/graph/VerticalPlacement.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2005 IBM Corporation and others.	2	* Copyright (c) 2003, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 20-26 Link Here
20	*/	20	*/
21	class VerticalPlacement extends GraphVisitor {	21	class VerticalPlacement extends GraphVisitor {
22		22
23	void visit(DirectedGraph g) {	23	public void visit(DirectedGraph g) {
24	Insets pad;	24	Insets pad;
25	int currentY = g.getMargin().top;	25	int currentY = g.getMargin().top;
26	int row, rowHeight;	26	int row, rowHeight;

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/graph/TransposeMetrics.java (-1 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005 IBM Corporation and others.	2	* Copyright (c) 2005, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 65-70 Link Here
65	temp = vnode.y;	65	temp = vnode.y;
66	vnode.y = vnode.x;	66	vnode.y = vnode.x;
67	vnode.x = temp;	67	vnode.x = temp;
		68	temp = vnode.width;
		69	vnode.width = vnode.height;
		70	vnode.height = temp;
68	}	71	}
69	}	72	}
70	g.size.transpose();	73	g.size.transpose();

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/graph/Edge.java (-2 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2005 IBM Corporation and others.	2	* Copyright (c) 2003, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 322-328 Link Here
322	this.padding = padding;	322	this.padding = padding;
323	}	323	}
324		324
325	void setPoints(PointList points) {	325	/**
		326	* Sets the points for the edge
		327	* @param points the points
		328	* @since 3.4
		329	*/
		330	public void setPoints(PointList points) {
326	this.points = points;	331	this.points = points;
327	start = points.getFirstPoint();	332	start = points.getFirstPoint();
328	end = points.getLastPoint();	333	end = points.getLastPoint();

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/graph/CompoundVerticalPlacement.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2005 IBM Corporation and others.	2	* Copyright (c) 2003, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 22-28 Link Here
22	* @see GraphVisitor#visit(DirectedGraph)	22	* @see GraphVisitor#visit(DirectedGraph)
23	* Extended to set subgraph values.	23	* Extended to set subgraph values.
24	*/	24	*/
25	void visit(DirectedGraph dg) {	25	public void visit(DirectedGraph dg) {
26	CompoundDirectedGraph g = (CompoundDirectedGraph)dg;	26	CompoundDirectedGraph g = (CompoundDirectedGraph)dg;
27	super.visit(g);	27	super.visit(g);
28	for (int i = 0; i < g.subgraphs.size(); i++) {	28	for (int i = 0; i < g.subgraphs.size(); i++) {

Lines 376-379 Link Here

(-)src/org/eclipse/draw2d/geometry/PrecisionRectangle.java (+9 lines)
376	return preciseHeight;	376	return preciseHeight;
377	}	377	}
378		378
		379	/**
		380	* @see org.eclipse.draw2d.geometry.Rectangle#setSize(org.eclipse.draw2d.geometry.Dimension)
		381	*/
		382	public Rectangle setSize(Dimension d) {
		383	preciseWidth = d.preciseWidth();
		384	preciseHeight = d.preciseHeight();
		385	return super.setSize(d);
		386	}
		387
379	}	388	}

Return to bug 220029

Lines 1-5 Link Here

(-)src/org/eclipse/draw2d/graph/GraphVisitor.java (-6 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2005 IBM Corporation and others.	2	* Copyright (c) 2003, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 13-33 Link Here
13	/**	13	/**
14	* Performs some action on a Graph.	14	* Performs some action on a Graph.
15	* @author Randy Hudson	15	* @author Randy Hudson
16	* @since 2.1.2	16	* @since 3.4
17	*/	17	*/
18	abstract class GraphVisitor {	18	public abstract class GraphVisitor {
19		19
20	/**	20	/**
21	* Act on the given directed graph.	21	* Act on the given directed graph.
22	* @param g the graph	22	* @param g the graph
		23	* @since 3.4
23	*/	24	*/
24	void visit(DirectedGraph g) { }	25	public void visit(DirectedGraph g) { }
25		26
26	/**	27	/**
27	* Called in reverse order of visit.	28	* Called in reverse order of visit.
28	* @since 3.1
29	* @param g the graph to act upon	29	* @param g the graph to act upon
		30	* @since 3.4
30	*/	31	*/
31	void revisit(DirectedGraph g) { }	32	public void revisit(DirectedGraph g) { }
32		33
33	}	34	}