From 2ab5a340ad90bab3b02a3330380bf26ea9568cab Mon Sep 17 00:00:00 2001 From: Itar Bar-Haim Date: Sat, 30 Dec 2006 20:51:18 +0000 Subject: [PATCH] Match to the newest version. Mainly includes refactoring and bug fixes. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2232 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../ClassDiagramAddin/ClassDiagramAddin.cd | 63 +++++++++++-------- .../Src/ClassDiagramAddItemCommands.cs | 15 ++--- .../Src/ClassDiagramCommand.cs | 15 ++--- .../Src/ClassDiagramDisplayBinding.cs | 15 ++--- .../Src/ClassDiagramViewContent.cs | 16 ++--- .../ClassDiagramAddin/Src/ClassEditorPad.cs | 14 +++-- .../Src/SaveToBitmapCommand.cs | 15 ++--- .../Src/ShowClassDiagramCommand.cs | 20 +++--- 8 files changed, 95 insertions(+), 78 deletions(-) diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.cd b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.cd index 26c35c816c..8fe9f5a41b 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.cd +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.cd @@ -1,63 +1,72 @@  - - + - - - + - - + - + - + - - - - + - + + + - + - + - + - - + - - + - + - + - - + + - + + + - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramAddItemCommands.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramAddItemCommands.cs index ed3d6f51ef..582489877b 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramAddItemCommands.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramAddItemCommands.cs @@ -1,10 +1,11 @@ -// -// -// -// -// $Revision$ -// - +/* + * Created by SharpDevelop. + * User: itai + * Date: 23/09/2006 + * Time: 12:18 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ using System; using System.Windows.Forms; diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs index f2e7c05a79..e2d673c8f0 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs @@ -1,10 +1,11 @@ -// -// -// -// -// $Revision$ -// - +/* + * Created by SharpDevelop. + * User: itai + * Date: 23/09/2006 + * Time: 12:18 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ using System; using System.Windows.Forms; using System.Globalization; diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramDisplayBinding.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramDisplayBinding.cs index f40c96ea11..4044ccd4a4 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramDisplayBinding.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramDisplayBinding.cs @@ -1,10 +1,11 @@ -// -// -// -// -// $Revision$ -// - +/* + * Created by SharpDevelop. + * User: itai + * Date: 24/09/2006 + * Time: 22:46 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ using System; using System.Reflection; diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs index 3a81dc4664..d0af77a328 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs @@ -1,10 +1,11 @@ -// -// -// -// -// $Revision$ -// - +/* + * Created by SharpDevelop. + * User: itai + * Date: 23/09/2006 + * Time: 12:04 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ using System; using System.Collections.Generic; using System.Reflection; @@ -158,6 +159,7 @@ namespace ClassDiagramAddin public override void Dispose() { + ParserService.ParseInformationUpdated -= OnParseInformationUpdated; canvas.Dispose(); } diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs index 2cd42cd7c4..670ed81e90 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs @@ -1,9 +1,11 @@ -// -// -// -// -// $Revision$ -// +/* + * Created by SharpDevelop. + * User: itai + * Date: 12/13/2006 + * Time: 2:12 PM + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ using System; using System.Windows.Forms; diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/SaveToBitmapCommand.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/SaveToBitmapCommand.cs index 532d4be19f..332a34fdae 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/SaveToBitmapCommand.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/SaveToBitmapCommand.cs @@ -1,10 +1,11 @@ -// -// -// -// -// $Revision$ -// - +/* + * Created by SharpDevelop. + * User: itai + * Date: 23/09/2006 + * Time: 12:18 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ using System; using System.Windows.Forms; diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs index afd1f89b6e..fd3f192d87 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs @@ -1,11 +1,13 @@ -// -// -// -// -// $Revision$ -// - +/* + * Created by SharpDevelop. + * User: itai + * Date: 23/09/2006 + * Time: 12:18 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ using System; +using System.IO; using System.Windows.Forms; using ClassDiagram; @@ -23,7 +25,7 @@ namespace ClassDiagramAddin public override void Run() { IProject p = ProjectService.CurrentProject; - string filename = p.Directory+System.IO.Path.DirectorySeparatorChar+p.Name+".cd"; + string filename = Path.Combine(p.Directory, p.Name+".cd"); if (p == null) return; /*if (p.IsFileInProject(filename)) { @@ -50,8 +52,6 @@ namespace ClassDiagramAddin classcanvas.AutoArrange(); classcanvas.WriteToXml().Save(filename); FileProjectItem fpi = new FileProjectItem(p, ItemType.Content); - fpi.BuildAction = "Content"; - //fpi.BuildAction = FileProjectItem.FileBuildAction.Content; fpi.FileName = filename; ProjectService.AddProjectItem(p, fpi); ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView();