From 441d644366db610abf8f985fd2a3448d5cc04651 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sat, 2 Apr 2011 19:39:13 +0200
Subject: [PATCH] Fixed bugs in DocumentationTag implementation.

---
 .../Project/Src/Implementations/AbstractEntity.cs     |  2 +-
 .../Project/Src/Implementations/AbstractMember.cs     | 11 +++++++++++
 .../Project/Src/Implementations/DefaultClass.cs       |  2 +-
 .../Project/Src/Implementations/DefaultEvent.cs       |  2 +-
 .../Project/Src/Implementations/DefaultField.cs       |  2 +-
 .../Project/Src/Implementations/DefaultMethod.cs      |  2 +-
 .../Project/Src/Implementations/DefaultProperty.cs    |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractEntity.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractEntity.cs
index f7fd436d39..92edde5029 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractEntity.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractEntity.cs
@@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 		
 		string documentation;
 		
-		public string Documentation {
+		public virtual string Documentation {
 			get {
 				if (documentation == null) {
 					string documentationTag = this.DocumentationTag;
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractMember.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractMember.cs
index d7f0ad095a..6ff5cbe5dc 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractMember.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/AbstractMember.cs
@@ -79,6 +79,17 @@ namespace ICSharpCode.SharpDevelop.Dom
 			return this.Clone();
 		}
 		
+		public override string Documentation {
+			get { 
+				if (genericMember != null)
+					return genericMember.Documentation;
+				return base.Documentation; 
+			}
+			set { 
+				base.Documentation = value; 
+			}
+		}
+		
 		IMember genericMember;
 		
 		public virtual IMember GenericMember {
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultClass.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultClass.cs
index 249799c230..1025dca132 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultClass.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultClass.cs
@@ -284,7 +284,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 		
 		public override string DocumentationTag {
 			get {
-				return "T:" + DotNetName;
+				return "T:" + DotNetName.Replace('+', '.');
 			}
 		}
 		
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultEvent.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultEvent.cs
index b14c1b2f98..74adf44cae 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultEvent.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultEvent.cs
@@ -24,7 +24,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 		
 		public override string DocumentationTag {
 			get {
-				return "E:" + this.DotNetName;
+				return "E:" + this.DotNetName.Replace('+', '.');
 			}
 		}
 		
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultField.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultField.cs
index d71c32b94a..00c584638f 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultField.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultField.cs
@@ -9,7 +9,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 	{
 		public override string DocumentationTag {
 			get {
-				return "F:" + this.DotNetName;
+				return "F:" + this.DotNetName.Replace('+', '.');
 			}
 		}
 		
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultMethod.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultMethod.cs
index e7de4fb373..f18f86f263 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultMethod.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultMethod.cs
@@ -120,7 +120,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 					}
 					b.Append(')');
 				}
-				return b.ToString();
+				return b.ToString().Replace('+', '.');
 			}
 		}
 		
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs
index 557a8bc814..8400e1c641 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Implementations/DefaultProperty.cs
@@ -75,7 +75,7 @@ namespace ICSharpCode.SharpDevelop.Dom {
 					}
 					b.Append(')');
 				}
-				return b.ToString();
+				return b.ToString().Replace('+', '.');
 			}
 		}