From b46d7a7168b3919edc8b103bffdc8f6f161f9e4f Mon Sep 17 00:00:00 2001 From: Itar Bar-Haim Date: Sat, 24 Feb 2007 15:43:39 +0000 Subject: [PATCH] Fixed naming and brought back items accidentally removed. Fixed parameters icon display. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2398 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../ClassDiagram/ClassEditor/ClassEditor.cs | 60 +++++++------------ .../ClassDiagram/ClassEditor/ClassEditor.resx | 33 ++++++++++ 2 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs b/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs index cb906291df..08c4c57e85 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.cs @@ -182,30 +182,22 @@ namespace ClassDiagram this.parameter = parameter; this.editor = editor; this.method = method; - - UpdateMethod(); } - IAmbience ambience; IParameter parameter; IMethod method; ClassEditor editor; - - private void UpdateMethod() - { - MemberNode member = this.Parent as MemberNode; - if (member != null) - method = member.Member as IMethod; - } + Image icon; public IParameter Parameter { get { return parameter; } - set - { - parameter = value; - UpdateMethod(); - } + set { parameter = value; } + } + + public IMethod Method { + get { return method; } + set { method = value; } } public string MemberName @@ -218,7 +210,6 @@ namespace ClassDiagram } } - protected Image icon; public Image MemberIcon { get { return icon; } @@ -265,7 +256,7 @@ namespace ClassDiagram } Image icon; - public Image Icon { + public Image MemberIcon { get { return icon; } } @@ -478,10 +469,10 @@ namespace ClassDiagram private void FillParams(MemberNode item, IMethod method) { - Image comma = (Image)resources.GetObject("Comma"); - Image openBrace = (Image)resources.GetObject("OpenBrace"); - Image closeBrace = (Image)resources.GetObject("CloseBrace"); - Image emptyBraces = (Image)resources.GetObject("EmptyBraces"); + Image comma = (Image)resources.GetObject("ClassEditor.Comma"); + Image openBrace = (Image)resources.GetObject("ClassEditor.OpenBrace"); + Image closeBrace = (Image)resources.GetObject("ClassEditor.CloseBrace"); + Image emptyBraces = (Image)resources.GetObject("ClassEditor.EmptyBraces"); Image currentImage = openBrace; foreach (IParameter param in method.Parameters) { @@ -554,10 +545,13 @@ namespace ClassDiagram void MembersListNodeMouseDoubleClick(object sender, TreeNodeAdvMouseEventArgs e) { - MemberNode memberItem = e.Node.Tag as MemberNode; - if (memberItem == null) return; + Node item = e.Node.Tag as Node; + + if (item == null) return; - if (addMemberItems.ContainsValue(memberItem)) + MemberNode memberItem = item as MemberNode; + + if (memberItem != null && addMemberItems.ContainsValue(memberItem)) { /* IAmbience ambience = GetAmbience(); item.SubItems.Add(ambience.Convert(VoidReturnType.Instance)); @@ -566,27 +560,17 @@ namespace ClassDiagram item.Text = "[method name]"; item.BeginEdit(0);*/ } - else if (addParameterItems.ContainsValue(memberItem)) + else if (addParameterItems.ContainsValue(item)) { } else { - IParameter itemParameter = memberItem.Member as IParameter; - if (itemParameter != null) - { - MemberNode methodNode = memberItem.Parent as MemberNode; - if (methodNode != null) - { - IMethod method = methodNode.Member as IMethod; - if (method != null) - ParameterActivated(this, new IParameterEventArgs(method, itemParameter)); - } - } + ParameterNode paramItem = item as ParameterNode; + if (paramItem != null && paramItem.Parameter != null && paramItem.Method != null) + ParameterActivated(this, new IParameterEventArgs(paramItem.Method, paramItem.Parameter)); else - { MemberActivated(this, new IMemberEventArgs(memberItem.Member)); - } } } diff --git a/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.resx b/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.resx index 7080a7d118..f34910668a 100644 --- a/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.resx +++ b/src/AddIns/DisplayBindings/ClassDiagram/ClassEditor/ClassEditor.resx @@ -117,4 +117,37 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAEtJREFUOE9j/P// + PwNFAGQALgw0OA6IgdJ41ODRrAzSDDKEXAMI2g72Ph4XgGzH6/xRAyBRO8wDkeKERFlShuZSgq7AGQv4 + MhCyHADpzI8LoRhpHQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAFJJREFUOE9j/P// + PwNFAGQALgw0GGR6HF41BAyIgxqijNMSfAZAvYfXFTidDzMY6gIgF7tXRw0Ahi+RsTAMAhFncsYbBqB8 + QFFSpjgzEYohkDwAfDKPC3ze7YgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAADhJREFUOE9j/P// + PwNFAGQAJZgizWDXU2L7qAGQ2BsNRCLCAJhPQJkFGF7YkzzBQKTIAEKaqRKNABFqxFkudmmJAAAAAElF + TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAGFJREFUOE9j/P// + PwNFAGQAMgYaFgfEQCEMcZBNcRjiaJqVQZqxKoQaDJRTRtFDjO0wNdgMR3c+yHYM56MZgCI/agAwyNBi + YRgEItZkTEpCIiYpi+JMytCcSX5mQs9pxPABw+lNu0PRCSMAAAAASUVORK5CYII= + + \ No newline at end of file