Fixes #250 now the initial positions are fine to show the hierarchy

uqbar-project · Sep 23, 2015 · a9c4597 · a9c4597
1 parent 230a14b
commit a9c4597
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/...ollok.ui.diagrams/src/org/uqbar/project/wollok/ui/diagrams/classes/ClassDiagramView.xtend b/...ollok.ui.diagrams/src/org/uqbar/project/wollok/ui/diagrams/classes/ClassDiagramView.xtend
@@ -174,12 +174,10 @@ class ClassDiagramView extends ViewPart implements ISelectionListener, ISourceVi
 		val graph = new DirectedGraph
 		graph.direction = PositionConstants.NORTH
 
-		val classEditParts = getClassEditParts()
-
 		val classToNodeMapping = classEditParts.fold(newHashMap)[map, e | 
 			map.put(e.model as ClassModel, new Node(e.model) => [
-				width = 100 //e.figure.bounds.width
-				height = 100 //e.figure.bounds.height
+				width = e.figure.preferredSize.width
+				height = e.figure.preferredSize.height
 			])
 			map
 		]
@@ -196,7 +194,7 @@ class ClassDiagramView extends ViewPart implements ISelectionListener, ISourceVi
 		])
 		graph.edges.addAll(relations)
 
-		//layout
+		// layout
 		val directedGraphLayout = new DirectedGraphLayout
 		directedGraphLayout.visit(graph)
 

diff --git a/...iagrams/src/org/uqbar/project/wollok/ui/diagrams/classes/parts/ClassDiagramEditPart.xtend b/...iagrams/src/org/uqbar/project/wollok/ui/diagrams/classes/parts/ClassDiagramEditPart.xtend
@@ -6,7 +6,6 @@ import org.eclipse.draw2d.ConnectionLayer
 import org.eclipse.draw2d.FreeformLayer
 import org.eclipse.draw2d.FreeformLayout
 import org.eclipse.draw2d.MarginBorder
-import org.eclipse.draw2d.ShortestPathConnectionRouter
 import org.eclipse.draw2d.geometry.Rectangle
 import org.eclipse.gef.EditPart
 import org.eclipse.gef.EditPolicy
@@ -16,11 +15,10 @@ import org.eclipse.gef.editpolicies.RootComponentEditPolicy
 import org.eclipse.gef.editpolicies.XYLayoutEditPolicy
 import org.eclipse.gef.requests.ChangeBoundsRequest
 import org.eclipse.gef.requests.CreateRequest
+import org.uqbar.project.gef.SquareConnectionRouter
 import org.uqbar.project.wollok.ui.diagrams.classes.model.ClassDiagram
 import org.uqbar.project.wollok.ui.diagrams.classes.model.Shape
 import org.uqbar.project.wollok.ui.diagrams.classes.model.commands.MoveOrResizeCommand
-import org.eclipse.draw2d.ManhattanConnectionRouter
-import org.uqbar.project.gef.SquareConnectionRouter
 
 /**
  * @author jfernandes

diff --git a/...rc/org/uqbar/project/wollok/ui/diagrams/classes/parts/InheritanceConnectionEditPart.xtend b/...rc/org/uqbar/project/wollok/ui/diagrams/classes/parts/InheritanceConnectionEditPart.xtend
@@ -15,10 +15,4 @@ class InheritanceConnectionEditPart extends ConnectionEditPart {
 		]
 	}
 
-//	override createFigure() {
-//		super.createFigure() as PolylineConnection => [
-//			connectionRouter = new SquareConnectionRouter
-//		]
-//	}
-
 }
diff --git a/...k.ui.diagrams/src/org/uqbar/project/wollok/ui/diagrams/editparts/ConnectionEditPart.xtend b/...k.ui.diagrams/src/org/uqbar/project/wollok/ui/diagrams/editparts/ConnectionEditPart.xtend
@@ -18,7 +18,7 @@ abstract class ConnectionEditPart extends AbstractConnectionEditPart implements
 
 	override activate() {
 		if (!active) {
-			super.activate;
+			super.activate
 			castedModel.addPropertyChangeListener(this)
 		}
 	}
@@ -41,7 +41,7 @@ abstract class ConnectionEditPart extends AbstractConnectionEditPart implements
 
 	override deactivate() {
 		if (active) {
-			super.deactivate;
+			super.deactivate
 			castedModel.removePropertyChangeListener(this)
 		}
 	}