actually resolve merge conflict

Author: gewarren

snippets/visualbasic/System.Reflection/PropertyInfo/GetAccessors/source.vb

@@ -25,11 +25,7 @@ Module Example
         Dim propInfo As PropertyInfo = t.GetProperty("Caption")
 
         ' Get all the accessors.
-<<<<<<< HEAD
-        Dim methInfos() As MethodInfo = propInfo.GetAccessors()
-=======
         Dim methInfos() As MethodInfo = propInfo.GetAccessors(True)
->>>>>>> 651ae50cedec5721d63cf80f309a39e2649e6b55
         Console.WriteLine("There are {0} accessors.",
                           methInfos.Length)
         For ctr As Integer = 0 To methInfos.Length - 1
@@ -55,7 +51,7 @@ Module Example
         Console.WriteLine("----------")
         Console.WriteLine("The Caption property: {0}", test.Caption)
     End Sub
-    
+
     Private Function GetVisibility(m As MethodInfo) As String
        Dim visibility As String = ""
        If m.IsPublic Then

snippets/visualbasic/System.Reflection/PropertyInfo/GetAccessors/source1.vb

@@ -0,0 +1,87 @@
+' <Snippet1>
+Imports System.Reflection
+
+' Define a property.
+Public Class ClassWithProperty
+    Private _caption As String = "A Default caption"
+
+    Public Property Caption As String
+        Get
+            Return _caption
+        End Get
+        Set
+            If _caption <> value Then _caption = value
+        End Set
+    End Property
+End Class
+
+Module Example
+    Public Sub Main()
+        Dim test As New ClassWithProperty()
+        Console.WriteLine("The Caption property: {0}", test.Caption)
+        Console.WriteLine("----------")
+        ' Get the type and PropertyInfo.
+        Dim t As Type = Type.GetType("ClassWithProperty")
+        Dim propInfo As PropertyInfo = t.GetProperty("Caption")
+
+        ' Get all the accessors.
+        Dim methInfos() As MethodInfo = propInfo.GetAccessors()
+        Console.WriteLine("There are {0} accessors.",
+                          methInfos.Length)
+        For ctr As Integer = 0 To methInfos.Length - 1
+           Dim m As MethodInfo = methInfos(ctr)
+           Console.WriteLine("Accessor #{0}:", ctr + 1)
+           Console.WriteLine("   Name: {0}", m.Name)
+           Console.WriteLine("   Visibility: {0}", GetVisibility(m))
+           Console.Write("   Property Type: ")
+           ' Determine if this is the property getter or setter.
+''           If (m.ReturnType == typeof(void))
+           If m.ReturnType Is GetType(Void) Then
+              Console.WriteLine("Setter")
+              Console.WriteLine("   Setting the property value.")
+              ' Set the value of the property.
+              m.Invoke(test, { "The Modified Caption" } )
+           Else
+              Console.WriteLine("Getter")
+              ' Get the value of the property.
+              Console.WriteLine("   Property Value: {0}",
+                                m.Invoke(test, {} ))
+           End If
+        Next
+        Console.WriteLine("----------")
+        Console.WriteLine("The Caption property: {0}", test.Caption)
+    End Sub
+
+    Private Function GetVisibility(m As MethodInfo) As String
+       Dim visibility As String = ""
+       If m.IsPublic Then
+          Return "Public"
+       ElseIf m.IsPrivate Then
+          Return "Private"
+       Else
+          If m.IsFamily Then
+             visibility = "Protected "
+          ElseIf m.IsAssembly Then
+             visibility += "Assembly"
+          End If
+       End If
+       Return visibility
+    End Function
+End Module
+' The example displays the following output:
+'       The Caption property: A Default caption
+'       ----------
+'       There are 2 accessors.
+'       Accessor #1:
+'          Name: get_Caption
+'          Visibility: Public
+'          Property Type: Getter
+'          Property Value: A Default caption
+'       Accessor #2:
+'          Name: set_Caption
+'          Visibility: Public
+'          Property Type: Setter
+'          Setting the property value.
+'       ----------
+'       The Caption property: The Modified Caption
+' </Snippet1>

xml/System.Reflection/PropertyInfo.xml

@@ -501,19 +501,15 @@
 ## Remarks
  To call the <xref:System.Reflection.PropertyInfo.GetAccessors%2A> method:
 
-1.  Get a <xref:System.Type> object that represents the class.
-
-2.  From the <xref:System.Type> object, get the <xref:System.Reflection.PropertyInfo> object.
-
-3.  From the <xref:System.Reflection.PropertyInfo> object, call the <xref:System.Reflection.PropertyInfo.GetAccessors%2A> method.
-
-
+1.Get a <xref:System.Type> object that represents the class.
+2.From the <xref:System.Type> object, get the <xref:System.Reflection.PropertyInfo> object.
+3.From the <xref:System.Reflection.PropertyInfo> object, call the <xref:System.Reflection.PropertyInfo.GetAccessors%2A> method.
 
 ## Examples
  The following example retrieves the public accessors of the `ClassWithProperty.Caption` property and displays information about them. It also calls the <xref:System.Reflection.MethodBase.Invoke%2A> method of the setter to set the property value and of the getter to retrieve the property value.
 
  :::code language="csharp" source="~/snippets/csharp/System.Reflection/PropertyInfo/GetAccessors/source1.cs" id="Snippet1":::
- :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/GetAccessors/source.vb" id="Snippet1":::
+ :::code language="vb" source="~/snippets/visualbasic/System.Reflection/PropertyInfo/GetAccessors/source1.vb" id="Snippet1":::
 
  ]]></format>
         </remarks>
@@ -572,15 +568,12 @@
           <format type="text/markdown"><![CDATA[
 
 ## Remarks
- To call the <xref:System.Reflection.PropertyInfo.GetAccessors%2A> method:
-
-1.  Get a <xref:System.Type> object that represents the class.
-
-2.  From the <xref:System.Type> object, get the <xref:System.Reflection.PropertyInfo> object.
-
-3.  From the <xref:System.Reflection.PropertyInfo> object, call the <xref:System.Reflection.PropertyInfo.GetAccessors%2A> method.
 
+To call the <xref:System.Reflection.PropertyInfo.GetAccessors%2A> method:
 
+1. Get a <xref:System.Type> object that represents the class.
+2. From the <xref:System.Type> object, get the <xref:System.Reflection.PropertyInfo> object.
+3. From the <xref:System.Reflection.PropertyInfo> object, call the <xref:System.Reflection.PropertyInfo.GetAccessors%2A> method.
 
 ## Examples
  The following example retrieves the accessors of the `ClassWithProperty.Caption` property and displays information about them. It also calls the <xref:System.Reflection.MethodBase.Invoke%2A> method of the setter to set the property value and of the getter to retrieve the property value.