Author: mkrueger
Date: 2008-02-07 00:35:12 -0500 (Thu, 07 Feb 2008)
New Revision: 95117
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
Log:
* MonoDevelop.Ide.Dom.Output/OutputFlags.cs,
MonoDevelop.Ide.Dom.Output/Ambience.cs,
MonoDevelop.Ide.Dom.Output/NetAmbience.cs: Worked on Dom output.
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-07
05:19:46 UTC (rev 95116)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-07
05:35:12 UTC (rev 95117)
@@ -1,5 +1,11 @@
2008-02-07 Mike Krüger <[EMAIL PROTECTED]>
+ * MonoDevelop.Ide.Dom.Output/OutputFlags.cs,
+ MonoDevelop.Ide.Dom.Output/Ambience.cs,
+ MonoDevelop.Ide.Dom.Output/NetAmbience.cs: Worked on Dom output.
+
+2008-02-07 Mike Krüger <[EMAIL PROTECTED]>
+
*
MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceFolderNodeBuilder.cs,
MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs,
MonoDevelop.Ide.addin.xml: Assembly browser can now be used to open
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
2008-02-07 05:19:46 UTC (rev 95116)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/Ambience.cs
2008-02-07 05:35:12 UTC (rev 95117)
@@ -110,8 +110,20 @@
{
return (outputFlags & OutputFlags.IncludeModifiers) ==
OutputFlags.IncludeModifiers;
}
+ protected static bool IncludeBaseTypes (OutputFlags outputFlags)
+ {
+ return (outputFlags & OutputFlags.IncludeBaseTypes) ==
OutputFlags.IncludeBaseTypes;
+ }
#endregion
+ protected string Format (string str)
+ {
+ if (String.IsNullOrEmpty (str))
+ return "";
+ str = str.Replace ("<", "<");
+ return str.Replace (">", ">");
+ }
+
public abstract string GetString (string nameSpace, OutputFlags
flags);
public abstract string GetString (IField field, OutputFlags
flags);
public abstract string GetString (IProperty property,
OutputFlags flags);
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
2008-02-07 05:19:46 UTC (rev 95116)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/NetAmbience.cs
2008-02-07 05:35:12 UTC (rev 95117)
@@ -81,7 +81,7 @@
if (EmitMarkup (flags))
result.Append ("</b>");
}
- result.Append (nameSpace);
+ result.Append (Format (nameSpace));
return result.ToString ();
}
@@ -107,9 +107,9 @@
}
if (UseFullName (flags)) {
- result.Append (property.FullName);
+ result.Append (Format (property.FullName));
} else {
- result.Append (property.Name);
+ result.Append (Format (property.Name));
}
if (IncludeReturnType (flags)) {
result.Append (" : ");
@@ -142,9 +142,9 @@
}
if (UseFullName (flags)) {
- result.Append (field.FullName);
+ result.Append (Format (field.FullName));
} else {
- result.Append (field.Name);
+ result.Append (Format (field.Name));
}
if (IncludeReturnType (flags)) {
result.Append (" : ");
@@ -159,9 +159,9 @@
return nullString;
StringBuilder result = new StringBuilder ();
if (UseFullName (flags)) {
- result.Append (returnType.FullName);
+ result.Append (Format (returnType.FullName));
} else {
- result.Append (returnType.Name);
+ result.Append (Format (returnType.Name));
}
return result.ToString ();
}
@@ -190,9 +190,9 @@
}
if (UseFullName (flags)) {
- result.Append (method.FullName);
+ result.Append (Format (method.FullName));
} else {
- result.Append (method.Name);
+ result.Append (Format (method.Name));
}
if (IncludeParameters (flags)) {
@@ -221,7 +221,7 @@
return nullString;
StringBuilder result = new StringBuilder ();
if (IncludeParameterName (flags)) {
- result.Append (parameter.Name);
+ result.Append (Format (parameter.Name));
if (IncludeReturnType (flags)) {
result.Append (" : ");
result.Append (GetString
(parameter.ReturnType, flags));
@@ -255,11 +255,10 @@
result.Append ("</b>");
}
- result.Append (type.Name);
-
- if (type.BaseType != null) {
+ result.Append (Format (type.Name));
+ if (IncludeBaseTypes (flags) && type.BaseType != null) {
result.Append (" : ");
- result.Append (type.BaseType.Name);
+ result.Append (Format (type.BaseType.Name));
}
return result.ToString ();
}
@@ -286,7 +285,7 @@
result.Append ("</b>");
}
- result.Append (evt.Name);
+ result.Append (Format (evt.Name));
return result.ToString ();
}
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
2008-02-07 05:19:46 UTC (rev 95116)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Dom.Output/OutputFlags.cs
2008-02-07 05:35:12 UTC (rev 95117)
@@ -42,8 +42,9 @@
EmitMarkup = 0x0010,
EmitKeywords = 0x0020,
IncludeModifiers = 0x0040,
+ IncludeBaseTypes = 0x0080,
ClassBrowserEntries = IncludeReturnType |
IncludeParameters,
- AssemblyBrowserDescription = IncludeReturnType |
IncludeParameters | IncludeParameterName | EmitMarkup | EmitKeywords
| IncludeModifiers
+ AssemblyBrowserDescription = IncludeBaseTypes |
IncludeReturnType | IncludeParameters | IncludeParameterName | EmitMarkup
| EmitKeywords | IncludeModifiers
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
