From 9d4322d3d1c9032caa6c8a7061bfaa69379ced39 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 19 Nov 2019 11:50:21 -0600 Subject: [PATCH] [generator] Make _members private to reduce warnings building binding projects. --- .../expected.ji/Android.Text.ISpannable.cs | 2 +- .../Tests-Core/expected.ji/Android.Text.ISpanned.cs | 2 +- .../expected.ji/Android.Text.SpannableString.cs | 2 +- .../Android.Text.SpannableStringInternal.cs | 4 ++-- .../Tests-Core/expected.ji/Android.Views.View.cs | 4 ++-- .../Tests-Core/expected.ji/Java.Lang.Object.cs | 2 +- .../JavaInterop1/WriteClass.txt | 2 +- .../JavaInterop1/WriteClassHandle.txt | 2 +- .../JavaInterop1/WriteClassInvoker.txt | 2 +- .../JavaInterop1/WriteClassInvokerHandle.txt | 2 +- .../WriteDefaultInterfaceMethodInvoker.txt | 2 +- .../JavaInterop1/WriteInterface.txt | 4 ++-- .../JavaInterop1/WriteInterfaceDefaultMethod.txt | 2 +- .../JavaInterop1/WriteInterfaceDefaultProperty.txt | 2 +- .../WriteInterfaceDefaultPropertyGetterOnly.txt | 2 +- .../JavaInterop1/WriteInterfaceInvoker.txt | 2 +- .../JavaInterop1/WriteStaticInterfaceMethod.txt | 6 +++--- .../JavaInterop1/WriteStaticInterfaceProperty.txt | 2 +- .../XAJavaInterop1/WriteClass.txt | 2 +- .../XAJavaInterop1/WriteClassHandle.txt | 2 +- .../XAJavaInterop1/WriteClassInvoker.txt | 2 +- .../XAJavaInterop1/WriteClassInvokerHandle.txt | 2 +- .../WriteDefaultInterfaceMethodInvoker.txt | 2 +- .../XAJavaInterop1/WriteInterface.txt | 4 ++-- .../XAJavaInterop1/WriteInterfaceDefaultMethod.txt | 2 +- .../XAJavaInterop1/WriteInterfaceDefaultProperty.txt | 2 +- .../WriteInterfaceDefaultPropertyGetterOnly.txt | 2 +- .../XAJavaInterop1/WriteInterfaceInvoker.txt | 2 +- .../XAJavaInterop1/WriteStaticInterfaceMethod.txt | 6 +++--- .../XAJavaInterop1/WriteStaticInterfaceProperty.txt | 2 +- .../AccessModifiers/Xamarin.Test.BasePublicClass.cs | 2 +- .../Xamarin.Test.ExtendPublicClass.cs | 2 +- .../AccessModifiers/Xamarin.Test.PublicClass.cs | 2 +- .../AccessModifiers/Xamarin.Test.PublicFinalClass.cs | 2 +- .../expected.ji/Adapters/Java.Lang.Object.cs | 2 +- .../expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs | 4 ++-- .../expected.ji/Adapters/Xamarin.Test.AdapterView.cs | 4 ++-- .../Adapters/Xamarin.Test.GenericReturnObject.cs | 2 +- .../expected.ji/Adapters/Xamarin.Test.IAdapter.cs | 2 +- .../Adapters/Xamarin.Test.ISpinnerAdapter.cs | 2 +- .../Android.Graphics.Color/Java.Lang.Object.cs | 2 +- .../Xamarin.Test.SomeObject.cs | 4 ++-- .../expected.ji/Arrays/Java.Lang.Object.cs | 2 +- .../expected.ji/Arrays/Xamarin.Test.SomeObject.cs | 2 +- .../CSharpKeywords/Xamarin.Test.CSharpKeywords.cs | 2 +- .../expected.ji/Constructors/Java.Lang.Object.cs | 2 +- .../Constructors/Xamarin.Test.SomeObject.cs | 2 +- ...Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs | 2 +- .../Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs | 4 ++-- .../expected.ji/GenericArguments/Java.Lang.Object.cs | 2 +- .../InterfaceMethodsConflict/Xamarin.Test.II1.cs | 2 +- .../InterfaceMethodsConflict/Xamarin.Test.II2.cs | 2 +- .../Xamarin.Test.SomeObject.cs | 2 +- .../Xamarin.Test.SomeObject2.cs | 4 ++-- .../expected.ji/NestedTypes/Java.Lang.Object.cs | 2 +- .../Xamarin.Test.NotificationCompatBase.cs | 12 ++++++------ .../expected.ji/NonStaticFields/Java.Lang.Object.cs | 2 +- .../NonStaticFields/Xamarin.Test.SomeObject.cs | 2 +- .../expected.ji/NormalMethods/Java.Lang.Class.cs | 2 +- .../expected.ji/NormalMethods/Java.Lang.Integer.cs | 2 +- .../expected.ji/NormalMethods/Java.Lang.Object.cs | 2 +- .../expected.ji/NormalMethods/Java.Lang.Throwable.cs | 2 +- .../expected.ji/NormalMethods/Xamarin.Test.A.cs | 4 ++-- .../expected.ji/NormalMethods/Xamarin.Test.C.cs | 2 +- .../NormalMethods/Xamarin.Test.SomeObject.cs | 2 +- .../expected.ji/NormalProperties/Java.Lang.Object.cs | 2 +- .../NormalProperties/Xamarin.Test.SomeObject.cs | 4 ++-- .../expected.ji/ParameterXPath/Java.Lang.Integer.cs | 2 +- .../expected.ji/ParameterXPath/Java.Lang.Object.cs | 2 +- .../expected.ji/ParameterXPath/Xamarin.Test.A.cs | 2 +- .../expected.ji/StaticFields/Java.Lang.Object.cs | 2 +- .../StaticFields/Xamarin.Test.SomeObject.cs | 2 +- .../expected.ji/StaticMethods/Java.Lang.Object.cs | 2 +- .../StaticMethods/Xamarin.Test.SomeObject.cs | 2 +- .../expected.ji/StaticProperties/Java.Lang.Object.cs | 2 +- .../StaticProperties/Xamarin.Test.SomeObject.cs | 2 +- .../Streams/Java.IO.FilterOutputStream.cs | 2 +- .../expected.ji/Streams/Java.IO.IOException.cs | 4 ++-- .../expected.ji/Streams/Java.IO.InputStream.cs | 4 ++-- .../expected.ji/Streams/Java.IO.OutputStream.cs | 4 ++-- .../expected.ji/Streams/Java.Lang.Object.cs | 2 +- .../expected.ji/Streams/Java.Lang.Throwable.cs | 2 +- .../expected.ji/TestInterface/Java.Lang.Object.cs | 2 +- .../expected.ji/TestInterface/Java.Lang.String.cs | 2 +- .../TestInterface/Test.ME.GenericImplementation.cs | 2 +- .../Test.ME.GenericObjectPropertyImplementation.cs | 2 +- .../Test.ME.GenericStringImplementation.cs | 2 +- .../Test.ME.GenericStringPropertyImplementation.cs | 2 +- .../TestInterface/Test.ME.IGenericInterface.cs | 2 +- .../Test.ME.IGenericPropertyInterface.cs | 2 +- .../TestInterface/Test.ME.ITestInterface.cs | 4 ++-- .../Test.ME.TestInterfaceImplementation.cs | 4 ++-- .../expected.ji/java.lang.Enum/Java.Lang.Enum.cs | 4 ++-- .../java.lang.Enum/Java.Lang.IComparable.cs | 2 +- .../expected.ji/java.lang.Enum/Java.Lang.Object.cs | 2 +- .../expected.ji/java.lang.Enum/Java.Lang.State.cs | 2 +- .../expected.ji/java.lang.Object/Java.Lang.Object.cs | 2 +- .../expected.ji/java.util.List/Java.Lang.Object.cs | 2 +- .../java.util.List/Xamarin.Test.SomeObject.cs | 2 +- .../JavaInteropCodeGenerator.cs | 12 ++++++------ 100 files changed, 131 insertions(+), 131 deletions(-) diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs index 627b5fa8c..c7b373664 100644 --- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs +++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs @@ -14,7 +14,7 @@ public partial interface ISpannable : Android.Text.ISpanned { [global::Android.Runtime.Register ("android/text/Spannable", DoNotGenerateAcw=true)] internal partial class ISpannableInvoker : global::Java.Lang.Object, ISpannable { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs index aad237d8b..39c66727f 100644 --- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs +++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs @@ -19,7 +19,7 @@ public partial interface ISpanned : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("android/text/Spanned", DoNotGenerateAcw=true)] internal partial class ISpannedInvoker : global::Java.Lang.Object, ISpanned { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs index dbe5f651d..9b621a1ea 100644 --- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs +++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs @@ -9,7 +9,7 @@ namespace Android.Text { [global::Android.Runtime.Register ("android/text/SpannableString", DoNotGenerateAcw=true)] public partial class SpannableString : Android.Text.SpannableStringInternal, Android.Text.ISpannable { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableString", typeof (SpannableString)); + static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableString", typeof (SpannableString)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs index 11ad54654..32948f11d 100644 --- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs +++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs @@ -9,7 +9,7 @@ namespace Android.Text { [global::Android.Runtime.Register ("android/text/SpannableStringInternal", DoNotGenerateAcw=true)] public abstract partial class SpannableStringInternal : Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternal)); + static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternal)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -70,7 +70,7 @@ internal partial class SpannableStringInternalInvoker : SpannableStringInternal public SpannableStringInternalInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternalInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternalInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs b/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs index a53d0d7f8..a51b106fa 100644 --- a/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs +++ b/tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs @@ -22,7 +22,7 @@ public partial interface IOnClickListener : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("android/view/View$OnClickListener", DoNotGenerateAcw=true)] internal partial class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } @@ -128,7 +128,7 @@ internal static bool __IsEmpty (IOnClickListenerImplementor value) } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View", typeof (View)); + static readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View", typeof (View)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/Tests-Core/expected.ji/Java.Lang.Object.cs b/tests/generator-Tests/Tests-Core/expected.ji/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/Tests-Core/expected.ji/Java.Lang.Object.cs +++ b/tests/generator-Tests/Tests-Core/expected.ji/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt index ba42fce5a..1a43eafeb 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt @@ -2,7 +2,7 @@ [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt index 8a2d58a37..00904b6f3 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt @@ -1,4 +1,4 @@ - internal static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo)); + static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt index 6e778c71b..8d5aaa684 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt @@ -3,7 +3,7 @@ internal partial class MyClassInvoker : MyClass { public MyClassInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt index ae433aa22..5c1d16c85 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt @@ -1,4 +1,4 @@ -internal static new readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo)); +static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index 98f44e7f2..729ccfb48 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -1,7 +1,7 @@ [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt index ee17b0686..344fb5dcf 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt @@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object { } - static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } [Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] @@ -70,7 +70,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt index ca34ddc70..4261ed581 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultMethod.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static Delegate cb_DoSomething; #pragma warning disable 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt index 4bfa1b7cd..ff62f2af7 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultProperty.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static Delegate cb_get_Value; #pragma warning disable 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index 43c93eb91..ee13b1cfb 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static Delegate cb_get_Value; #pragma warning disable 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt index 15006b3c2..385e80531 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceInvoker.txt @@ -1,7 +1,7 @@ [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt index c24a6a08b..df470d790 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceMethod.txt @@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object { } - static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } [Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] @@ -31,7 +31,7 @@ public abstract class MyInterfaceConsts : MyInterface { // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='DoSomething' and count(parameter)=0]" [Register ("DoSomething", "()V", "")] @@ -49,7 +49,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt index 4ed8967bd..5d78aff59 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteStaticInterfaceProperty.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static unsafe int Value { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Value' and count(parameter)=0]" diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index f657829fa..f1fd5bf4a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -2,7 +2,7 @@ [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt index 7871f3800..9cb131cea 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassHandle.txt @@ -1,4 +1,4 @@ - internal static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (foo)); + static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (foo)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt index e46df16da..9cd0169c0 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvoker.txt @@ -3,7 +3,7 @@ internal partial class MyClassInvoker : MyClass { public MyClassInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClassInvoker)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClassInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt index 9868c0c38..f19ad766e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClassInvokerHandle.txt @@ -1,4 +1,4 @@ -internal static new readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo)); +static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index 550d22615..6dde814ef 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -1,7 +1,7 @@ [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index 9819c1e8b..3a3b78e35 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object { } - static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } [Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] @@ -70,7 +70,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index 9681c4527..c3e021eb4 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static Delegate cb_DoSomething; #pragma warning disable 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index 955fd7400..daec467bd 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static Delegate cb_get_Value; #pragma warning disable 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index fefd8f47e..7b56b8cf8 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static Delegate cb_get_Value; #pragma warning disable 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt index 738490f94..b19858527 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceInvoker.txt @@ -1,7 +1,7 @@ [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt index 8404436de..86373c72e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt @@ -16,7 +16,7 @@ public abstract class MyInterface : Java.Lang.Object { } - static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } [Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] @@ -31,7 +31,7 @@ public abstract class MyInterfaceConsts : MyInterface { // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='DoSomething' and count(parameter)=0]" [Register ("DoSomething", "()V", "")] @@ -49,7 +49,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - internal static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt index ef68b276c..0eec20f38 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt @@ -1,7 +1,7 @@ // Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']" [Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")] public partial interface IMyInterface : IJavaObject, IJavaPeerable { - static new readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); + static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); static unsafe int Value { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Value' and count(parameter)=0]" diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index ce346e466..78480d31b 100644 --- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/BasePublicClass", DoNotGenerateAcw=true)] public partial class BasePublicClass : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/BasePublicClass", typeof (BasePublicClass)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/BasePublicClass", typeof (BasePublicClass)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 07a7f6e78..b1e3624b5 100644 --- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/ExtendPublicClass", DoNotGenerateAcw=true)] public partial class ExtendPublicClass : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/ExtendPublicClass", typeof (ExtendPublicClass)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/ExtendPublicClass", typeof (ExtendPublicClass)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs index 5722ed34f..edac242f8 100644 --- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/PublicClass", DoNotGenerateAcw=true)] public partial class PublicClass : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicClass", typeof (PublicClass)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicClass", typeof (PublicClass)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs index 329a60537..44d04d7aa 100644 --- a/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs +++ b/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/PublicFinalClass", DoNotGenerateAcw=true)] public sealed partial class PublicFinalClass : global::Xamarin.Test.BasePublicClass { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicFinalClass", typeof (PublicFinalClass)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/PublicFinalClass", typeof (PublicFinalClass)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Adapters/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Adapters/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/Adapters/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/Adapters/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs index 557122eac..d45408fbb 100644 --- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/AbsSpinner", DoNotGenerateAcw=true)] public abstract partial class AbsSpinner : Xamarin.Test.AdapterView { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinner)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinner)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -94,7 +94,7 @@ internal partial class AbsSpinnerInvoker : AbsSpinner { public AbsSpinnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinnerInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinnerInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs index 3298b2ba0..5c2e80516 100644 --- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs +++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs @@ -10,7 +10,7 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.Adapter"})] public abstract partial class AdapterView : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AdapterView", typeof (AdapterView)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AdapterView", typeof (AdapterView)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -78,7 +78,7 @@ internal partial class AdapterViewInvoker : AdapterView { public AdapterViewInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AdapterView", typeof (AdapterViewInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AdapterView", typeof (AdapterViewInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs index 643314be0..a9e1ec281 100644 --- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/GenericReturnObject", DoNotGenerateAcw=true)] public partial class GenericReturnObject : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/GenericReturnObject", typeof (GenericReturnObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/GenericReturnObject", typeof (GenericReturnObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs index 06a35764c..034ac2730 100644 --- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs +++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.IAdapter.cs @@ -14,7 +14,7 @@ public partial interface IAdapter : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/Adapter", DoNotGenerateAcw=true)] internal partial class IAdapterInvoker : global::Java.Lang.Object, IAdapter { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/Adapter", typeof (IAdapterInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/Adapter", typeof (IAdapterInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs index 1e686f563..5f3de2dbb 100644 --- a/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs +++ b/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.ISpinnerAdapter.cs @@ -14,7 +14,7 @@ public partial interface ISpinnerAdapter : global::Xamarin.Test.IAdapter { [global::Android.Runtime.Register ("xamarin/test/SpinnerAdapter", DoNotGenerateAcw=true)] internal partial class ISpinnerAdapterInvoker : global::Java.Lang.Object, ISpinnerAdapter { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SpinnerAdapter", typeof (ISpinnerAdapterInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SpinnerAdapter", typeof (ISpinnerAdapterInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 2e8290b3b..d1107d178 100644 --- a/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -29,7 +29,7 @@ public abstract partial class SomeObject : global::Java.Lang.Object { } } } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -97,7 +97,7 @@ internal partial class SomeObjectInvoker : SomeObject { public SomeObjectInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/Arrays/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Arrays/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/Arrays/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/Arrays/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs index 711f2e47a..0ac96d73c 100644 --- a/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs @@ -163,7 +163,7 @@ public IList Mylongs { } } } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index 2dd789599..c8bc590ed 100644 --- a/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/CSharpKeywords", DoNotGenerateAcw=true)] public partial class CSharpKeywords : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/CSharpKeywords", typeof (CSharpKeywords)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/CSharpKeywords", typeof (CSharpKeywords)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Constructors/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Constructors/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/Constructors/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/Constructors/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs index fefa50a9f..4ed2a5907 100644 --- a/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs index b9bb60b15..c0ddc30eb 100644 --- a/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs +++ b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs @@ -9,7 +9,7 @@ namespace Com.Google.Android.Exoplayer.Drm { [global::Android.Runtime.Register ("com/google/android/exoplayer/drm/FrameworkMediaDrm", DoNotGenerateAcw=true)] public sealed partial class FrameworkMediaDrm : global::Java.Lang.Object, global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaDrm", typeof (FrameworkMediaDrm)); + static readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaDrm", typeof (FrameworkMediaDrm)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index b7ace9d50..d20bd6f37 100644 --- a/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -19,7 +19,7 @@ public partial interface IExoMediaDrmOnEventListener : IJavaObject, IJavaPeerabl [global::Android.Runtime.Register ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", DoNotGenerateAcw=true)] internal partial class IExoMediaDrmOnEventListenerInvoker : global::Java.Lang.Object, IExoMediaDrmOnEventListener { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", typeof (IExoMediaDrmOnEventListenerInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", typeof (IExoMediaDrmOnEventListenerInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } @@ -200,7 +200,7 @@ public partial interface IExoMediaDrm : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/google/android/exoplayer/drm/ExoMediaDrm", DoNotGenerateAcw=true)] internal partial class IExoMediaDrmInvoker : global::Java.Lang.Object, IExoMediaDrm { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm", typeof (IExoMediaDrmInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm", typeof (IExoMediaDrmInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/GenericArguments/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/GenericArguments/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/GenericArguments/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/GenericArguments/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index e716ef1c3..218c7cfd0 100644 --- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -18,7 +18,7 @@ public partial interface II1 : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/I1", DoNotGenerateAcw=true)] internal partial class II1Invoker : global::Java.Lang.Object, II1 { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/I1", typeof (II1Invoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/I1", typeof (II1Invoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index 06429ea5b..669e81f5d 100644 --- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -18,7 +18,7 @@ public partial interface II2 : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/I2", DoNotGenerateAcw=true)] internal partial class II2Invoker : global::Java.Lang.Object, II2 { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/I2", typeof (II2Invoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/I2", typeof (II2Invoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index bdd6498b2..55a449039 100644 --- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object, global::Xamarin.Test.II1, global::Xamarin.Test.II2 { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index 333217eb8..e9504dbdf 100644 --- a/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject2", DoNotGenerateAcw=true)] public abstract partial class SomeObject2 : global::Java.Lang.Object, global::Xamarin.Test.II1, global::Xamarin.Test.II2 { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -84,7 +84,7 @@ internal partial class SomeObject2Invoker : SomeObject2 { public SomeObject2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2Invoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2Invoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/NestedTypes/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NestedTypes/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/NestedTypes/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/NestedTypes/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 2e32d447f..8b724e121 100644 --- a/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -26,7 +26,7 @@ public partial interface IFactory : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/NotificationCompatBase$Action$Factory", DoNotGenerateAcw=true)] internal partial class IFactoryInvoker : global::Java.Lang.Object, IFactory { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action$Factory", typeof (IFactoryInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action$Factory", typeof (IFactoryInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } @@ -103,7 +103,7 @@ static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (Action)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (Action)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -131,7 +131,7 @@ internal partial class ActionInvoker : Action { public ActionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (ActionInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (ActionInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } @@ -148,7 +148,7 @@ public ActionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle [global::Android.Runtime.Register ("xamarin/test/NotificationCompatBase$InstanceInner", DoNotGenerateAcw=true)] public abstract partial class InstanceInner : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInner)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInner)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -196,7 +196,7 @@ internal partial class InstanceInnerInvoker : InstanceInner { public InstanceInnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInnerInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInnerInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } @@ -209,7 +209,7 @@ public InstanceInnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase", typeof (NotificationCompatBase)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase", typeof (NotificationCompatBase)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs index 3125f5edf..644d48476 100644 --- a/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs @@ -29,7 +29,7 @@ public int Value { } } } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Class.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Class.cs index 0ec5c18a8..390cb342e 100644 --- a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Class.cs +++ b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Class.cs @@ -10,7 +10,7 @@ namespace Java.Lang { [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] public partial class Class : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Class", typeof (Class)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Class", typeof (Class)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs index f168b146d..c47bfcbe1 100644 --- a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs +++ b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Integer", DoNotGenerateAcw=true)] public partial class Integer : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Integer", typeof (Integer)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Integer", typeof (Integer)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs index 1d9d519c1..b665c2f32 100644 --- a/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Throwable", DoNotGenerateAcw=true)] public partial class Throwable { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Throwable", typeof (Throwable)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Throwable", typeof (Throwable)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs index 51b4d19b1..3d113b1cc 100644 --- a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs @@ -14,7 +14,7 @@ public partial class A : global::Java.Lang.Object { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.A.B"})] public partial class B : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A$B", typeof (B)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A$B", typeof (B)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -67,7 +67,7 @@ static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int in } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs index 69dc31a3d..b4d912f2f 100644 --- a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs +++ b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs @@ -10,7 +10,7 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.C"})] public partial class C : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/C", typeof (C)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/C", typeof (C)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs index 22dd57876..a993d267c 100644 --- a/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalProperties/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/NormalProperties/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/NormalProperties/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/NormalProperties/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs index 049b0988c..46b9d5160 100644 --- a/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public abstract partial class SomeObject : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -156,7 +156,7 @@ internal partial class SomeObjectInvoker : SomeObject { public SomeObjectInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs index f168b146d..c47bfcbe1 100644 --- a/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs +++ b/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Integer", DoNotGenerateAcw=true)] public partial class Integer : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Integer", typeof (Integer)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Integer", typeof (Integer)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs index 114668133..1ad979f35 100644 --- a/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs @@ -10,7 +10,7 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends java.lang.Object"})] public partial class A : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/StaticFields/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/StaticFields/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/StaticFields/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/StaticFields/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs index dc35bd34b..ea3f14c5b 100644 --- a/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs @@ -41,7 +41,7 @@ public static int Value2 { } } } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/StaticMethods/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/StaticMethods/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/StaticMethods/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/StaticMethods/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs index 9f479dcb2..43fd1f843 100644 --- a/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/StaticProperties/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/StaticProperties/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/StaticProperties/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/StaticProperties/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs index c7a906abd..4426ca735 100644 --- a/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs @@ -9,7 +9,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs index 49b7bde5f..a25c31496 100644 --- a/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs +++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs @@ -9,7 +9,7 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/FilterOutputStream", DoNotGenerateAcw=true)] public partial class FilterOutputStream : global::Java.IO.OutputStream { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/io/FilterOutputStream", typeof (FilterOutputStream)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/FilterOutputStream", typeof (FilterOutputStream)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs index 844e63c6a..843297add 100644 --- a/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs +++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs @@ -9,7 +9,7 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/IOException", DoNotGenerateAcw=true)] public abstract partial class IOException : global::Java.Lang.Throwable { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/io/IOException", typeof (IOException)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/IOException", typeof (IOException)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -64,7 +64,7 @@ internal partial class IOExceptionInvoker : IOException { public IOExceptionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/io/IOException", typeof (IOExceptionInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/IOException", typeof (IOExceptionInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs index 3369efd9b..b6472a250 100644 --- a/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs +++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs @@ -9,7 +9,7 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/InputStream", DoNotGenerateAcw=true)] public abstract partial class InputStream : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/io/InputStream", typeof (InputStream)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/InputStream", typeof (InputStream)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -324,7 +324,7 @@ internal partial class InputStreamInvoker : InputStream { public InputStreamInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/io/InputStream", typeof (InputStreamInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/InputStream", typeof (InputStreamInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs index 380c07f0c..e0efda25a 100644 --- a/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs +++ b/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs @@ -9,7 +9,7 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/OutputStream", DoNotGenerateAcw=true)] public abstract partial class OutputStream : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/io/OutputStream", typeof (OutputStream)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/OutputStream", typeof (OutputStream)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -205,7 +205,7 @@ internal partial class OutputStreamInvoker : OutputStream { public OutputStreamInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/io/OutputStream", typeof (OutputStreamInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/OutputStream", typeof (OutputStreamInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/Streams/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/Streams/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs index 33eb9ee45..c9c94cab2 100644 --- a/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Throwable", DoNotGenerateAcw=true)] public partial class Throwable { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Throwable", typeof (Throwable)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Throwable", typeof (Throwable)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.String.cs b/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.String.cs index f65c17266..315a38c9e 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.String.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Java.Lang.String.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/String", DoNotGenerateAcw=true)] public sealed partial class String : global::Java.Lang.Object { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/String", typeof (String)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/String", typeof (String)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs index 757f6627f..e59f60afd 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs @@ -9,7 +9,7 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericImplementation", DoNotGenerateAcw=true)] public partial class GenericImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericImplementation", typeof (GenericImplementation)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericImplementation", typeof (GenericImplementation)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 429b3c759..d44af5ec0 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -9,7 +9,7 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericObjectPropertyImplementation", DoNotGenerateAcw=true)] public partial class GenericObjectPropertyImplementation : global::Java.Lang.Object, global::Test.ME.IGenericPropertyInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericObjectPropertyImplementation", typeof (GenericObjectPropertyImplementation)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericObjectPropertyImplementation", typeof (GenericObjectPropertyImplementation)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs index b5a04da47..f1d071ba0 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -9,7 +9,7 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericStringImplementation", DoNotGenerateAcw=true)] public partial class GenericStringImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericStringImplementation", typeof (GenericStringImplementation)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericStringImplementation", typeof (GenericStringImplementation)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index 8be916bd9..a2c6d8144 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -9,7 +9,7 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericStringPropertyImplementation", DoNotGenerateAcw=true)] public partial class GenericStringPropertyImplementation : global::Java.Lang.Object, global::Test.ME.IGenericPropertyInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericStringPropertyImplementation", typeof (GenericStringPropertyImplementation)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericStringPropertyImplementation", typeof (GenericStringPropertyImplementation)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs index f9e6a81eb..25fed6a0b 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs @@ -19,7 +19,7 @@ public partial interface IGenericInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("test/me/GenericInterface", DoNotGenerateAcw=true)] internal partial class IGenericInterfaceInvoker : global::Java.Lang.Object, IGenericInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericInterface", typeof (IGenericInterfaceInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericInterface", typeof (IGenericInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs index d13e95d02..b481c150d 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -22,7 +22,7 @@ public partial interface IGenericPropertyInterface : IJavaObject, IJavaPeerable [global::Android.Runtime.Register ("test/me/GenericPropertyInterface", DoNotGenerateAcw=true)] internal partial class IGenericPropertyInterfaceInvoker : global::Java.Lang.Object, IGenericPropertyInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericPropertyInterface", typeof (IGenericPropertyInterfaceInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericPropertyInterface", typeof (IGenericPropertyInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs index 3eb42e853..258daa29f 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs @@ -28,7 +28,7 @@ internal TestInterface () } } - static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterface", typeof (TestInterface)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterface", typeof (TestInterface)); } [Register ("test/me/TestInterface", DoNotGenerateAcw=true)] @@ -80,7 +80,7 @@ public static string Identity (this Test.ME.ITestInterface self, string value) [global::Android.Runtime.Register ("test/me/TestInterface", DoNotGenerateAcw=true)] internal partial class ITestInterfaceInvoker : global::Java.Lang.Object, ITestInterface { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterface", typeof (ITestInterfaceInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterface", typeof (ITestInterfaceInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 64cb22ac1..4d44c73e1 100644 --- a/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -31,7 +31,7 @@ public static class InterfaceConsts { } } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementation)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementation)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -158,7 +158,7 @@ internal partial class TestInterfaceImplementationInvoker : TestInterfaceImpleme public TestInterfaceImplementationInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementationInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementationInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs index b36b97fe1..648ab525b 100644 --- a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs +++ b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs @@ -10,7 +10,7 @@ namespace Java.Lang { [global::Java.Interop.JavaTypeParameters (new string [] {"E extends java.lang.Enum"})] public abstract partial class Enum : global::Java.Lang.Object, global::Java.Lang.IComparable { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Enum", typeof (Enum)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Enum", typeof (Enum)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; @@ -54,7 +54,7 @@ internal partial class EnumInvoker : Enum, global::Java.Lang.IComparable { public EnumInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {} - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Enum", typeof (EnumInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Enum", typeof (EnumInvoker)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } diff --git a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs index bc7190ab5..5eeecaf25 100644 --- a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs @@ -19,7 +19,7 @@ public partial interface IComparable : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/lang/Comparable", DoNotGenerateAcw=true)] internal partial class IComparableInvoker : global::Java.Lang.Object, IComparable { - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Comparable", typeof (IComparableInvoker)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Comparable", typeof (IComparableInvoker)); static IntPtr java_class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs index ee4555370..55ef5b652 100644 --- a/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs +++ b/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.State.cs @@ -81,7 +81,7 @@ public sealed partial class State : global::Java.Lang.Enum { return global::Java.Lang.Object.GetObject (__v.Handle, JniHandleOwnership.TransferLocalRef); } } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/State", typeof (State)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/State", typeof (State)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/java.util.List/Java.Lang.Object.cs b/tests/generator-Tests/expected.ji/java.util.List/Java.Lang.Object.cs index 391e3834e..0c8b61a65 100644 --- a/tests/generator-Tests/expected.ji/java.util.List/Java.Lang.Object.cs +++ b/tests/generator-Tests/expected.ji/java.util.List/Java.Lang.Object.cs @@ -9,7 +9,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs index 49ed0241f..dc63ea656 100644 --- a/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs @@ -163,7 +163,7 @@ public partial class SomeObject : global::Java.Lang.Object { } } } - internal static new readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; diff --git a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs index 2873d8df0..5032a5085 100644 --- a/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs +++ b/tools/generator/Java.Interop.Tools.Generator.CodeGeneration/JavaInteropCodeGenerator.cs @@ -29,7 +29,7 @@ static string GetInvokeType (string type) internal override void WriteClassHandle (ClassGen type, string indent, bool requireNew) { - WritePeerMembers (indent + '\t', true, requireNew, type.RawJniName, type.Name, false); + WritePeerMembers (indent + '\t', type.RawJniName, type.Name, false); writer.WriteLine ("{0}\tinternal static {1}IntPtr class_ref {{", indent, requireNew ? "new " : string.Empty); writer.WriteLine ("{0}\t\tget {{", indent); @@ -55,12 +55,12 @@ internal override void WriteClassHandle (ClassGen type, string indent, bool requ internal override void WriteClassHandle (InterfaceGen type, string indent, string declaringType) { - WritePeerMembers (indent, false, true, type.RawJniName, declaringType, type.Name == declaringType); + WritePeerMembers (indent, type.RawJniName, declaringType, type.Name == declaringType); } internal override void WriteClassInvokerHandle (ClassGen type, string indent, string declaringType) { - WritePeerMembers (indent, true, true, type.RawJniName, declaringType, false); + WritePeerMembers (indent, type.RawJniName, declaringType, false); writer.WriteLine (); writer.WriteLine ("{0}public override global::Java.Interop.JniPeerMembers JniPeerMembers {{", indent); @@ -75,7 +75,7 @@ internal override void WriteClassInvokerHandle (ClassGen type, string indent, st internal override void WriteInterfaceInvokerHandle (InterfaceGen type, string indent, string declaringType) { - WritePeerMembers (indent, true, true, type.RawJniName, declaringType, false); + WritePeerMembers (indent, type.RawJniName, declaringType, false); writer.WriteLine (); writer.WriteLine ("{0}static IntPtr java_class_ref {{", indent); @@ -262,9 +262,9 @@ internal override void WriteFieldSetBody (Field field, string indent, GenBase ty writer.WriteLine ("{0}}}", indent); } - void WritePeerMembers (string indent, bool isInternal, bool isNew, string rawJniType, string declaringType, bool isInterface) + void WritePeerMembers (string indent, string rawJniType, string declaringType, bool isInterface) { - var signature = $"{(isInternal ? "internal " : "")}static {(isNew ? "new " : "")}readonly JniPeerMembers _members = "; + var signature = "static readonly JniPeerMembers _members = "; var type = $"new {GetPeerMembersType ()} (\"{rawJniType}\", typeof ({declaringType}){(isInterface ? ", isInterface: true" : string.Empty)});"; writer.WriteLine ($"{indent}{signature}{type}");