Browse Source

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
shortcuts
Itar Bar-Haim 19 years ago
parent
commit
2ab5a340ad
  1. 63
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.cd
  2. 15
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramAddItemCommands.cs
  3. 15
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs
  4. 15
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramDisplayBinding.cs
  5. 16
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs
  6. 14
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs
  7. 15
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/SaveToBitmapCommand.cs
  8. 20
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs

63
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.cd

@ -1,63 +1,72 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<ClassDiagram Zoom="1"> <ClassDiagram Zoom="1">
<ClassItem X="40" Y="230" Width="393.7436" Type="ClassDiagramAddin.ClassDiagramViewContent" Collapsed="True"> <ClassItem X="40" Y="1280" Width="210.6208" Type="ClassDiagramAddin.ShowClassDiagramCommand" Collapsed="False">
<Properties Collapsed="False" />
<Methods Collapsed="False" /> <Methods Collapsed="False" />
<Fields Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="40" Y="320" Width="325.708" Type="ClassDiagramAddin.ClassEditorPad" Collapsed="True"> <ClassItem X="40" Y="1410" Width="358.321" Type="ClassDiagramAddin.ClassDiagramDisplayBinding" Collapsed="False">
<Properties Collapsed="False" />
<Methods Collapsed="False" /> <Methods Collapsed="False" />
<Fields Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="40" Y="130" Width="189.4326" Type="ClassDiagramAddin.SaveToBitmapCommand" Collapsed="True"> <ClassItem X="300" Y="520" Width="189.2326" Type="ClassDiagramAddin.ExpandAllCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="40" Y="420" Width="193.8208" Type="ClassDiagramAddin.ShowClassDiagramCommand" Collapsed="True"> <ClassItem X="530" Y="520" Width="189.2326" Type="ClassDiagramAddin.CollapseAllCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="40" Y="510" Width="346.521" Type="ClassDiagramAddin.ClassDiagramDisplayBinding" Collapsed="True"> <ClassItem X="760" Y="520" Width="189.2326" Type="ClassDiagramAddin.MatchAllWidthsCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="40" Y="40" Width="194.7392" Type="ClassDiagramAddin.ClassDiagramAddinCommand" Collapsed="True"> <ClassItem X="990" Y="520" Width="190.3717" Type="ClassDiagramAddin.ShrinkAllWidthsCommand" Collapsed="False">
<Properties Collapsed="False" />
</ClassItem>
<ClassItem X="270" Y="130" Width="201.1308" Type="ClassDiagramAddin.AutoArrangeDiagramCommand" Collapsed="True">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="510" Y="130" Width="189.4326" Type="ClassDiagramAddin.ExpandAllCommand" Collapsed="True"> <ClassItem X="40" Y="1760" Width="299.0026" Type="ClassDiagramAddin.SetDiagramZoomCommand" Collapsed="False">
<Properties Collapsed="False" />
<Methods Collapsed="False" /> <Methods Collapsed="False" />
<Fields Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="740" Y="130" Width="189.4326" Type="ClassDiagramAddin.CollapseAllCommand" Collapsed="True"> <ClassItem X="1220" Y="520" Width="189.2326" Type="ClassDiagramAddin.AddClassCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="970" Y="130" Width="189.4326" Type="ClassDiagramAddin.MatchAllWidthsCommand" Collapsed="True"> <ClassItem X="1450" Y="520" Width="201.1139" Type="ClassDiagramAddin.AddAbstractClassCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="1200" Y="130" Width="189.4326" Type="ClassDiagramAddin.ShrinkAllWidthsCommand" Collapsed="True"> <ClassItem X="1690" Y="520" Width="189.2326" Type="ClassDiagramAddin.AddInterfaceCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="40" Y="610" Width="287.2026" Type="ClassDiagramAddin.SetDiagramZoomCommand" Collapsed="True"> <ClassItem X="1920" Y="520" Width="189.2326" Type="ClassDiagramAddin.AddDelegateCommand" Collapsed="False">
<Properties Collapsed="False" />
<Methods Collapsed="False" /> <Methods Collapsed="False" />
<Fields Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="1430" Y="130" Width="189.4326" Type="ClassDiagramAddin.AddClassCommand" Collapsed="True"> <ClassItem X="2140" Y="520" Width="189.2326" Type="ClassDiagramAddin.AddEnumCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="1660" Y="130" Width="189.4326" Type="ClassDiagramAddin.AddAbstractClassCommand" Collapsed="True"> <ClassItem X="2370" Y="520" Width="189.2326" Type="ClassDiagramAddin.AddNoteCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="1890" Y="130" Width="189.4326" Type="ClassDiagramAddin.AddInterfaceCommand" Collapsed="True"> <ClassItem X="40" Y="520" Width="217.9308" Type="ClassDiagramAddin.AutoArrangeDiagramCommand" Collapsed="False">
<Methods Collapsed="False" /> <Methods Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="2120" Y="130" Width="189.4326" Type="ClassDiagramAddin.AddDelegateCommand" Collapsed="True"> <ClassItem X="40" Y="380" Width="211.5392" Type="ClassDiagramAddin.ClassDiagramAddinCommand" Collapsed="False">
<Methods Collapsed="False" /> <Properties Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="2350" Y="130" Width="189.4326" Type="ClassDiagramAddin.AddEnumCommand" Collapsed="True"> <ClassItem X="40" Y="2830" Width="337.508" Type="ClassDiagramAddin.ClassEditorPad" Collapsed="False">
<Properties Collapsed="False" />
<Methods Collapsed="False" /> <Methods Collapsed="False" />
<Fields Collapsed="False" />
</ClassItem> </ClassItem>
<ClassItem X="2580" Y="130" Width="189.4326" Type="ClassDiagramAddin.AddNoteCommand" Collapsed="True"> <ClassItem X="40" Y="3420" Width="405.5436" Type="ClassDiagramAddin.ClassDiagramViewContent" Collapsed="False">
<Properties Collapsed="False" />
<Methods Collapsed="False" /> <Methods Collapsed="False" />
<Fields Collapsed="False" />
</ClassItem>
<ClassItem X="40" Y="3770" Width="152.4088" Type="ClassDiagramAddin.ClassDiagramData" Collapsed="False">
<Fields Collapsed="False" />
</ClassItem>
<ClassItem X="190" Y="3770" Width="150.5075" Type="ClassDiagramAddin.ClassDiagramItem" Collapsed="False">
<Fields Collapsed="False" />
</ClassItem>
<ClassItem X="360" Y="3770" Width="173.2653" Type="ClassDiagramAddin.TypedItem" Collapsed="False">
<Fields Collapsed="False" />
</ClassItem>
<ClassItem X="560" Y="3770" Width="129.9679" Type="ClassDiagramAddin.NoteItem" Collapsed="False">
<Fields Collapsed="False" />
</ClassItem> </ClassItem>
</ClassDiagram> </ClassDiagram>

