Move around some members (to correct/appropriate places) for isolated xaml writer...

diff --git a/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs b/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs
index 946ad26effdd23eda8bdc39703a5a25332f61677..f0f7f95f9af108c228817322c22f2dab912c5c5e 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs
+++ b/mcs/class/System.Xaml/System.Xaml/TypeExtensionMethods.cs
@@ -173,5 +173,17 @@ namespace System.Xaml
                        var caa = xm.GetCustomAttributeProvider ().GetCustomAttribute<ConstructorArgumentAttribute> (false);
                        return caa.ArgumentName;
                }
+               
+#if DOTNET
+               internal static ICustomAttributeProvider GetCustomAttributeProvider (this XamlType type)
+               {
+                       return type.UnderlyingType;
+               }
+               
+               internal static ICustomAttributeProvider GetCustomAttributeProvider (this XamlMember member)
+               {
+                       return member.UnderlyingMember;
+               }
+#endif
        }
 }

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlNode.cs b/mcs/class/System.Xaml/System.Xaml/XamlNode.cs
index 0e1fca272dcf7cf3f505749a519b3db48cbd611c..9deda8d8122b40029df214b84cd3060b19615b67 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/XamlNode.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlNode.cs
@@ -534,17 +534,5 @@ namespace System.Xaml
                                return xobj.GetWrappedValue (); // dummy value
                        return xm.Invoker.GetValue (xobj.GetWrappedValue ());
                }
-               
-#if DOTNET
-               internal static ICustomAttributeProvider GetCustomAttributeProvider (this XamlType type)
-               {
-                       return type.UnderlyingType;
-               }
-               
-               internal static ICustomAttributeProvider GetCustomAttributeProvider (this XamlMember member)
-               {
-                       return member.UnderlyingMember;
-               }
-#endif
        }
 }

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlType.cs b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
index c6cce8673812e1ff4923c94e7bf733308df5d8d3..a3d40831bedf66b218f87c2dc1f6fe3f8fd5d7bb 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/XamlType.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
@@ -237,11 +237,10 @@ namespace System.Xaml
                        get { return LookupValueSerializer (); }
                }
 
-               internal string InternalXmlName {
-                       get {
-                               var stn = XamlLanguage.SpecialNames.FirstOrDefault (s => s.Type == this);
-                               return stn != null ? stn.Name : Name;
-                       }
+               internal string GetInternalXmlName ()
+               {
+                       var stn = XamlLanguage.SpecialNames.FirstOrDefault (s => s.Type == this);
+                       return stn != null ? stn.Name : Name;
                }
 
                public static bool operator == (XamlType left, XamlType right)

diff --git a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
index b61d5ba44c5e71520d898fd82f50f506420c5541..cca2b717eda548c4e7223ae942d34aeaa55beae8 100644 (file)
--- a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
+++ b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
@@ -281,7 +281,7 @@ namespace System.Xaml
                void DoWriteStartObject (XamlType xamlType)
                {
                        string prefix = GetPrefix (xamlType.PreferredXamlNamespace);
-                       w.WriteStartElement (prefix, xamlType.InternalXmlName, xamlType.PreferredXamlNamespace);
+                       w.WriteStartElement (prefix, xamlType.GetInternalXmlName (), xamlType.PreferredXamlNamespace);
                        WritePendingNamespaces ();
                }
                

diff --git a/mcs/class/System.Xaml/Test/System.Xaml/TestedTypes.cs b/mcs/class/System.Xaml/Test/System.Xaml/TestedTypes.cs
index 0eababad4a98ed5454a549cfc606796872cc04a8..e097816c302730a75da1c28a2f5100db430a7eb9 100644 (file)
--- a/mcs/class/System.Xaml/Test/System.Xaml/TestedTypes.cs
+++ b/mcs/class/System.Xaml/Test/System.Xaml/TestedTypes.cs
@@ -238,7 +238,7 @@ namespace MonoTests.System.Xaml
                public string Bar { get; set; }
        }
 
-       // no type converter, and there are only simple-type arguments == _PositionalParameters is applicable. (Unlike MyExtension7)
+       // no type converter, and there are only simple-type arguments == _PositionalParameters is applicable.
        public class MyExtension5 : MarkupExtension
        {
                public MyExtension5 (string arg1, string arg2)