diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/CanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/CanvasItem.cs
index 56114d7981..947c754b1a 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/CanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/CanvasItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.Designer.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.Designer.cs
index f19faecf21..9da4fa6c39 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.Designer.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.Designer.cs
@@ -1,10 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
-
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 23/09/2006
+ * Time: 14:15
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
namespace ClassDiagram
{
partial class ClassCanvas : System.Windows.Forms.UserControl
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cd b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cd
index 26789f318c..5577b74c78 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cd
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cd
@@ -1,171 +1,169 @@
-
+
-
+
-
-
+
+
-
-
-
-
+
-
-
-
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
+
-
+
+
-
+
-
-
-
-
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
-
-
+
-
+
+
+
+
-
+
+
-
+
+
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
-
-
+
-
+
-
-
+
+
+
+
+
-
-
+
-
+
+
+
+
-
-
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cs
index 2e2f7e5c3b..fc68587633 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvas.cs
@@ -75,6 +75,8 @@ namespace ClassDiagram
LinkedListNode hoverItemNode;
LinkedList itemsList = new LinkedList();
Dictionary itemsData = new Dictionary();
+ Dictionary classesToData = new Dictionary();
+
DiagramRouter diagramRouter = new DiagramRouter();
float zoom = 1.0f;
@@ -381,9 +383,14 @@ namespace ClassDiagram
public void AddCanvasItem (CanvasItem item)
{
+ diagramRouter.AddItem(item);
+ CanvasItemData itemData = new CanvasItemData(item, SizeGripMouseEntered, SizeGripMouseLeft);
+ itemsData[item] = itemData;
+
ClassCanvasItem classItem = item as ClassCanvasItem;
if (classItem != null)
{
+ classesToData.Add(classItem.RepresentedClassType, itemData);
foreach (CanvasItemData ci in itemsList)
{
ClassCanvasItem cci = ci.Item as ClassCanvasItem;
@@ -401,10 +408,6 @@ namespace ClassDiagram
}
}
- diagramRouter.AddItem(item);
- CanvasItemData itemData = new CanvasItemData(item, SizeGripMouseEntered, SizeGripMouseLeft);
- itemsData[item] = itemData;
-
itemsList.AddLast(itemData);
item.RedrawNeeded += HandleRedraw;
item.LayoutChanged += HandleItemLayoutChange;
@@ -426,6 +429,12 @@ namespace ClassDiagram
diagramRouter.RemoveRoute(r);
diagramRouter.RemoveItem (item);
+
+ ClassCanvasItem classItem = item as ClassCanvasItem;
+ if (classItem != null)
+ {
+ classesToData.Remove (classItem.RepresentedClassType);
+ }
LayoutChanged(this, EventArgs.Empty);
}
@@ -444,14 +453,16 @@ namespace ClassDiagram
public bool Contains (IClass ct)
{
- foreach (CanvasItemData ci in itemsList)
+ return classesToData.ContainsKey(ct);
+ /*
+ foreach (CanvasItemData ci in itemsList)
{
ClassCanvasItem cci = ci.Item as ClassCanvasItem;
if (cci != null)
if (cci.RepresentedClassType.Equals(ct)) return true;
- }
+ }*/
- return false;
+ //return false;
}
public void AutoArrange ()
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvasItem.cs
index 0edfeb41e2..ee70e30e2c 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/ClassCanvasItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/DelegateCanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/DelegateCanvasItem.cs
index 5bd7420240..b7685d1452 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/DelegateCanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/DelegateCanvasItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/EnumCanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/EnumCanvasItem.cs
index 0dc8879648..36c328be95 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/EnumCanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/EnumCanvasItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IHitTestable.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IHitTestable.cs
index dc0227c413..8bd315427f 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IHitTestable.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IHitTestable.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IInteractiveDrawable.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IInteractiveDrawable.cs
index b4fdc9edd1..88d321a641 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IInteractiveDrawable.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IInteractiveDrawable.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IMouseInteractable.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IMouseInteractable.cs
index 62df3ea4e7..fac2932c04 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IMouseInteractable.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/IMouseInteractable.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InteractiveHeaderedItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InteractiveHeaderedItem.cs
index 2a70f2310c..da78b85e13 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InteractiveHeaderedItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InteractiveHeaderedItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InterfaceCanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InterfaceCanvasItem.cs
index 66dc7dc3f8..c1c57c26b1 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InterfaceCanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/InterfaceCanvasItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/NoteCanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/NoteCanvasItem.cs
index 186d8949b6..678847c3a0 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/NoteCanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/NoteCanvasItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/RectangleDecorator.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/RectangleDecorator.cs
index d040c885a9..7e34406b84 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/RectangleDecorator.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/RectangleDecorator.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;
diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/StructCanvasItem.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/StructCanvasItem.cs
index e1757601d9..06f8ca4551 100644
--- a/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/StructCanvasItem.cs
+++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassCanvas/StructCanvasItem.cs
@@ -1,9 +1,11 @@
-//
-//
-//
-//
-// $Revision$
-//
+/*
+ * Created by SharpDevelop.
+ * User: itai
+ * Date: 28/09/2006
+ * Time: 19:03
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
using System;
using System.Collections.Generic;