15
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramAddItemCommands.cs

@ -1,10 +1,11 @@
// <file> /*
// <copyright see="prj:///doc/copyright.txt"/> * Created by SharpDevelop.
// <license see="prj:///doc/license.txt"/> * User: itai
// <owner name="Itai Bar-Haim" email=""/> * Date: 23/09/2006
// <version>$Revision$</version> * Time: 12:18
// </file> *
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;

15
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs

@ -1,10 +1,11 @@
// <file> /*
// <copyright see="prj:///doc/copyright.txt"/> * Created by SharpDevelop.
// <license see="prj:///doc/license.txt"/> * User: itai
// <owner name="Itai Bar-Haim" email=""/> * Date: 23/09/2006
// <version>$Revision$</version> * Time: 12:18
// </file> *
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;
using System.Globalization; using System.Globalization;

15
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramDisplayBinding.cs

@ -1,10 +1,11 @@
// <file> /*
// <copyright see="prj:///doc/copyright.txt"/> * Created by SharpDevelop.
// <license see="prj:///doc/license.txt"/> * User: itai
// <owner name="Itai Bar-Haim" email=""/> * Date: 24/09/2006
// <version>$Revision$</version> * Time: 22:46
// </file> *
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Reflection; using System.Reflection;

16
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs

@ -1,10 +1,11 @@
// <file> /*
// <copyright see="prj:///doc/copyright.txt"/> * Created by SharpDevelop.
// <license see="prj:///doc/license.txt"/> * User: itai
// <owner name="Itai Bar-Haim" email=""/> * Date: 23/09/2006
// <version>$Revision$</version> * Time: 12:04
// </file> *
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
@ -158,6 +159,7 @@ namespace ClassDiagramAddin
public override void Dispose() public override void Dispose()
{ {
ParserService.ParseInformationUpdated -= OnParseInformationUpdated;
canvas.Dispose(); canvas.Dispose();
} }

14
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs

@ -1,9 +1,11 @@
// <file> /*
// <copyright see="prj:///doc/copyright.txt"/> * Created by SharpDevelop.
// <license see="prj:///doc/license.txt"/> * User: itai
// <owner name="Itai Bar-Haim" email=""/> * Date: 12/13/2006
// <version>$Revision$</version> * Time: 2:12 PM
// </file> *
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;

15
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/SaveToBitmapCommand.cs

@ -1,10 +1,11 @@
// <file> /*
// <copyright see="prj:///doc/copyright.txt"/> * Created by SharpDevelop.
// <license see="prj:///doc/license.txt"/> * User: itai
// <owner name="Itai Bar-Haim" email=""/> * Date: 23/09/2006
// <version>$Revision$</version> * Time: 12:18
// </file> *
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.Windows.Forms; using System.Windows.Forms;

20
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ShowClassDiagramCommand.cs

@ -1,11 +1,13 @@
// <file> /*
// <copyright see="prj:///doc/copyright.txt"/> * Created by SharpDevelop.
// <license see="prj:///doc/license.txt"/> * User: itai
// <owner name="Itai Bar-Haim" email=""/> * Date: 23/09/2006
// <version>$Revision$</version> * Time: 12:18
// </file> *
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System; using System;
using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using ClassDiagram; using ClassDiagram;
@ -23,7 +25,7 @@ namespace ClassDiagramAddin
public override void Run() public override void Run()
{ {
IProject p = ProjectService.CurrentProject; 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 == null) return;
/*if (p.IsFileInProject(filename)) /*if (p.IsFileInProject(filename))
{ {
@ -50,8 +52,6 @@ namespace ClassDiagramAddin
classcanvas.AutoArrange(); classcanvas.AutoArrange();
classcanvas.WriteToXml().Save(filename); classcanvas.WriteToXml().Save(filename);
FileProjectItem fpi = new FileProjectItem(p, ItemType.Content); FileProjectItem fpi = new FileProjectItem(p, ItemType.Content);
fpi.BuildAction = "Content";
//fpi.BuildAction = FileProjectItem.FileBuildAction.Content;
fpi.FileName = filename; fpi.FileName = filename;
ProjectService.AddProjectItem(p, fpi); ProjectService.AddProjectItem(p, fpi);
ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView(); ProjectBrowserPad.Instance.ProjectBrowserControl.RefreshView();

Loading…
Cancel
Save