From 7719e5edda345f6db8c5fa7ccb1b4e526243ec4d Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Fri, 4 Sep 2026 14:22:40 +0200 Subject: [PATCH 1/2] [generator] Remove class_ref compatibility getters Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../XAJavaInterop1-NRT/WriteClass.txt | 6 +- .../XAJavaInterop1-NRT/WriteInterface.txt | 8 +-- .../WriteMethodWithCharSequenceArrays.txt | 6 +- .../XAJavaInterop1-NRT/WriteObjectField.txt | 6 +- .../ObsoleteInterfaceAlternativeClass.txt | 8 +-- .../XAJavaInterop1/WriteClass.txt | 6 +- .../WriteConstSugarInterfaceFields.txt | 2 +- .../WriteDefaultInterfaceMethodInvoker.txt | 6 +- .../WriteDuplicateInterfaceEventArgs.txt | 6 +- .../XAJavaInterop1/WriteInterface.txt | 8 +-- .../WriteInterfaceDefaultMethod.txt | 6 +- .../WriteInterfaceDefaultProperty.txt | 6 +- ...riteInterfaceDefaultPropertyGetterOnly.txt | 6 +- .../WriteInterfaceFieldAsDimProperty.txt | 8 +-- .../WriteInterfaceRedeclaredDefaultMethod.txt | 8 +-- ...iteKotlinUnsignedArrayTypeMethodsClass.txt | 6 +- ...KotlinUnsignedArrayTypePropertiesClass.txt | 6 +- .../WriteKotlinUnsignedTypeMethodsClass.txt | 6 +- ...WriteKotlinUnsignedTypePropertiesClass.txt | 6 +- .../WriteMethodWithCharSequenceArrays.txt | 6 +- .../WriteNestedInterfaceClass.txt | 12 +--- .../WriteNestedInterfaceTypes.txt | 12 +--- .../XAJavaInterop1/WriteObjectField.txt | 6 +- .../WriteStaticInterfaceMethod.txt | 8 +-- .../WriteStaticInterfaceProperty.txt | 6 +- .../WriteUnnestedInterfaceTypes.txt | 12 +--- .../Unit-Tests/CodeGeneratorTests.cs | 25 ++----- .../SourceWriters/PeerMembersFieldTests.cs | 4 +- .../AccessModifiers/Java.Lang.Object.cs | 6 +- .../Xamarin.Test.BasePublicClass.cs | 6 +- .../Xamarin.Test.ExtendPublicClass.cs | 6 +- .../Xamarin.Test.IExtendedInterface.cs | 8 +-- .../Xamarin.Test.PublicClass.cs | 12 +--- .../Xamarin.Test.PublicFinalClass.cs | 6 +- .../AccessModifiers/Xamarin.Test.TestClass.cs | 6 +- .../Adapters/Java.Lang.Object.cs | 6 +- .../Adapters/Xamarin.Test.AbsSpinner.cs | 8 +-- .../Adapters/Xamarin.Test.AdapterView.cs | 8 +-- .../Xamarin.Test.GenericReturnObject.cs | 6 +- .../Adapters/Xamarin.Test.IAdapter.cs | 6 +- .../Adapters/Xamarin.Test.ISpinnerAdapter.cs | 8 +-- .../Java.Lang.Object.cs | 6 +- .../Xamarin.Test.SomeObject.cs | 8 +-- .../expected.xaji/Arrays/Java.Lang.Object.cs | 6 +- .../Arrays/Xamarin.Test.SomeObject.cs | 6 +- .../CSharpKeywords/Java.Lang.Object.cs | 6 +- .../CSharpKeywords/Java.Lang.Throwable.cs | 6 +- .../Xamarin.Test.CSharpKeywords.cs | 6 +- .../Constructors/Java.Lang.Object.cs | 6 +- .../Constructors/Xamarin.Test.SomeObject.cs | 6 +- .../Constructors/Xamarin.Test.SomeObject2.cs | 6 +- .../Core_ClassParse/Java.Lang.Object.cs | 6 +- .../Core_ClassParse/Java.Lang.String.cs | 6 +- .../Xamarin.Google.Composable.MyClass.cs | 6 +- .../Xamarin.Test.Invalidnames.In.cs | 6 +- ...in.Test.Invalidnames.InvalidNameMembers.cs | 6 +- .../Core_Jar2Xml/Android.Text.ISpannable.cs | 8 +-- .../Core_Jar2Xml/Android.Text.ISpanned.cs | 6 +- .../Android.Text.SpannableString.cs | 6 +- .../Android.Text.SpannableStringInternal.cs | 8 +-- .../Core_Jar2Xml/Android.Views.View.cs | 12 +--- .../Core_Jar2Xml/Java.Lang.Object.cs | 6 +- ...roid.Exoplayer.Drm.FrameworkMediaCrypto.cs | 6 +- ...Android.Exoplayer.Drm.FrameworkMediaDrm.cs | 6 +- ...e.Android.Exoplayer.Drm.IExoMediaCrypto.cs | 6 +- ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs | 12 +--- .../GenericArguments/Java.Lang.Object.cs | 6 +- .../Java.Lang.Object.cs | 6 +- .../Xamarin.Test.II1.cs | 6 +- .../Xamarin.Test.II2.cs | 6 +- .../Xamarin.Test.SomeObject.cs | 6 +- .../Xamarin.Test.SomeObject2.cs | 8 +-- .../NestedTypes/Java.Lang.Object.cs | 6 +- .../Xamarin.Test.NotificationCompatBase.cs | 28 ++------ .../NonStaticFields/Java.Lang.Object.cs | 6 +- .../Xamarin.Test.SomeObject.cs | 6 +- .../NormalMethods/Java.Lang.Class.cs | 6 +- .../NormalMethods/Java.Lang.Integer.cs | 6 +- .../NormalMethods/Java.Lang.Object.cs | 6 +- .../NormalMethods/Java.Lang.Throwable.cs | 6 +- .../NormalMethods/Xamarin.Test.A.cs | 12 +--- .../NormalMethods/Xamarin.Test.C.cs | 6 +- .../NormalMethods/Xamarin.Test.SomeObject.cs | 6 +- .../NormalProperties/Java.Lang.Object.cs | 6 +- .../Xamarin.Test.SomeObject.cs | 8 +-- .../ParameterXPath/Java.Lang.Integer.cs | 6 +- .../ParameterXPath/Java.Lang.Object.cs | 6 +- .../ParameterXPath/Java.Util.IList.cs | 6 +- .../ParameterXPath/Xamarin.Test.A.cs | 6 +- .../StaticFields/Java.Lang.Object.cs | 6 +- .../StaticFields/Xamarin.Test.SomeObject.cs | 6 +- .../StaticMethods/Java.Lang.Object.cs | 6 +- .../StaticMethods/Xamarin.Test.SomeObject.cs | 6 +- .../StaticProperties/Java.Lang.Object.cs | 6 +- .../Xamarin.Test.SomeObject.cs | 6 +- .../Streams/Java.IO.FilterOutputStream.cs | 6 +- .../Streams/Java.IO.IOException.cs | 8 +-- .../Streams/Java.IO.InputStream.cs | 8 +-- .../Streams/Java.IO.OutputStream.cs | 8 +-- .../expected.xaji/Streams/Java.Lang.Object.cs | 6 +- .../Streams/Java.Lang.Throwable.cs | 6 +- .../TestInterface/ClassWithoutNamespace.cs | 8 +-- .../IInterfaceWithoutNamespace.cs | 6 +- .../TestInterface/Java.Lang.Object.cs | 6 +- .../TestInterface/Java.Lang.String.cs | 6 +- .../TestInterface/Java.Util.ICollection.cs | 6 +- .../TestInterface/Java.Util.IDeque.cs | 10 +-- .../TestInterface/Java.Util.IQueue.cs | 8 +-- .../Test.ME.GenericImplementation.cs | 6 +- ....ME.GenericObjectPropertyImplementation.cs | 6 +- .../Test.ME.GenericStringImplementation.cs | 6 +- ....ME.GenericStringPropertyImplementation.cs | 6 +- .../Test.ME.IGenericInterface.cs | 6 +- .../Test.ME.IGenericPropertyInterface.cs | 6 +- .../TestInterface/Test.ME.ITestInterface.cs | 8 +-- .../Test.ME.TestInterfaceImplementation.cs | 8 +-- .../java.lang.Enum/Java.Lang.Enum.cs | 8 +-- .../java.lang.Enum/Java.Lang.IComparable.cs | 6 +- .../java.lang.Enum/Java.Lang.Object.cs | 6 +- .../java.lang.Enum/Java.Lang.State.cs | 6 +- .../java.lang.Object/Java.Lang.Object.cs | 6 +- .../java.util.List/Java.Lang.Object.cs | 6 +- .../java.util.List/Java.Util.IList.cs | 6 +- .../java.util.List/Xamarin.Test.SomeObject.cs | 6 +- .../generator/SourceWriters/BoundClass.cs | 10 --- .../generator/SourceWriters/ClassInvokers.cs | 38 +---------- .../SourceWriters/InterfaceInvokerClass.cs | 4 -- .../InterfaceMemberAlternativeClass.cs | 10 +-- .../SourceWriters/PeerMembersField.cs | 2 +- src/Mono.Android/Android.App/Notification.cs | 5 +- .../Android.Content/ContentValues.cs | 28 ++++---- .../Android.Content/CursorLoader.cs | 2 +- src/Mono.Android/Android.OS/AsyncTask.cs | 21 +++--- src/Mono.Android/Android.Util/SparseArray.cs | 32 +++++---- .../Android.Widget/AbsListView.cs | 6 +- .../Android.Widget/AdapterView.cs | 22 +++--- .../Android.Widget/AdapterViewAnimator.cs | 16 ++--- .../Android.Widget/ArrayAdapter.cs | 68 ++++++++++--------- .../Android.Widget/BaseAdapter.cs | 17 ++--- src/Mono.Android/Android.Widget/TextView.cs | 2 +- src/Mono.Android/Java.Lang/Throwable.cs | 2 +- .../BindingTests.cs | 5 +- .../Xamarin.Android.McwGen-Tests/Timing.cs | 12 ++-- .../Android.Content/ContentValuesTests.cs | 20 ++++++ .../Android.Util/SparseArrayTests.cs | 20 ++++++ .../Android.Widget/AdapterTests.cs | 10 +++ 146 files changed, 345 insertions(+), 878 deletions(-) create mode 100644 tests/Mono.Android-Tests/Mono.Android-Tests/Android.Content/ContentValuesTests.cs create mode 100644 tests/Mono.Android-Tests/Mono.Android-Tests/Android.Util/SparseArrayTests.cs diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt index 79bbf1b741a..b0692031cc3 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='java.code']/class[@name='MyClass']" [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt index 98fb449c6f5..ac403a9edc9 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt @@ -15,7 +15,7 @@ public abstract class MyInterface : Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } @@ -77,10 +77,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -99,7 +95,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt index b266160f0a1..a9f5a8f0389 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='com.example']/class[@name='MyClass']" [global::Android.Runtime.Register ("com/example/MyClass", DoNotGenerateAcw=true)] public partial class MyClass : Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("com/example/MyClass", typeof (MyClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/example/MyClass", typeof (MyClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteObjectField.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteObjectField.txt index f8d48920f86..b45d5b12b5c 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteObjectField.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteObjectField.txt @@ -23,11 +23,7 @@ public partial class MyClass { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt index 4c026482296..cb2e1a37195 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt @@ -54,7 +54,7 @@ public abstract class Parent : Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/Parent", typeof (Parent)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/Parent", typeof (Parent)); } @@ -113,10 +113,6 @@ public partial interface IParent : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/xamarin/android/Parent", DoNotGenerateAcw=true)] internal partial class IParentInvoker : global::Java.Lang.Object, IParent { - static IntPtr java_class_ref { - get { return _members_com_xamarin_android_Parent.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -135,7 +131,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { get { return _members_com_xamarin_android_Parent.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); + private static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); public IParentInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index 1c657d1b170..c191a99b430 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='java.code']/class[@name='MyClass']" [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt index b488f9a2fae..dbee12ca2be 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt @@ -42,7 +42,7 @@ public abstract class MyInterface : Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index 8499e8a02e9..d1c1150d5bb 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -42,10 +42,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -64,7 +60,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt index 48cd25e096e..36d01c8d72f 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -13,10 +13,6 @@ public partial interface AnimatorListener : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/AnimatorListener", DoNotGenerateAcw=true)] internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, AnimatorListener { - static IntPtr java_class_ref { - get { return _members_java_code_AnimatorListener.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -35,7 +31,7 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima get { return _members_java_code_AnimatorListener.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_AnimatorListener = new XAPeerMembers ("java/code/AnimatorListener", typeof (AnimatorListenerInvoker)); + private static readonly JniPeerMembers _members_java_code_AnimatorListener = new XAPeerMembers ("java/code/AnimatorListener", typeof (AnimatorListenerInvoker)); public AnimatorListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index 0a5b6b615ca..c53d5ac27da 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -15,7 +15,7 @@ public abstract class MyInterface : Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } @@ -77,10 +77,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -99,7 +95,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index 3f7764f0a3f..83872b2856e 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -38,10 +38,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -60,7 +56,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index 5abe36fe1fa..4862422e2fb 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -71,10 +71,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -93,7 +89,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index 54998f6fc7f..793a737d65f 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -40,10 +40,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -62,7 +58,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt index 966bebbd494..9167d9b90cc 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt @@ -28,7 +28,7 @@ public abstract class MyInterface : Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/MyInterface", typeof (MyInterface)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/MyInterface", typeof (MyInterface)); } @@ -70,10 +70,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/xamarin/android/MyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_com_xamarin_android_MyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -92,7 +88,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_com_xamarin_android_MyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_xamarin_android_MyInterface = new XAPeerMembers ("com/xamarin/android/MyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_com_xamarin_android_MyInterface = new XAPeerMembers ("com/xamarin/android/MyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt index c2528f201bd..91657307737 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt @@ -9,10 +9,6 @@ public partial interface IMyInterface2 : java.code.IMyInterface { [global::Android.Runtime.Register ("java/code/IMyInterface2", DoNotGenerateAcw=true)] internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInterface2 { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface2.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -31,9 +27,9 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter get { return _members_java_code_IMyInterface2.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface2Invoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface2Invoker)); - static readonly JniPeerMembers _members_java_code_IMyInterface2 = new XAPeerMembers ("java/code/IMyInterface2", typeof (IMyInterface2Invoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface2 = new XAPeerMembers ("java/code/IMyInterface2", typeof (IMyInterface2Invoker)); public IMyInterface2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt index cbdfcb4f6c2..735f3d8addf 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='java.code']/class[@name='MyClass']" [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt index 8736f0eab7d..5f10ae890df 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='java.code']/class[@name='MyClass']" [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt index 3b132be4563..dc5843301f5 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='java.code']/class[@name='MyClass']" [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt index 7538d95984a..b7656c12adc 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='java.code']/class[@name='MyClass']" [global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)] public partial class MyClass { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt index 8c8faaf179f..143b7d4fad0 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt @@ -1,11 +1,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='com.example']/class[@name='MyClass']" [global::Android.Runtime.Register ("com/example/MyClass", DoNotGenerateAcw=true)] public partial class MyClass : Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("com/example/MyClass", typeof (MyClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/example/MyClass", typeof (MyClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt index 5704eb70f9e..6d2173c62a2 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt @@ -10,11 +10,7 @@ public partial interface IParent : IJavaObject, IJavaPeerable { // Metadata.xml XPath class reference: path="/api/package[@name='com.xamarin.android']/class[@name='Parent.Child']" [global::Android.Runtime.Register ("com/xamarin/android/Parent$Child", DoNotGenerateAcw=true)] public partial class Child : Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/Parent$Child", typeof (Child)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/Parent$Child", typeof (Child)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -44,10 +40,6 @@ public partial interface IParent : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/xamarin/android/Parent", DoNotGenerateAcw=true)] internal partial class IParentInvoker : global::Java.Lang.Object, IParent { - static IntPtr java_class_ref { - get { return _members_com_xamarin_android_Parent.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -66,7 +58,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { get { return _members_com_xamarin_android_Parent.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); + private static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); public IParentInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt index 807d66da6bb..8cca579137b 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt @@ -20,10 +20,6 @@ public partial interface IParent : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/xamarin/android/Parent$Child", DoNotGenerateAcw=true)] internal partial class IChildInvoker : global::Java.Lang.Object, IChild { - static IntPtr java_class_ref { - get { return _members_com_xamarin_android_Parent_Child.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -42,7 +38,7 @@ public partial interface IParent : IJavaObject, IJavaPeerable { get { return _members_com_xamarin_android_Parent_Child.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_xamarin_android_Parent_Child = new XAPeerMembers ("com/xamarin/android/Parent$Child", typeof (IChildInvoker)); + private static readonly JniPeerMembers _members_com_xamarin_android_Parent_Child = new XAPeerMembers ("com/xamarin/android/Parent$Child", typeof (IChildInvoker)); public IChildInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -85,10 +81,6 @@ public partial interface IParent : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/xamarin/android/Parent", DoNotGenerateAcw=true)] internal partial class IParentInvoker : global::Java.Lang.Object, IParent { - static IntPtr java_class_ref { - get { return _members_com_xamarin_android_Parent.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -107,7 +99,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { get { return _members_com_xamarin_android_Parent.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); + private static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); public IParentInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteObjectField.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteObjectField.txt index bd1187d9dce..a2c70c15c09 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteObjectField.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteObjectField.txt @@ -23,11 +23,7 @@ public partial class MyClass { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass)); protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt index 65861a0f952..cef31d5c4e3 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt @@ -15,7 +15,7 @@ public abstract class MyInterface : Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); } @@ -48,10 +48,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -70,7 +66,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt index f85226e205d..5fea7c09847 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt @@ -31,10 +31,6 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)] internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface { - static IntPtr java_class_ref { - get { return _members_java_code_IMyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -53,7 +49,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf get { return _members_java_code_IMyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); + private static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker)); public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt index a918ca7e0dd..15f89ee3407 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt @@ -11,10 +11,6 @@ public partial interface IParentChild : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/xamarin/android/Parent$Child", DoNotGenerateAcw=true)] internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentChild { - static IntPtr java_class_ref { - get { return _members_com_xamarin_android_Parent_Child.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -33,7 +29,7 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh get { return _members_com_xamarin_android_Parent_Child.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_xamarin_android_Parent_Child = new XAPeerMembers ("com/xamarin/android/Parent$Child", typeof (IParentChildInvoker)); + private static readonly JniPeerMembers _members_com_xamarin_android_Parent_Child = new XAPeerMembers ("com/xamarin/android/Parent$Child", typeof (IParentChildInvoker)); public IParentChildInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -85,10 +81,6 @@ public partial interface IParent : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/xamarin/android/Parent", DoNotGenerateAcw=true)] internal partial class IParentInvoker : global::Java.Lang.Object, IParent { - static IntPtr java_class_ref { - get { return _members_com_xamarin_android_Parent.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -107,7 +99,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { get { return _members_com_xamarin_android_Parent.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); + private static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker)); public IParentInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs index 3058ada62a0..7ec01a52314 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs @@ -1373,12 +1373,8 @@ class XAJavaInteropCodeGeneratorTests : AnyJavaInteropCodeGeneratorTests protected override CodeGenerationTarget Target => CodeGenerationTarget.XAJavaInterop1; [Test] - public void WriteClassExternalBase () + public void WriteClassPeerMembers () { - // Tests the case where a class inherits from a class that is not in the same assembly. - // Specifically, the internal class_ref field does NOT need the new modifier. - // - This prevents a CS0109 warning from being generated. - options.SymbolTable.AddType (new TestClass (null, "Java.Lang.Object")); var @class = SupportTypeBuilder.CreateClass ("java.code.MyClass", options, "Java.Lang.Object"); @@ -1389,33 +1385,26 @@ public void WriteClassExternalBase () generator.Context.ContextTypes.Pop (); var result = writer.ToString ().NormalizeLineEndings (); - Assert.True (result.Contains ("internal static IntPtr class_ref".NormalizeLineEndings ())); - Assert.False (result.Contains ("internal static new IntPtr class_ref".NormalizeLineEndings ())); + Assert.True (result.Contains ("private static readonly JniPeerMembers _members".NormalizeLineEndings ())); + Assert.False (result.Contains ("class_ref".NormalizeLineEndings ())); } [Test] - public void WriteClassInternalBase () + public void WriteFinalClassPeerMembers () { - // Tests the case where a class inherits from Java.Lang.Object and is in the same assembly. - // Specifically, the internal class_ref field does need the new modifier. - // - This prevents a CS0108 warning from being generated. - options.SymbolTable.AddType (new TestClass (null, "Java.Lang.Object")); var @class = SupportTypeBuilder.CreateClass ("java.code.MyClass", options, "Java.Lang.Object"); + @class.IsFinal = true; @class.Validate (options, new GenericParameterDefinitionList (), generator.Context); - // FromXml is set to true when a class is set to true when the api.xml contains an entry for the class. - // Therefore, if a class's base has FromXml set to true, the class and its base will be in the same C# assembly. - @class.BaseGen.FromXml = true; - generator.Context.ContextTypes.Push (@class); generator.WriteType (@class, string.Empty, new GenerationInfo ("", "", "MyAssembly")); generator.Context.ContextTypes.Pop (); var result = writer.ToString ().NormalizeLineEndings (); - Assert.True (result.Contains ("internal static new IntPtr class_ref".NormalizeLineEndings ())); - Assert.False (result.Contains ("internal static IntPtr class_ref".NormalizeLineEndings ())); + Assert.True (result.Contains ("private static readonly JniPeerMembers _members".NormalizeLineEndings ())); + Assert.False (result.Contains ("class_ref".NormalizeLineEndings ())); } [Test] diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/SourceWriters/PeerMembersFieldTests.cs b/external/Java.Interop/tests/generator-Tests/Unit-Tests/SourceWriters/PeerMembersFieldTests.cs index 947ae59be20..98e9ac50c95 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/SourceWriters/PeerMembersFieldTests.cs +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/SourceWriters/PeerMembersFieldTests.cs @@ -11,9 +11,9 @@ public class PeerMembersFieldTests : SourceWritersTestBase [Test] public void PeerMembersField_Class () { - var field = new PeerMembersField (new CodeGenerationOptions { CodeGenerationTarget = CodeGenerationTarget.JavaInterop1 }, "B", "MyJavaType", false); + var field = new PeerMembersField (new CodeGenerationOptions { CodeGenerationTarget = CodeGenerationTarget.XAJavaInterop1 }, "B", "MyJavaType", false); - Assert.AreEqual ("static readonly JniPeerMembers _members = new JniPeerMembers (\"B\", typeof (MyJavaType));", GetOutput (field).Trim ()); + Assert.AreEqual ("private static readonly JniPeerMembers _members = new XAPeerMembers (\"B\", typeof (MyJavaType));", GetOutput (field).Trim ()); } [Test] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index f83bcd5db70..4b8cb8d7200 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='BasePublicClass']" [global::Android.Runtime.Register ("xamarin/test/BasePublicClass", DoNotGenerateAcw=true)] public partial class BasePublicClass : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/BasePublicClass", typeof (BasePublicClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/BasePublicClass", typeof (BasePublicClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 8ba4146dee1..766283ec21c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='ExtendPublicClass']" [global::Android.Runtime.Register ("xamarin/test/ExtendPublicClass", DoNotGenerateAcw=true)] public partial class ExtendPublicClass : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/ExtendPublicClass", typeof (ExtendPublicClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/ExtendPublicClass", typeof (ExtendPublicClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index 652e6a115a0..1da5096d55e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -20,10 +20,6 @@ public partial interface IExtendedInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/ExtendedInterface", DoNotGenerateAcw=true)] internal partial class IExtendedInterfaceInvoker : global::Java.Lang.Object, IExtendedInterface { - static IntPtr java_class_ref { - get { return _members_xamarin_test_ExtendedInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -42,9 +38,9 @@ protected override IntPtr ThresholdClass { get { return _members_xamarin_test_ExtendedInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_xamarin_test_BaseInterface = new XAPeerMembers ("xamarin/test/BaseInterface", typeof (IExtendedInterfaceInvoker)); + private static readonly JniPeerMembers _members_xamarin_test_BaseInterface = new XAPeerMembers ("xamarin/test/BaseInterface", typeof (IExtendedInterfaceInvoker)); - static readonly JniPeerMembers _members_xamarin_test_ExtendedInterface = new XAPeerMembers ("xamarin/test/ExtendedInterface", typeof (IExtendedInterfaceInvoker)); + private static readonly JniPeerMembers _members_xamarin_test_ExtendedInterface = new XAPeerMembers ("xamarin/test/ExtendedInterface", typeof (IExtendedInterfaceInvoker)); public IExtendedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs index edf9b90f794..f1f674406b7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -29,10 +29,6 @@ protected internal partial interface IProtectedInterface : IJavaObject, IJavaPee [global::Android.Runtime.Register ("xamarin/test/PublicClass$ProtectedInterface", DoNotGenerateAcw=true)] internal partial class IProtectedInterfaceInvoker : global::Java.Lang.Object, IProtectedInterface { - static IntPtr java_class_ref { - get { return _members_xamarin_test_PublicClass_ProtectedInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -51,7 +47,7 @@ protected override IntPtr ThresholdClass { get { return _members_xamarin_test_PublicClass_ProtectedInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_xamarin_test_PublicClass_ProtectedInterface = new XAPeerMembers ("xamarin/test/PublicClass$ProtectedInterface", typeof (IProtectedInterfaceInvoker)); + private static readonly JniPeerMembers _members_xamarin_test_PublicClass_ProtectedInterface = new XAPeerMembers ("xamarin/test/PublicClass$ProtectedInterface", typeof (IProtectedInterfaceInvoker)); public IProtectedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -88,11 +84,7 @@ public unsafe void Foo () } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/PublicClass", typeof (PublicClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/PublicClass", typeof (PublicClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs index f1258d3ecc9..4d9840f3755 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='PublicFinalClass']" [global::Android.Runtime.Register ("xamarin/test/PublicFinalClass", DoNotGenerateAcw=true)] public sealed partial class PublicFinalClass : global::Xamarin.Test.BasePublicClass { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/PublicFinalClass", typeof (PublicFinalClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/PublicFinalClass", typeof (PublicFinalClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs index 411928bc99a..6b27178a54a 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='TestClass']" [global::Android.Runtime.Register ("xamarin/test/TestClass", DoNotGenerateAcw=true)] public partial class TestClass : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/TestClass", typeof (TestClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/TestClass", typeof (TestClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs index ab7a8784bd9..1276291d761 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='AbsSpinner']" [global::Android.Runtime.Register ("xamarin/test/AbsSpinner", DoNotGenerateAcw=true)] public abstract partial class AbsSpinner : Xamarin.Test.AdapterView { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinner)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinner)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -120,7 +116,7 @@ public AbsSpinnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (ha { } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinnerInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AbsSpinner", typeof (AbsSpinnerInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs index 06c4c550254..b81eab7eb1c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs @@ -19,11 +19,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/AdapterView", DoNotGenerateAcw=true)] [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.Adapter"})] public abstract partial class AdapterView : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AdapterView", typeof (AdapterView)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AdapterView", typeof (AdapterView)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -106,7 +102,7 @@ public AdapterViewInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h { } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AdapterView", typeof (AdapterViewInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/AdapterView", typeof (AdapterViewInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs index 027de617b7e..701c84d67b7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='GenericReturnObject']" [global::Android.Runtime.Register ("xamarin/test/GenericReturnObject", DoNotGenerateAcw=true)] public partial class GenericReturnObject : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/GenericReturnObject", typeof (GenericReturnObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/GenericReturnObject", typeof (GenericReturnObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.IAdapter.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.IAdapter.cs index 374ab964fde..2c56dfd2193 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.IAdapter.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.IAdapter.cs @@ -12,10 +12,6 @@ public partial interface IAdapter : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/Adapter", DoNotGenerateAcw=true)] internal partial class IAdapterInvoker : global::Java.Lang.Object, IAdapter { - static IntPtr java_class_ref { - get { return _members_xamarin_test_Adapter.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -34,7 +30,7 @@ protected override IntPtr ThresholdClass { get { return _members_xamarin_test_Adapter.ManagedPeerType; } } - static readonly JniPeerMembers _members_xamarin_test_Adapter = new XAPeerMembers ("xamarin/test/Adapter", typeof (IAdapterInvoker)); + private static readonly JniPeerMembers _members_xamarin_test_Adapter = new XAPeerMembers ("xamarin/test/Adapter", typeof (IAdapterInvoker)); public IAdapterInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.ISpinnerAdapter.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.ISpinnerAdapter.cs index 18f9641ccfa..5b6635ae109 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.ISpinnerAdapter.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.ISpinnerAdapter.cs @@ -12,10 +12,6 @@ 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 { - static IntPtr java_class_ref { - get { return _members_xamarin_test_SpinnerAdapter.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -34,9 +30,9 @@ protected override IntPtr ThresholdClass { get { return _members_xamarin_test_SpinnerAdapter.ManagedPeerType; } } - static readonly JniPeerMembers _members_xamarin_test_Adapter = new XAPeerMembers ("xamarin/test/Adapter", typeof (ISpinnerAdapterInvoker)); + private static readonly JniPeerMembers _members_xamarin_test_Adapter = new XAPeerMembers ("xamarin/test/Adapter", typeof (ISpinnerAdapterInvoker)); - static readonly JniPeerMembers _members_xamarin_test_SpinnerAdapter = new XAPeerMembers ("xamarin/test/SpinnerAdapter", typeof (ISpinnerAdapterInvoker)); + private static readonly JniPeerMembers _members_xamarin_test_SpinnerAdapter = new XAPeerMembers ("xamarin/test/SpinnerAdapter", typeof (ISpinnerAdapterInvoker)); public ISpinnerAdapterInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 4a45666913b..28852fee20a 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -38,11 +38,7 @@ public abstract partial class SomeObject : global::Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -125,7 +121,7 @@ public SomeObjectInvoker (IntPtr handle, JniHandleOwnership transfer) : base (ha { } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Xamarin.Test.SomeObject.cs index 92a40e3a2c1..b47614d31fa 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Arrays/Xamarin.Test.SomeObject.cs @@ -172,11 +172,7 @@ public IList Mylongs { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs index 311c44de33b..5e388eaadfe 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Throwable']" [global::Android.Runtime.Register ("java/lang/Throwable", DoNotGenerateAcw=true)] public partial class Throwable { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Throwable", typeof (Throwable)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Throwable", typeof (Throwable)); static Delegate cb_getMessage_GetMessage_Ljava_lang_String_; #pragma warning disable 0169 diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index c7d2c3aaba7..2453cc7d036 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='CSharpKeywords']" [global::Android.Runtime.Register ("xamarin/test/CSharpKeywords", DoNotGenerateAcw=true)] public partial class CSharpKeywords : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/CSharpKeywords", typeof (CSharpKeywords)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/CSharpKeywords", typeof (CSharpKeywords)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs index a5d4dd041e8..b8073d63a82 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']" [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs index b8bbda396cd..d7c4723128d 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject2']" [global::Android.Runtime.Register ("xamarin/test/SomeObject2", DoNotGenerateAcw=true)] public sealed partial class SomeObject2 : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.String.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.String.cs index ddbc5d2734c..e2d9379f4ab 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.String.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Java.Lang.String.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='String']" [global::Android.Runtime.Register ("java/lang/String", DoNotGenerateAcw=true)] public partial class String : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/String", typeof (String)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/String", typeof (String)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Google.Composable.MyClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Google.Composable.MyClass.cs index 67d3c554b0e..33be90e5245 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Google.Composable.MyClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Google.Composable.MyClass.cs @@ -18,11 +18,7 @@ namespace Xamarin.Google.Composable { // Metadata.xml XPath class reference: path="/api/package[@name='com.com.google.compose']/class[@name='MyClass']" [global::Android.Runtime.Register ("com/com/google/compose/MyClass", DoNotGenerateAcw=true)] public partial class MyClass : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("com/com/google/compose/MyClass", typeof (MyClass)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/com/google/compose/MyClass", typeof (MyClass)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.In.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.In.cs index f1f70a0ba3b..528d35bb9fd 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.In.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.In.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test.Invalidnames { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test.invalidnames']/class[@name='in']" [global::Android.Runtime.Register ("xamarin/test/invalidnames/in", DoNotGenerateAcw=true)] public partial class In : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/invalidnames/in", typeof (In)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/invalidnames/in", typeof (In)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.InvalidNameMembers.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.InvalidNameMembers.cs index e62398fc240..8ec78218190 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.InvalidNameMembers.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_ClassParse/Xamarin.Test.Invalidnames.InvalidNameMembers.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test.Invalidnames { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test.invalidnames']/class[@name='InvalidNameMembers']" [global::Android.Runtime.Register ("xamarin/test/invalidnames/InvalidNameMembers", DoNotGenerateAcw=true)] public partial class InvalidNameMembers : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/invalidnames/InvalidNameMembers", typeof (InvalidNameMembers)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/invalidnames/InvalidNameMembers", typeof (InvalidNameMembers)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs index 3ac495bb5c7..2aa60613e0c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs @@ -12,10 +12,6 @@ public partial interface ISpannable : global::Android.Text.ISpanned { [global::Android.Runtime.Register ("android/text/Spannable", DoNotGenerateAcw=true)] internal partial class ISpannableInvoker : global::Java.Lang.Object, ISpannable { - static IntPtr java_class_ref { - get { return _members_android_text_Spannable.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -34,9 +30,9 @@ protected override IntPtr ThresholdClass { get { return _members_android_text_Spannable.ManagedPeerType; } } - static readonly JniPeerMembers _members_android_text_Spannable = new XAPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker)); + private static readonly JniPeerMembers _members_android_text_Spannable = new XAPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker)); - static readonly JniPeerMembers _members_android_text_Spanned = new XAPeerMembers ("android/text/Spanned", typeof (ISpannableInvoker)); + private static readonly JniPeerMembers _members_android_text_Spanned = new XAPeerMembers ("android/text/Spanned", typeof (ISpannableInvoker)); public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs index 37abfa63214..a3c16a8661a 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs @@ -17,10 +17,6 @@ public partial interface ISpanned : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("android/text/Spanned", DoNotGenerateAcw=true)] internal partial class ISpannedInvoker : global::Java.Lang.Object, ISpanned { - static IntPtr java_class_ref { - get { return _members_android_text_Spanned.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -39,7 +35,7 @@ protected override IntPtr ThresholdClass { get { return _members_android_text_Spanned.ManagedPeerType; } } - static readonly JniPeerMembers _members_android_text_Spanned = new XAPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker)); + private static readonly JniPeerMembers _members_android_text_Spanned = new XAPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker)); public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs index f101c2f3c6c..dae7cb8681c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs @@ -18,11 +18,7 @@ namespace Android.Text { // Metadata.xml XPath class reference: path="/api/package[@name='android.text']/class[@name='SpannableString']" [global::Android.Runtime.Register ("android/text/SpannableString", DoNotGenerateAcw=true)] public partial class SpannableString : global::Android.Text.SpannableStringInternal, global::Android.Text.ISpannable { - static readonly JniPeerMembers _members = new XAPeerMembers ("android/text/SpannableString", typeof (SpannableString)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("android/text/SpannableString", typeof (SpannableString)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs index 0985ee1b062..6b34f1e53b4 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs @@ -18,11 +18,7 @@ namespace Android.Text { // Metadata.xml XPath class reference: path="/api/package[@name='android.text']/class[@name='SpannableStringInternal']" [global::Android.Runtime.Register ("android/text/SpannableStringInternal", DoNotGenerateAcw=true)] public abstract partial class SpannableStringInternal : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternal)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternal)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -92,7 +88,7 @@ public SpannableStringInternalInvoker (IntPtr handle, JniHandleOwnership transfe { } - static readonly JniPeerMembers _members = new XAPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternalInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternalInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs index 3a1c6b7f821..d1d12c3cc50 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs @@ -29,10 +29,6 @@ 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 { - static IntPtr java_class_ref { - get { return _members_android_view_View_OnClickListener.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -51,7 +47,7 @@ protected override IntPtr ThresholdClass { get { return _members_android_view_View_OnClickListener.ManagedPeerType; } } - static readonly JniPeerMembers _members_android_view_View_OnClickListener = new XAPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker)); + private static readonly JniPeerMembers _members_android_view_View_OnClickListener = new XAPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker)); public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -122,11 +118,7 @@ internal static bool __IsEmpty (IOnClickListenerImplementor value) } - static readonly JniPeerMembers _members = new XAPeerMembers ("android/view/View", typeof (View)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("android/view/View", typeof (View)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs index e3268911c23..e1c80a6040e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs @@ -18,11 +18,7 @@ namespace Com.Google.Android.Exoplayer.Drm { // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.exoplayer.drm']/class[@name='FrameworkMediaCrypto']" [global::Android.Runtime.Register ("com/google/android/exoplayer/drm/FrameworkMediaCrypto", DoNotGenerateAcw=true)] public sealed partial class FrameworkMediaCrypto : global::Java.Lang.Object, global::Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto { - static readonly JniPeerMembers _members = new XAPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaCrypto", typeof (FrameworkMediaCrypto)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaCrypto", typeof (FrameworkMediaCrypto)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs index 4e00d036000..dd9d575e8d5 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs @@ -18,11 +18,7 @@ namespace Com.Google.Android.Exoplayer.Drm { // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.exoplayer.drm']/class[@name='FrameworkMediaDrm']" [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 { - static readonly JniPeerMembers _members = new XAPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaDrm", typeof (FrameworkMediaDrm)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaDrm", typeof (FrameworkMediaDrm)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs index 21f300fe034..7361aab739e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs @@ -16,10 +16,6 @@ public partial interface IExoMediaCrypto : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("com/google/android/exoplayer/drm/ExoMediaCrypto", DoNotGenerateAcw=true)] internal partial class IExoMediaCryptoInvoker : global::Java.Lang.Object, IExoMediaCrypto { - static IntPtr java_class_ref { - get { return _members_com_google_android_exoplayer_drm_ExoMediaCrypto.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -38,7 +34,7 @@ protected override IntPtr ThresholdClass { get { return _members_com_google_android_exoplayer_drm_ExoMediaCrypto.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_google_android_exoplayer_drm_ExoMediaCrypto = new XAPeerMembers ("com/google/android/exoplayer/drm/ExoMediaCrypto", typeof (IExoMediaCryptoInvoker)); + private static readonly JniPeerMembers _members_com_google_android_exoplayer_drm_ExoMediaCrypto = new XAPeerMembers ("com/google/android/exoplayer/drm/ExoMediaCrypto", typeof (IExoMediaCryptoInvoker)); public IExoMediaCryptoInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index e5e00d5f16b..894fce68e2f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -17,10 +17,6 @@ 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 { - static IntPtr java_class_ref { - get { return _members_com_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -39,7 +35,7 @@ protected override IntPtr ThresholdClass { get { return _members_com_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener = new XAPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", typeof (IExoMediaDrmOnEventListenerInvoker)); + private static readonly JniPeerMembers _members_com_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener = new XAPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener", typeof (IExoMediaDrmOnEventListenerInvoker)); public IExoMediaDrmOnEventListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -191,10 +187,6 @@ 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 { - static IntPtr java_class_ref { - get { return _members_com_google_android_exoplayer_drm_ExoMediaDrm.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -213,7 +205,7 @@ protected override IntPtr ThresholdClass { get { return _members_com_google_android_exoplayer_drm_ExoMediaDrm.ManagedPeerType; } } - static readonly JniPeerMembers _members_com_google_android_exoplayer_drm_ExoMediaDrm = new XAPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm", typeof (IExoMediaDrmInvoker)); + private static readonly JniPeerMembers _members_com_google_android_exoplayer_drm_ExoMediaDrm = new XAPeerMembers ("com/google/android/exoplayer/drm/ExoMediaDrm", typeof (IExoMediaDrmInvoker)); public IExoMediaDrmInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index 57cfad2d233..f89af108dff 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -16,10 +16,6 @@ public partial interface II1 : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/I1", DoNotGenerateAcw=true)] internal partial class II1Invoker : global::Java.Lang.Object, II1 { - static IntPtr java_class_ref { - get { return _members_xamarin_test_I1.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -38,7 +34,7 @@ protected override IntPtr ThresholdClass { get { return _members_xamarin_test_I1.ManagedPeerType; } } - static readonly JniPeerMembers _members_xamarin_test_I1 = new XAPeerMembers ("xamarin/test/I1", typeof (II1Invoker)); + private static readonly JniPeerMembers _members_xamarin_test_I1 = new XAPeerMembers ("xamarin/test/I1", typeof (II1Invoker)); public II1Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index 3ff1c74b146..a20f2b04879 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -16,10 +16,6 @@ public partial interface II2 : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("xamarin/test/I2", DoNotGenerateAcw=true)] internal partial class II2Invoker : global::Java.Lang.Object, II2 { - static IntPtr java_class_ref { - get { return _members_xamarin_test_I2.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -38,7 +34,7 @@ protected override IntPtr ThresholdClass { get { return _members_xamarin_test_I2.ManagedPeerType; } } - static readonly JniPeerMembers _members_xamarin_test_I2 = new XAPeerMembers ("xamarin/test/I2", typeof (II2Invoker)); + private static readonly JniPeerMembers _members_xamarin_test_I2 = new XAPeerMembers ("xamarin/test/I2", typeof (II2Invoker)); public II2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index ad0b3332cf0..ef9eed63034 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']" [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 { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index e0d1154188b..1748e6d31e4 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject2']" [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 { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -109,7 +105,7 @@ public SomeObject2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (h { } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2Invoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject2", typeof (SomeObject2Invoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index ec8493f5cf0..67d69235aa9 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -32,10 +32,6 @@ 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 { - static IntPtr java_class_ref { - get { return _members_xamarin_test_NotificationCompatBase_Action_Factory.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -54,7 +50,7 @@ protected override IntPtr ThresholdClass { get { return _members_xamarin_test_NotificationCompatBase_Action_Factory.ManagedPeerType; } } - static readonly JniPeerMembers _members_xamarin_test_NotificationCompatBase_Action_Factory = new XAPeerMembers ("xamarin/test/NotificationCompatBase$Action$Factory", typeof (IFactoryInvoker)); + private static readonly JniPeerMembers _members_xamarin_test_NotificationCompatBase_Action_Factory = new XAPeerMembers ("xamarin/test/NotificationCompatBase$Action$Factory", typeof (IFactoryInvoker)); public IFactoryInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -94,11 +90,7 @@ private static IntPtr __n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (Action)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (Action)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -130,7 +122,7 @@ public ActionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle { } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (ActionInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (ActionInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -149,11 +141,7 @@ public ActionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='NotificationCompatBase.InstanceInner']" [global::Android.Runtime.Register ("xamarin/test/NotificationCompatBase$InstanceInner", DoNotGenerateAcw=true)] public abstract partial class InstanceInner : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInner)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInner)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -205,7 +193,7 @@ public InstanceInnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base { } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInnerInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInnerInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -221,11 +209,7 @@ public InstanceInnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase", typeof (NotificationCompatBase)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/NotificationCompatBase", typeof (NotificationCompatBase)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs index 3fa463e60cd..e8c03d36e49 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs @@ -78,11 +78,7 @@ public char CharValue { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Class.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Class.cs index 5647ba8371b..de13f4b38d3 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Class.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Class.cs @@ -19,11 +19,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Class", DoNotGenerateAcw=true)] [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] public partial class Class : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Class", typeof (Class)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Class", typeof (Class)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Integer.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Integer.cs index 1889e90d7ff..66cdb70613e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Integer.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Integer.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Integer']" [global::Android.Runtime.Register ("java/lang/Integer", DoNotGenerateAcw=true)] public partial class Integer : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Integer", typeof (Integer)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Integer", typeof (Integer)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Throwable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Throwable.cs index cc7579be940..cc2bfc72913 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Throwable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Java.Lang.Throwable.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Throwable']" [global::Android.Runtime.Register ("java/lang/Throwable", DoNotGenerateAcw=true)] public partial class Throwable { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Throwable", typeof (Throwable)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Throwable", typeof (Throwable)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs index e246519bf0c..aee1f983d0f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs @@ -22,11 +22,7 @@ public partial class A : global::Java.Lang.Object { [global::Android.Runtime.Register ("xamarin/test/A$B", DoNotGenerateAcw=true)] [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.A.B"})] public partial class B : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/A$B", typeof (B)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/A$B", typeof (B)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -86,11 +82,7 @@ private static IntPtr __n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__th } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/A", typeof (A)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/A", typeof (A)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs index 7b98e3a88ac..6b6d17ae4fa 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs @@ -19,11 +19,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/C", DoNotGenerateAcw=true)] [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.C"})] public partial class C : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/C", typeof (C)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/C", typeof (C)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs index d47f6641753..ab150a2a851 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']" [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs index 09989862c02..fb365716ca7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']" [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public abstract partial class SomeObject : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -206,7 +202,7 @@ public SomeObjectInvoker (IntPtr handle, JniHandleOwnership transfer) : base (ha { } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObjectInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Integer.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Integer.cs index 1889e90d7ff..66cdb70613e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Integer.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Integer.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Integer']" [global::Android.Runtime.Register ("java/lang/Integer", DoNotGenerateAcw=true)] public partial class Integer : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Integer", typeof (Integer)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Integer", typeof (Integer)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Util.IList.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Util.IList.cs index 039257aa573..a02b543ad80 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Util.IList.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Java.Util.IList.cs @@ -13,10 +13,6 @@ public partial interface IList : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/util/List", DoNotGenerateAcw=true)] internal partial class IListInvoker : global::Java.Lang.Object, IList { - static IntPtr java_class_ref { - get { return _members_java_util_List.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -35,7 +31,7 @@ protected override IntPtr ThresholdClass { get { return _members_java_util_List.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_util_List = new XAPeerMembers ("java/util/List", typeof (IListInvoker)); + private static readonly JniPeerMembers _members_java_util_List = new XAPeerMembers ("java/util/List", typeof (IListInvoker)); public IListInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs index 4973df61a85..ce7ce0cf87f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs @@ -19,11 +19,7 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/A", DoNotGenerateAcw=true)] [global::Java.Interop.JavaTypeParameters (new string [] {"T extends java.lang.Object"})] public partial class A : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/A", typeof (A)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/A", typeof (A)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs index 261590db72d..8b8841d89d0 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs @@ -90,11 +90,7 @@ public static char CharValue { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs index 59976149b9a..ec67c35dc7e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']" [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs index 80cffc22b59..ed4642bf868 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs @@ -18,11 +18,7 @@ namespace Xamarin.Test { // Metadata.xml XPath class reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']" [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs index 82fa1d65700..3f4e114eee1 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs @@ -18,11 +18,7 @@ namespace Java.IO { // Metadata.xml XPath class reference: path="/api/package[@name='java.io']/class[@name='FilterOutputStream']" [global::Android.Runtime.Register ("java/io/FilterOutputStream", DoNotGenerateAcw=true)] public partial class FilterOutputStream : global::Java.IO.OutputStream { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/FilterOutputStream", typeof (FilterOutputStream)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/FilterOutputStream", typeof (FilterOutputStream)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs index 96a5f1c7cd2..8bee228399f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs @@ -18,11 +18,7 @@ namespace Java.IO { // Metadata.xml XPath class reference: path="/api/package[@name='java.io']/class[@name='IOException']" [global::Android.Runtime.Register ("java/io/IOException", DoNotGenerateAcw=true)] public abstract partial class IOException : global::Java.Lang.Throwable { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/IOException", typeof (IOException)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/IOException", typeof (IOException)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -85,7 +81,7 @@ public IOExceptionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h { } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/IOException", typeof (IOExceptionInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/IOException", typeof (IOExceptionInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs index 16afe2e40ce..de08dc3e0e0 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs @@ -18,11 +18,7 @@ namespace Java.IO { // Metadata.xml XPath class reference: path="/api/package[@name='java.io']/class[@name='InputStream']" [global::Android.Runtime.Register ("java/io/InputStream", DoNotGenerateAcw=true)] public abstract partial class InputStream : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/InputStream", typeof (InputStream)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/InputStream", typeof (InputStream)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -378,7 +374,7 @@ public InputStreamInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h { } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/InputStream", typeof (InputStreamInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/InputStream", typeof (InputStreamInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs index 8a6959ec7f2..540e692c3c3 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs @@ -18,11 +18,7 @@ namespace Java.IO { // Metadata.xml XPath class reference: path="/api/package[@name='java.io']/class[@name='OutputStream']" [global::Android.Runtime.Register ("java/io/OutputStream", DoNotGenerateAcw=true)] public abstract partial class OutputStream : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/OutputStream", typeof (OutputStream)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/OutputStream", typeof (OutputStream)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -243,7 +239,7 @@ public OutputStreamInvoker (IntPtr handle, JniHandleOwnership transfer) : base ( { } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/OutputStream", typeof (OutputStreamInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/io/OutputStream", typeof (OutputStreamInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs index 311c44de33b..5e388eaadfe 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Throwable']" [global::Android.Runtime.Register ("java/lang/Throwable", DoNotGenerateAcw=true)] public partial class Throwable { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Throwable", typeof (Throwable)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Throwable", typeof (Throwable)); static Delegate cb_getMessage_GetMessage_Ljava_lang_String_; #pragma warning disable 0169 diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs index 613ab546dd9..74f637d9f68 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs @@ -16,11 +16,7 @@ // Metadata.xml XPath class reference: path="/api/package[@name='']/class[@name='ClassWithoutNamespace']" [global::Android.Runtime.Register ("ClassWithoutNamespace", DoNotGenerateAcw=true)] public abstract partial class ClassWithoutNamespace : global::Java.Lang.Object, IInterfaceWithoutNamespace { - static readonly JniPeerMembers _members = new XAPeerMembers ("ClassWithoutNamespace", typeof (ClassWithoutNamespace)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("ClassWithoutNamespace", typeof (ClassWithoutNamespace)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -93,7 +89,7 @@ public ClassWithoutNamespaceInvoker (IntPtr handle, JniHandleOwnership transfer) { } - static readonly JniPeerMembers _members = new XAPeerMembers ("ClassWithoutNamespace", typeof (ClassWithoutNamespaceInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("ClassWithoutNamespace", typeof (ClassWithoutNamespaceInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs index 4b9ea61616b..035b53af010 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs @@ -14,10 +14,6 @@ public partial interface IInterfaceWithoutNamespace : IJavaObject, IJavaPeerable [global::Android.Runtime.Register ("InterfaceWithoutNamespace", DoNotGenerateAcw=true)] internal partial class IInterfaceWithoutNamespaceInvoker : global::Java.Lang.Object, IInterfaceWithoutNamespace { - static IntPtr java_class_ref { - get { return _members__InterfaceWithoutNamespace.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -36,7 +32,7 @@ protected override IntPtr ThresholdClass { get { return _members__InterfaceWithoutNamespace.ManagedPeerType; } } - static readonly JniPeerMembers _members__InterfaceWithoutNamespace = new XAPeerMembers ("InterfaceWithoutNamespace", typeof (IInterfaceWithoutNamespaceInvoker)); + private static readonly JniPeerMembers _members__InterfaceWithoutNamespace = new XAPeerMembers ("InterfaceWithoutNamespace", typeof (IInterfaceWithoutNamespaceInvoker)); public IInterfaceWithoutNamespaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.String.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.String.cs index f9d26ceef45..8d00c1cfede 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.String.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Lang.String.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='String']" [global::Android.Runtime.Register ("java/lang/String", DoNotGenerateAcw=true)] public sealed partial class String : global::Java.Lang.Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/String", typeof (String)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/String", typeof (String)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs index 5f366be2722..bcf305e800f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs @@ -21,10 +21,6 @@ public partial interface ICollection : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/util/Collection", DoNotGenerateAcw=true)] internal partial class ICollectionInvoker : global::Java.Lang.Object, ICollection { - static IntPtr java_class_ref { - get { return _members_java_util_Collection.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -43,7 +39,7 @@ protected override IntPtr ThresholdClass { get { return _members_java_util_Collection.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_util_Collection = new XAPeerMembers ("java/util/Collection", typeof (ICollectionInvoker)); + private static readonly JniPeerMembers _members_java_util_Collection = new XAPeerMembers ("java/util/Collection", typeof (ICollectionInvoker)); public ICollectionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs index 0e38e3ef14a..f9e63786b17 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs @@ -17,10 +17,6 @@ public partial interface IDeque : global::Java.Util.IQueue { [global::Android.Runtime.Register ("java/util/Deque", DoNotGenerateAcw=true)] internal partial class IDequeInvoker : global::Java.Lang.Object, IDeque { - static IntPtr java_class_ref { - get { return _members_java_util_Deque.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -39,11 +35,11 @@ protected override IntPtr ThresholdClass { get { return _members_java_util_Deque.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_util_Collection = new XAPeerMembers ("java/util/Collection", typeof (IDequeInvoker)); + private static readonly JniPeerMembers _members_java_util_Collection = new XAPeerMembers ("java/util/Collection", typeof (IDequeInvoker)); - static readonly JniPeerMembers _members_java_util_Deque = new XAPeerMembers ("java/util/Deque", typeof (IDequeInvoker)); + private static readonly JniPeerMembers _members_java_util_Deque = new XAPeerMembers ("java/util/Deque", typeof (IDequeInvoker)); - static readonly JniPeerMembers _members_java_util_Queue = new XAPeerMembers ("java/util/Queue", typeof (IDequeInvoker)); + private static readonly JniPeerMembers _members_java_util_Queue = new XAPeerMembers ("java/util/Queue", typeof (IDequeInvoker)); public IDequeInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs index 6aea8ff7537..a989534612c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs @@ -17,10 +17,6 @@ public partial interface IQueue : global::Java.Util.ICollection { [global::Android.Runtime.Register ("java/util/Queue", DoNotGenerateAcw=true)] internal partial class IQueueInvoker : global::Java.Lang.Object, IQueue { - static IntPtr java_class_ref { - get { return _members_java_util_Queue.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -39,9 +35,9 @@ protected override IntPtr ThresholdClass { get { return _members_java_util_Queue.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_util_Collection = new XAPeerMembers ("java/util/Collection", typeof (IQueueInvoker)); + private static readonly JniPeerMembers _members_java_util_Collection = new XAPeerMembers ("java/util/Collection", typeof (IQueueInvoker)); - static readonly JniPeerMembers _members_java_util_Queue = new XAPeerMembers ("java/util/Queue", typeof (IQueueInvoker)); + private static readonly JniPeerMembers _members_java_util_Queue = new XAPeerMembers ("java/util/Queue", typeof (IQueueInvoker)); public IQueueInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs index 885f1f0e816..29e4e419acc 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs @@ -18,11 +18,7 @@ namespace Test.ME { // Metadata.xml XPath class reference: path="/api/package[@name='test.me']/class[@name='GenericImplementation']" [global::Android.Runtime.Register ("test/me/GenericImplementation", DoNotGenerateAcw=true)] public partial class GenericImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericImplementation", typeof (GenericImplementation)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericImplementation", typeof (GenericImplementation)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 8ea79c2e21b..1a17c63bf52 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -18,11 +18,7 @@ namespace Test.ME { // Metadata.xml XPath class reference: path="/api/package[@name='test.me']/class[@name='GenericObjectPropertyImplementation']" [global::Android.Runtime.Register ("test/me/GenericObjectPropertyImplementation", DoNotGenerateAcw=true)] public partial class GenericObjectPropertyImplementation : global::Java.Lang.Object, global::Test.ME.IGenericPropertyInterface { - static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericObjectPropertyImplementation", typeof (GenericObjectPropertyImplementation)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericObjectPropertyImplementation", typeof (GenericObjectPropertyImplementation)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs index 151f245abd9..0afcfe8cc6e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -18,11 +18,7 @@ namespace Test.ME { // Metadata.xml XPath class reference: path="/api/package[@name='test.me']/class[@name='GenericStringImplementation']" [global::Android.Runtime.Register ("test/me/GenericStringImplementation", DoNotGenerateAcw=true)] public partial class GenericStringImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericStringImplementation", typeof (GenericStringImplementation)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericStringImplementation", typeof (GenericStringImplementation)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index dc9859f3695..ab0d24cf96c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -18,11 +18,7 @@ namespace Test.ME { // Metadata.xml XPath class reference: path="/api/package[@name='test.me']/class[@name='GenericStringPropertyImplementation']" [global::Android.Runtime.Register ("test/me/GenericStringPropertyImplementation", DoNotGenerateAcw=true)] public partial class GenericStringPropertyImplementation : global::Java.Lang.Object, global::Test.ME.IGenericPropertyInterface { - static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericStringPropertyImplementation", typeof (GenericStringPropertyImplementation)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/GenericStringPropertyImplementation", typeof (GenericStringPropertyImplementation)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs index ea85904ea7f..6d1ecd10190 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs @@ -17,10 +17,6 @@ public partial interface IGenericInterface : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("test/me/GenericInterface", DoNotGenerateAcw=true)] internal partial class IGenericInterfaceInvoker : global::Java.Lang.Object, IGenericInterface { - static IntPtr java_class_ref { - get { return _members_test_me_GenericInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -39,7 +35,7 @@ protected override IntPtr ThresholdClass { get { return _members_test_me_GenericInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_test_me_GenericInterface = new XAPeerMembers ("test/me/GenericInterface", typeof (IGenericInterfaceInvoker)); + private static readonly JniPeerMembers _members_test_me_GenericInterface = new XAPeerMembers ("test/me/GenericInterface", typeof (IGenericInterfaceInvoker)); public IGenericInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs index 9c40dc51df9..29b7132bbd7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -23,10 +23,6 @@ public partial interface IGenericPropertyInterface : IJavaObject, IJavaPeerable [global::Android.Runtime.Register ("test/me/GenericPropertyInterface", DoNotGenerateAcw=true)] internal partial class IGenericPropertyInterfaceInvoker : global::Java.Lang.Object, IGenericPropertyInterface { - static IntPtr java_class_ref { - get { return _members_test_me_GenericPropertyInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -45,7 +41,7 @@ protected override IntPtr ThresholdClass { get { return _members_test_me_GenericPropertyInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_test_me_GenericPropertyInterface = new XAPeerMembers ("test/me/GenericPropertyInterface", typeof (IGenericPropertyInterfaceInvoker)); + private static readonly JniPeerMembers _members_test_me_GenericPropertyInterface = new XAPeerMembers ("test/me/GenericPropertyInterface", typeof (IGenericPropertyInterfaceInvoker)); public IGenericPropertyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs index 5df4d25ee9e..5961f46f0f0 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs @@ -27,7 +27,7 @@ internal TestInterface () } } - static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/TestInterface", typeof (TestInterface)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/TestInterface", typeof (TestInterface)); } @@ -78,10 +78,6 @@ 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 { - static IntPtr java_class_ref { - get { return _members_test_me_TestInterface.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -100,7 +96,7 @@ protected override IntPtr ThresholdClass { get { return _members_test_me_TestInterface.ManagedPeerType; } } - static readonly JniPeerMembers _members_test_me_TestInterface = new XAPeerMembers ("test/me/TestInterface", typeof (ITestInterfaceInvoker)); + private static readonly JniPeerMembers _members_test_me_TestInterface = new XAPeerMembers ("test/me/TestInterface", typeof (ITestInterfaceInvoker)); public ITestInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs index ad4e1e4d659..8071a32b507 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -39,11 +39,7 @@ public static class InterfaceConsts { } - static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementation)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementation)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -185,7 +181,7 @@ public TestInterfaceImplementationInvoker (IntPtr handle, JniHandleOwnership tra { } - static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementationInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementationInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Enum.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Enum.cs index d5792caca14..0563d86ae27 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Enum.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Enum.cs @@ -19,11 +19,7 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Enum", DoNotGenerateAcw=true)] [global::Java.Interop.JavaTypeParameters (new string [] {"E extends java.lang.Enum"})] public abstract partial class Enum : global::Java.Lang.Object, global::Java.Lang.IComparable { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Enum", typeof (Enum)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Enum", typeof (Enum)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] @@ -72,7 +68,7 @@ public EnumInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, { } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Enum", typeof (EnumInvoker)); + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Enum", typeof (EnumInvoker)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs index 8667c2f003f..285b9f0ed8e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs @@ -17,10 +17,6 @@ public partial interface IComparable : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/lang/Comparable", DoNotGenerateAcw=true)] internal partial class IComparableInvoker : global::Java.Lang.Object, IComparable { - static IntPtr java_class_ref { - get { return _members_java_lang_Comparable.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -39,7 +35,7 @@ protected override IntPtr ThresholdClass { get { return _members_java_lang_Comparable.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_lang_Comparable = new XAPeerMembers ("java/lang/Comparable", typeof (IComparableInvoker)); + private static readonly JniPeerMembers _members_java_lang_Comparable = new XAPeerMembers ("java/lang/Comparable", typeof (IComparableInvoker)); public IComparableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.State.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.State.cs index 994daa84876..29a7bb15717 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.State.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.State.cs @@ -90,11 +90,7 @@ public sealed partial class State : global::Java.Lang.Enum { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/State", typeof (State)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/State", typeof (State)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Object/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Object/Java.Lang.Object.cs index 5744963dc57..cffa15f5755 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Object/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.lang.Object/Java.Lang.Object.cs @@ -8,11 +8,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Lang.Object.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Lang.Object.cs index e7029b8f7e2..e819d6643c7 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Lang.Object.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Lang.Object.cs @@ -18,11 +18,7 @@ namespace Java.Lang { // Metadata.xml XPath class reference: path="/api/package[@name='java.lang']/class[@name='Object']" [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { - static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); - - internal static IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("java/lang/Object", typeof (Object)); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Util.IList.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Util.IList.cs index 039257aa573..a02b543ad80 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Util.IList.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Java.Util.IList.cs @@ -13,10 +13,6 @@ public partial interface IList : IJavaObject, IJavaPeerable { [global::Android.Runtime.Register ("java/util/List", DoNotGenerateAcw=true)] internal partial class IListInvoker : global::Java.Lang.Object, IList { - static IntPtr java_class_ref { - get { return _members_java_util_List.JniPeerType.PeerReference.Handle; } - } - [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] public override global::Java.Interop.JniPeerMembers JniPeerMembers { @@ -35,7 +31,7 @@ protected override IntPtr ThresholdClass { get { return _members_java_util_List.ManagedPeerType; } } - static readonly JniPeerMembers _members_java_util_List = new XAPeerMembers ("java/util/List", typeof (IListInvoker)); + private static readonly JniPeerMembers _members_java_util_List = new XAPeerMembers ("java/util/List", typeof (IListInvoker)); public IListInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Xamarin.Test.SomeObject.cs index 242dfcc2d09..9a5adbfbc46 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/java.util.List/Xamarin.Test.SomeObject.cs @@ -172,11 +172,7 @@ public partial class SomeObject : global::Java.Lang.Object { } } - static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - - internal static new IntPtr class_ref { - get { return _members.JniPeerType.PeerReference.Handle; } - } + private static readonly JniPeerMembers _members = new XAPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] diff --git a/external/Java.Interop/tools/generator/SourceWriters/BoundClass.cs b/external/Java.Interop/tools/generator/SourceWriters/BoundClass.cs index 2c5b6fcfaef..09a590e281e 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/BoundClass.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/BoundClass.cs @@ -105,17 +105,7 @@ public BoundClass (ClassGen klass, CodeGenerationOptions opt, CodeGeneratorConte void AddBindingInfrastructure (ClassGen klass, CodeGenerationOptions opt) { - // @class.InheritsObject is true unless @class refers to java.lang.Object or java.lang.Throwable. (see ClassGen constructor) - // If @class's base class is defined in the same api.xml file, then it requires the new keyword to overshadow the internal - // members of its baseclass since the two classes will be defined in the same assembly. If the base class is not from the - // same api.xml file, the new keyword is not needed because the internal access modifier already prevents it from being seen. - var baseFromSameAssembly = klass?.BaseGen?.FromXml ?? false; - var requireNew = klass.InheritsObject && baseFromSameAssembly; - Fields.Add (new PeerMembersField (opt, klass.RawJniName, klass.Name, false)); - if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) { - Properties.Add (new ClassHandleGetter (requireNew)); - } if (klass.BaseGen != null && klass.InheritsObject) { Properties.Add (new JniPeerMembersGetter ()); diff --git a/external/Java.Interop/tools/generator/SourceWriters/ClassInvokers.cs b/external/Java.Interop/tools/generator/SourceWriters/ClassInvokers.cs index ad03036f31d..4353f931231 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/ClassInvokers.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/ClassInvokers.cs @@ -7,42 +7,6 @@ namespace generator.SourceWriters { - public class ClassHandleGetter : PropertyWriter - { - // internal static new IntPtr class_ref { - // get { return _members.JniPeerType.PeerReference.Handle; } - // } - public ClassHandleGetter (bool requireNew) - { - Name = "class_ref"; - PropertyType = TypeReferenceWriter.IntPtr; - - IsInternal = true; - IsStatic = true; - IsShadow = requireNew; - - HasGet = true; - GetBody.Add ("return _members.JniPeerType.PeerReference.Handle;"); - } - } - - public class InterfaceHandleGetter : PropertyWriter - { - // static IntPtr java_class_ref { - // get { return _members.JniPeerType.PeerReference.Handle; } - // } - public InterfaceHandleGetter (string members) - { - Name = "java_class_ref"; - PropertyType = TypeReferenceWriter.IntPtr; - - IsStatic = true; - - HasGet = true; - GetBody.Add ($"return {members}.JniPeerType.PeerReference.Handle;"); - } - } - public class JniPeerMembersGetter : PropertyWriter { // [DebuggerBrowsable (DebuggerBrowsableState.Never)] @@ -94,7 +58,7 @@ public class InterfaceThresholdClassGetter : PropertyWriter // [DebuggerBrowsable (DebuggerBrowsableState.Never)] // [EditorBrowsable (EditorBrowsableState.Never)] // protected override IntPtr ThresholdClass { - // get { return class_ref; } + // get { return _members.JniPeerType.PeerReference.Handle; } // } public InterfaceThresholdClassGetter (string getExpression) { diff --git a/external/Java.Interop/tools/generator/SourceWriters/InterfaceInvokerClass.cs b/external/Java.Interop/tools/generator/SourceWriters/InterfaceInvokerClass.cs index 9a6fdb2d3f0..e3f02216dcf 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/InterfaceInvokerClass.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/InterfaceInvokerClass.cs @@ -36,10 +36,6 @@ public InterfaceInvokerClass (InterfaceGen iface, CodeGenerationOptions opt) string members = $"_members_{iface.JavaFullNameId}"; - if (!ji) { - Properties.Add (new InterfaceHandleGetter (members)); - } - Properties.Add (new JniPeerMembersGetter (members)); if (!ji) { diff --git a/external/Java.Interop/tools/generator/SourceWriters/InterfaceMemberAlternativeClass.cs b/external/Java.Interop/tools/generator/SourceWriters/InterfaceMemberAlternativeClass.cs index c247fceb732..d5a72d5e974 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/InterfaceMemberAlternativeClass.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/InterfaceMemberAlternativeClass.cs @@ -47,10 +47,10 @@ public InterfaceMemberAlternativeClass (InterfaceGen iface, CodeGenerationOption Constructors.Add (new ConstructorWriter { Name = Name, IsInternal = true }); - var needs_class_ref = AddFields (iface, should_obsolete, opt, context); + var needs_peer_members = AddFields (iface, should_obsolete, opt, context); AddMethods (iface, should_obsolete, opt); - if (needs_class_ref || iface.Methods.Where (m => m.IsStatic).Any ()) + if (needs_peer_members || iface.Methods.Where (m => m.IsStatic).Any ()) Fields.Add (new PeerMembersField (opt, iface.RawJniName, Name, false)); if (!iface.HasManagedName && !opt.SupportInterfaceConstants) @@ -85,18 +85,18 @@ bool AddFields (InterfaceGen iface, bool shouldObsolete, CodeGenerationOptions o var seen = new HashSet (); var original_fields = DeprecateFields (iface, shouldObsolete); - var needs_class_ref = AddInterfaceFields (iface, iface.Fields, seen, opt, context); + var needs_peer_members = AddInterfaceFields (iface, iface.Fields, seen, opt, context); RestoreDeprecatedFields (original_fields); foreach (var i in iface.GetAllImplementedInterfaces ().OfType ()) { AddInlineComment ($"// The following are fields from: {i.JavaName}"); original_fields = DeprecateFields (i, shouldObsolete); - needs_class_ref = AddInterfaceFields (i, i.Fields, seen, opt, context) || needs_class_ref; + needs_peer_members = AddInterfaceFields (i, i.Fields, seen, opt, context) || needs_peer_members; RestoreDeprecatedFields (original_fields); } - return needs_class_ref; + return needs_peer_members; } bool AddInterfaceFields (InterfaceGen iface, List fields, HashSet seen, CodeGenerationOptions opt, CodeGeneratorContext context) diff --git a/external/Java.Interop/tools/generator/SourceWriters/PeerMembersField.cs b/external/Java.Interop/tools/generator/SourceWriters/PeerMembersField.cs index 9b6e877b805..84d0f5616e2 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/PeerMembersField.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/PeerMembersField.cs @@ -16,7 +16,7 @@ public PeerMembersField (CodeGenerationOptions opt, string rawJniType, string de Name = name; Type = new TypeReferenceWriter ("JniPeerMembers"); - IsPrivate = isInterface; + IsPrivate = isInterface || opt.CodeGenerationTarget == Xamarin.Android.Binder.CodeGenerationTarget.XAJavaInterop1; IsStatic = true; IsReadonly = true; diff --git a/src/Mono.Android/Android.App/Notification.cs b/src/Mono.Android/Android.App/Notification.cs index 7776c56cdbb..f49c2234407 100644 --- a/src/Mono.Android/Android.App/Notification.cs +++ b/src/Mono.Android/Android.App/Notification.cs @@ -16,12 +16,12 @@ public Notification (int icon, Java.Lang.ICharSequence tickerText) : this (icon, public long[] Vibrate { get { if (vibrate_jfieldId == IntPtr.Zero) - vibrate_jfieldId = JNIEnv.GetFieldID (class_ref, "vibrate", "[J"); + vibrate_jfieldId = JNIEnv.GetFieldID (_members.JniPeerType.PeerReference.Handle, "vibrate", "[J"); return (long[]) JNIEnv.GetArray (JNIEnv.GetObjectField (Handle, vibrate_jfieldId), JniHandleOwnership.TransferLocalRef, typeof (long))!; } set { if (vibrate_jfieldId == IntPtr.Zero) - vibrate_jfieldId = JNIEnv.GetFieldID (class_ref, "vibrate", "[J"); + vibrate_jfieldId = JNIEnv.GetFieldID (_members.JniPeerType.PeerReference.Handle, "vibrate", "[J"); IntPtr native_pattern = JNIEnv.NewArray (value); JNIEnv.SetField (Handle, vibrate_jfieldId, native_pattern); JNIEnv.DeleteLocalRef (native_pattern); @@ -30,4 +30,3 @@ public long[] Vibrate { } } - diff --git a/src/Mono.Android/Android.Content/ContentValues.cs b/src/Mono.Android/Android.Content/ContentValues.cs index 3aef2dd5f11..bbf7e929569 100644 --- a/src/Mono.Android/Android.Content/ContentValues.cs +++ b/src/Mono.Android/Android.Content/ContentValues.cs @@ -10,7 +10,7 @@ public sealed partial class ContentValues { public bool GetAsBoolean (string key) { if (id_getAsBoolean_Ljava_lang_String_ == IntPtr.Zero) - id_getAsBoolean_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "getAsBoolean", "(Ljava/lang/String;)Ljava/lang/Boolean;"); + id_getAsBoolean_Ljava_lang_String_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAsBoolean", "(Ljava/lang/String;)Ljava/lang/Boolean;"); IntPtr jkey = JNIEnv.NewString (key); try { using (var ret = new Java.Lang.Boolean (JNIEnv.CallObjectMethod (Handle, id_getAsBoolean_Ljava_lang_String_, new JValue (jkey)), @@ -26,7 +26,7 @@ public bool GetAsBoolean (string key) public sbyte GetAsByte (string key) { if (id_getAsByte_Ljava_lang_String_ == IntPtr.Zero) - id_getAsByte_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "getAsByte", "(Ljava/lang/String;)Ljava/lang/Byte;"); + id_getAsByte_Ljava_lang_String_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAsByte", "(Ljava/lang/String;)Ljava/lang/Byte;"); IntPtr jkey = JNIEnv.NewString (key); try { using (var ret = new Java.Lang.Byte (JNIEnv.CallObjectMethod (Handle, id_getAsByte_Ljava_lang_String_, new JValue (jkey)), @@ -42,7 +42,7 @@ public sbyte GetAsByte (string key) public double GetAsDouble (string key) { if (id_getAsDouble_Ljava_lang_String_ == IntPtr.Zero) - id_getAsDouble_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "getAsDouble", "(Ljava/lang/String;)Ljava/lang/Double;"); + id_getAsDouble_Ljava_lang_String_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAsDouble", "(Ljava/lang/String;)Ljava/lang/Double;"); IntPtr jkey = JNIEnv.NewString (key); try { using (var ret = new Java.Lang.Double (JNIEnv.CallObjectMethod (Handle, id_getAsDouble_Ljava_lang_String_, new JValue (jkey)), @@ -58,7 +58,7 @@ public double GetAsDouble (string key) public float GetAsFloat (string key) { if (id_getAsFloat_Ljava_lang_String_ == IntPtr.Zero) - id_getAsFloat_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "getAsFloat", "(Ljava/lang/String;)Ljava/lang/Float;"); + id_getAsFloat_Ljava_lang_String_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAsFloat", "(Ljava/lang/String;)Ljava/lang/Float;"); IntPtr jkey = JNIEnv.NewString (key); try { using (var ret = new Java.Lang.Float (JNIEnv.CallObjectMethod (Handle, id_getAsFloat_Ljava_lang_String_, new JValue (jkey)), @@ -74,7 +74,7 @@ public float GetAsFloat (string key) public int GetAsInteger (string key) { if (id_getAsInteger_Ljava_lang_String_ == IntPtr.Zero) - id_getAsInteger_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "getAsInteger", "(Ljava/lang/String;)Ljava/lang/Integer;"); + id_getAsInteger_Ljava_lang_String_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAsInteger", "(Ljava/lang/String;)Ljava/lang/Integer;"); IntPtr jkey = JNIEnv.NewString (key); try { using (var ret = new Java.Lang.Integer (JNIEnv.CallObjectMethod (Handle, id_getAsInteger_Ljava_lang_String_, new JValue (jkey)), @@ -90,7 +90,7 @@ public int GetAsInteger (string key) public long GetAsLong (string key) { if (id_getAsLong_Ljava_lang_String_ == IntPtr.Zero) - id_getAsLong_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "getAsLong", "(Ljava/lang/String;)Ljava/lang/Long;"); + id_getAsLong_Ljava_lang_String_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAsLong", "(Ljava/lang/String;)Ljava/lang/Long;"); IntPtr jkey = JNIEnv.NewString (key); try { using (var ret = new Java.Lang.Long (JNIEnv.CallObjectMethod (Handle, id_getAsLong_Ljava_lang_String_, new JValue (jkey)), @@ -106,7 +106,7 @@ public long GetAsLong (string key) public short GetAsShort (string key) { if (id_getAsShort_Ljava_lang_String_ == IntPtr.Zero) - id_getAsShort_Ljava_lang_String_ = JNIEnv.GetMethodID (class_ref, "getAsShort", "(Ljava/lang/String;)Ljava/lang/Short;"); + id_getAsShort_Ljava_lang_String_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAsShort", "(Ljava/lang/String;)Ljava/lang/Short;"); IntPtr jkey = JNIEnv.NewString (key); try { using (var ret = new Java.Lang.Short (JNIEnv.CallObjectMethod (Handle, id_getAsShort_Ljava_lang_String_, new JValue (jkey)), @@ -123,7 +123,7 @@ public short GetAsShort (string key) public void Put (string key, bool value) { if (id_put_Ljava_lang_String_Ljava_lang_Boolean_ == IntPtr.Zero) - id_put_Ljava_lang_String_Ljava_lang_Boolean_ = JNIEnv.GetMethodID (class_ref, "put", "(Ljava/lang/String;Ljava/lang/Boolean;)V"); + id_put_Ljava_lang_String_Ljava_lang_Boolean_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "put", "(Ljava/lang/String;Ljava/lang/Boolean;)V"); IntPtr jkey = JNIEnv.NewString (key); try { using (var val = new Java.Lang.Boolean (value)) @@ -139,7 +139,7 @@ public void Put (string key, bool value) public void Put (string key, sbyte value) { if (id_put_Ljava_lang_String_Ljava_lang_Byte_ == IntPtr.Zero) - id_put_Ljava_lang_String_Ljava_lang_Byte_ = JNIEnv.GetMethodID (class_ref, "put", "(Ljava/lang/String;Ljava/lang/Byte;)V"); + id_put_Ljava_lang_String_Ljava_lang_Byte_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "put", "(Ljava/lang/String;Ljava/lang/Byte;)V"); IntPtr jkey = JNIEnv.NewString (key); try { using (var val = new Java.Lang.Byte (value)) @@ -155,7 +155,7 @@ public void Put (string key, sbyte value) public void Put (string key, short value) { if (id_put_Ljava_lang_String_Ljava_lang_Short_ == IntPtr.Zero) - id_put_Ljava_lang_String_Ljava_lang_Short_ = JNIEnv.GetMethodID (class_ref, "put", "(Ljava/lang/String;Ljava/lang/Short;)V"); + id_put_Ljava_lang_String_Ljava_lang_Short_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "put", "(Ljava/lang/String;Ljava/lang/Short;)V"); IntPtr jkey = JNIEnv.NewString (key); try { using (var val = new Java.Lang.Short (value)) @@ -171,7 +171,7 @@ public void Put (string key, short value) public void Put (string key, int value) { if (id_put_Ljava_lang_String_Ljava_lang_Integer_ == IntPtr.Zero) - id_put_Ljava_lang_String_Ljava_lang_Integer_ = JNIEnv.GetMethodID (class_ref, "put", "(Ljava/lang/String;Ljava/lang/Integer;)V"); + id_put_Ljava_lang_String_Ljava_lang_Integer_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "put", "(Ljava/lang/String;Ljava/lang/Integer;)V"); IntPtr jkey = JNIEnv.NewString (key); try { using (var val = new Java.Lang.Integer (value)) @@ -187,7 +187,7 @@ public void Put (string key, int value) public void Put (string key, long value) { if (id_put_Ljava_lang_String_Ljava_lang_Long_ == IntPtr.Zero) - id_put_Ljava_lang_String_Ljava_lang_Long_ = JNIEnv.GetMethodID (class_ref, "put", "(Ljava/lang/String;Ljava/lang/Long;)V"); + id_put_Ljava_lang_String_Ljava_lang_Long_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "put", "(Ljava/lang/String;Ljava/lang/Long;)V"); IntPtr jkey = JNIEnv.NewString (key); try { using (var val = new Java.Lang.Long (value)) @@ -203,7 +203,7 @@ public void Put (string key, long value) public void Put (string key, float value) { if (id_put_Ljava_lang_String_Ljava_lang_Float_ == IntPtr.Zero) - id_put_Ljava_lang_String_Ljava_lang_Float_ = JNIEnv.GetMethodID (class_ref, "put", "(Ljava/lang/String;Ljava/lang/Float;)V"); + id_put_Ljava_lang_String_Ljava_lang_Float_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "put", "(Ljava/lang/String;Ljava/lang/Float;)V"); IntPtr jkey = JNIEnv.NewString (key); try { using (var val = new Java.Lang.Float (value)) @@ -219,7 +219,7 @@ public void Put (string key, float value) public void Put (string key, double value) { if (id_put_Ljava_lang_String_Ljava_lang_Double_ == IntPtr.Zero) - id_put_Ljava_lang_String_Ljava_lang_Double_ = JNIEnv.GetMethodID (class_ref, "put", "(Ljava/lang/String;Ljava/lang/Double;)V"); + id_put_Ljava_lang_String_Ljava_lang_Double_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "put", "(Ljava/lang/String;Ljava/lang/Double;)V"); IntPtr jkey = JNIEnv.NewString (key); try { using (var val = new Java.Lang.Double (value)) diff --git a/src/Mono.Android/Android.Content/CursorLoader.cs b/src/Mono.Android/Android.Content/CursorLoader.cs index 0f02f9e817e..0c31c2ba087 100644 --- a/src/Mono.Android/Android.Content/CursorLoader.cs +++ b/src/Mono.Android/Android.Content/CursorLoader.cs @@ -11,7 +11,7 @@ public partial class CursorLoader public override Java.Lang.Object? LoadInBackground () { if (id_loadInBackground == IntPtr.Zero) - id_loadInBackground = JNIEnv.GetMethodID (class_ref, "loadInBackground", "()Landroid/database/Cursor;"); + id_loadInBackground = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "loadInBackground", "()Landroid/database/Cursor;"); if (GetType () == ThresholdType) return (Java.Lang.Object?) Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (Handle, id_loadInBackground), JniHandleOwnership.TransferLocalRef); diff --git a/src/Mono.Android/Android.OS/AsyncTask.cs b/src/Mono.Android/Android.OS/AsyncTask.cs index caf8a73acee..970b99fd73c 100644 --- a/src/Mono.Android/Android.OS/AsyncTask.cs +++ b/src/Mono.Android/Android.OS/AsyncTask.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using Android.Runtime; using Java.Interop; @@ -18,15 +19,11 @@ public abstract class AsyncTask< TResult > : AsyncTask { - static IntPtr java_class_handle; - internal static new IntPtr class_ref { - get { - return JNIEnv.FindClass ("android/os/AsyncTask", ref java_class_handle); - } - } + [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] + static extern ref JniPeerMembers GetPeerMembers (AsyncTask? _); protected override IntPtr ThresholdClass { - get { return class_ref; } + get { return GetPeerMembers (null).JniPeerType.PeerReference.Handle; } } protected override global::System.Type ThresholdType { @@ -55,11 +52,11 @@ public AsyncTask () } if (id_ctor == IntPtr.Zero) - id_ctor = JNIEnv.GetMethodID (class_ref, "", "()V"); + id_ctor = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "()V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor); } protected override Java.Lang.Object? DoInBackground (params Java.Lang.Object[]? native_parms) @@ -80,7 +77,7 @@ public AsyncTask () public Android.OS.AsyncTask? Execute (params TParams[] @params) { if (id_execute_arrayLjava_lang_Object_ == IntPtr.Zero) - id_execute_arrayLjava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "execute", "([Ljava/lang/Object;)Landroid/os/AsyncTask;"); + id_execute_arrayLjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "execute", "([Ljava/lang/Object;)Landroid/os/AsyncTask;"); IntPtr native__params = JNIEnv.NewObjectArray (@params); try { var __ret = Java.Lang.Object.GetObject> (JNIEnv.CallObjectMethod (Handle, id_execute_arrayLjava_lang_Object_, new JValue (native__params)), JniHandleOwnership.TransferLocalRef); @@ -99,7 +96,7 @@ public AsyncTask () public TResult? GetResult () { if (id_get == IntPtr.Zero) - id_get = JNIEnv.GetMethodID (class_ref, "get", "()Ljava/lang/Object;"); + id_get = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "get", "()Ljava/lang/Object;"); return JavaConvert.FromJniHandle(JNIEnv.CallObjectMethod (Handle, id_get), JniHandleOwnership.TransferLocalRef); } diff --git a/src/Mono.Android/Android.Util/SparseArray.cs b/src/Mono.Android/Android.Util/SparseArray.cs index a3bd4d1a97f..524eaaef3bd 100644 --- a/src/Mono.Android/Android.Util/SparseArray.cs +++ b/src/Mono.Android/Android.Util/SparseArray.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using Android.Runtime; @@ -13,6 +14,9 @@ public partial class SparseArray< E > : SparseArray { + [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] + static extern ref JniPeerMembers GetPeerMembers (SparseArray? _); + public SparseArray () { } @@ -27,9 +31,9 @@ public SparseArray (int capacity) public virtual void Append (int key, E value) { if (id_append_ILjava_lang_Object_ == IntPtr.Zero) - id_append_ILjava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "put", "(ILjava/lang/Object;)V"); + id_append_ILjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "put", "(ILjava/lang/Object;)V"); JavaConvert.WithLocalJniHandle (value, lref => { - JNIEnv.CallNonvirtualVoidMethod (Handle, class_ref, id_append_ILjava_lang_Object_, new JValue (key), new JValue (lref)); + JNIEnv.CallNonvirtualVoidMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_append_ILjava_lang_Object_, new JValue (key), new JValue (lref)); return IntPtr.Zero; }); } @@ -39,8 +43,8 @@ public virtual void Append (int key, E value) public new virtual E Get (int key) { if (id_get_I == IntPtr.Zero) - id_get_I = JNIEnv.GetMethodID (class_ref, "get", "(I)Ljava/lang/Object;"); - return JavaConvert.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod (Handle, class_ref, id_get_I, new JValue (key)), JniHandleOwnership.TransferLocalRef)!; + id_get_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "get", "(I)Ljava/lang/Object;"); + return JavaConvert.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_get_I, new JValue (key)), JniHandleOwnership.TransferLocalRef)!; } static IntPtr id_get_ILjava_lang_Object_; @@ -48,9 +52,9 @@ public virtual void Append (int key, E value) public virtual E Get (int key, E valueIfKeyNotFound) { if (id_get_ILjava_lang_Object_ == IntPtr.Zero) - id_get_ILjava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "get", "(ILjava/lang/Object;)Ljava/lang/Object;"); + id_get_ILjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "get", "(ILjava/lang/Object;)Ljava/lang/Object;"); IntPtr value = JavaConvert.WithLocalJniHandle (valueIfKeyNotFound, - lref => JNIEnv.CallNonvirtualObjectMethod (Handle, class_ref, id_get_ILjava_lang_Object_, new JValue (key), new JValue (lref))); + lref => JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_get_ILjava_lang_Object_, new JValue (key), new JValue (lref))); return JavaConvert.FromJniHandle (value, JniHandleOwnership.TransferLocalRef)!; } @@ -59,9 +63,9 @@ public virtual E Get (int key, E valueIfKeyNotFound) public virtual int IndexOfValue (E value) { if (id_indexOfValue_Ljava_lang_Object_ == IntPtr.Zero) - id_indexOfValue_Ljava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "indexOfValue", "(Ljava/lang/Object;)I"); + id_indexOfValue_Ljava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "indexOfValue", "(Ljava/lang/Object;)I"); return JavaConvert.WithLocalJniHandle (value, - lref => JNIEnv.CallNonvirtualIntMethod (Handle, class_ref, id_indexOfValue_Ljava_lang_Object_, new JValue (lref))); + lref => JNIEnv.CallNonvirtualIntMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_indexOfValue_Ljava_lang_Object_, new JValue (lref))); } static IntPtr id_put_ILjava_lang_Object_; @@ -69,9 +73,9 @@ public virtual int IndexOfValue (E value) public virtual void Put (int key, E value) { if (id_put_ILjava_lang_Object_ == IntPtr.Zero) - id_put_ILjava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "put", "(ILjava/lang/Object;)V"); + id_put_ILjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "put", "(ILjava/lang/Object;)V"); JavaConvert.WithLocalJniHandle (value, lref => { - JNIEnv.CallNonvirtualVoidMethod (Handle, class_ref, id_put_ILjava_lang_Object_, new JValue (key), new JValue (lref)); + JNIEnv.CallNonvirtualVoidMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_put_ILjava_lang_Object_, new JValue (key), new JValue (lref)); return IntPtr.Zero; }); } @@ -81,9 +85,9 @@ public virtual void Put (int key, E value) public virtual void SetValueAt (int index, E value) { if (id_setValueAt_ILjava_lang_Object_ == IntPtr.Zero) - id_setValueAt_ILjava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "setValueAt", "(ILjava/lang/Object;)V"); + id_setValueAt_ILjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "setValueAt", "(ILjava/lang/Object;)V"); JavaConvert.WithLocalJniHandle (value, lref => { - JNIEnv.CallNonvirtualVoidMethod (Handle, class_ref, id_setValueAt_ILjava_lang_Object_, new JValue (index), new JValue (lref)); + JNIEnv.CallNonvirtualVoidMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_setValueAt_ILjava_lang_Object_, new JValue (index), new JValue (lref)); return IntPtr.Zero; }); } @@ -93,9 +97,9 @@ public virtual void SetValueAt (int index, E value) public new virtual E ValueAt (int index) { if (id_valueAt_I == IntPtr.Zero) - id_valueAt_I = JNIEnv.GetMethodID (class_ref, "valueAt", "(I)Ljava/lang/Object;"); + id_valueAt_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "valueAt", "(I)Ljava/lang/Object;"); return JavaConvert.FromJniHandle ( - JNIEnv.CallNonvirtualObjectMethod (Handle, class_ref, id_valueAt_I, new JValue (index)), + JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_valueAt_I, new JValue (index)), JniHandleOwnership.TransferLocalRef)!; } } diff --git a/src/Mono.Android/Android.Widget/AbsListView.cs b/src/Mono.Android/Android.Widget/AbsListView.cs index c989aec88dc..178cd4823b8 100644 --- a/src/Mono.Android/Android.Widget/AbsListView.cs +++ b/src/Mono.Android/Android.Widget/AbsListView.cs @@ -73,7 +73,7 @@ public abstract override IListAdapter? Adapter { public virtual void SetAdapter (Android.Widget.IListAdapter adapter) { if (id_setAdapter_Landroid_widget_ListAdapter_ == IntPtr.Zero) - id_setAdapter_Landroid_widget_ListAdapter_ = JNIEnv.GetMethodID (class_ref, "setAdapter", "(Landroid/widget/ListAdapter;)V"); + id_setAdapter_Landroid_widget_ListAdapter_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "setAdapter", "(Landroid/widget/ListAdapter;)V"); if (GetType () == ThresholdType) JNIEnv.CallVoidMethod (Handle, id_setAdapter_Landroid_widget_ListAdapter_, new JValue (adapter)); @@ -95,7 +95,7 @@ public unsafe override IListAdapter? Adapter { value = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null).Handle; #else // !JAVA_INTEROP if (id_getAdapter == IntPtr.Zero) - id_getAdapter = JNIEnv.GetMethodID (class_ref, "getAdapter", "()Landroid/widget/Adapter;"); + id_getAdapter = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAdapter", "()Landroid/widget/Adapter;"); value = JNIEnv.CallObjectMethod (Handle, id_getAdapter); #endif // !JAVA_INTEROP return Java.Lang.Object.GetObject (value, JniHandleOwnership.TransferLocalRef); @@ -113,7 +113,7 @@ public unsafe override IListAdapter? Adapter { } #else // !JAVA_INTEROP if (id_setAdapter_Landroid_widget_Adapter_ == IntPtr.Zero) - id_setAdapter_Landroid_widget_Adapter_ = JNIEnv.GetMethodID (class_ref, "setAdapter", "(Landroid/widget/ListAdapter;)V"); + id_setAdapter_Landroid_widget_Adapter_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "setAdapter", "(Landroid/widget/ListAdapter;)V"); JNIEnv.CallVoidMethod (Handle, id_setAdapter_Landroid_widget_Adapter_, new JValue (JNIEnv.ToJniHandle (value))); #endif // !JAVA_INTEROP } diff --git a/src/Mono.Android/Android.Widget/AdapterView.cs b/src/Mono.Android/Android.Widget/AdapterView.cs index 393f81aebbf..00e86318358 100644 --- a/src/Mono.Android/Android.Widget/AdapterView.cs +++ b/src/Mono.Android/Android.Widget/AdapterView.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using Android.Views; using JLO = Java.Lang.Object; @@ -55,6 +56,9 @@ public abstract class AdapterView< T > : AdapterView where T : IAdapter { + [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] + static extern ref JniPeerMembers GetPeerMembers (AdapterView? _); + public AdapterView (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -70,11 +74,11 @@ public AdapterView (Android.Content.Context context) if (GetType () == typeof (AdapterView)) { if (id_ctor_Landroid_content_Context_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;)V"); + id_ctor_Landroid_content_Context_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_, new JValue (context)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_, new JValue (context)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_, new JValue (context)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_, new JValue (context)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;)V", new JValue (context)), @@ -94,11 +98,11 @@ public AdapterView (Android.Content.Context context, Android.Util.IAttributeSet if (GetType () == typeof (AdapterView)) { if (id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;Landroid/util/AttributeSet;)V"); + id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;Landroid/util/AttributeSet;)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (context), new JValue (attrs)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (context), new JValue (attrs)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (context), new JValue (attrs)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (context), new JValue (attrs)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;Landroid/util/AttributeSet;)V", new JValue (context), new JValue (attrs)), @@ -119,11 +123,11 @@ public AdapterView (Android.Content.Context context, Android.Util.IAttributeSet if (GetType () == typeof (AdapterView)) { if (id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I == IntPtr.Zero) - id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;Landroid/util/AttributeSet;I)V"); + id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;Landroid/util/AttributeSet;I)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (context), new JValue (attrs), new JValue (defStyle)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (context), new JValue (attrs), new JValue (defStyle)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (context), new JValue (attrs), new JValue (defStyle)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (context), new JValue (attrs), new JValue (defStyle)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;Landroid/util/AttributeSet;I)V", new JValue (context), new JValue (attrs), new JValue (defStyle)), diff --git a/src/Mono.Android/Android.Widget/AdapterViewAnimator.cs b/src/Mono.Android/Android.Widget/AdapterViewAnimator.cs index 26670405146..3af43744109 100644 --- a/src/Mono.Android/Android.Widget/AdapterViewAnimator.cs +++ b/src/Mono.Android/Android.Widget/AdapterViewAnimator.cs @@ -26,9 +26,9 @@ public AdapterViewAnimator (Android.Content.Context context) { if (GetType () == typeof (AdapterViewAnimator)) { if (id_ctor_Landroid_content_Context_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;)V"); + id_ctor_Landroid_content_Context_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;)V"); SetHandle ( - JNIEnv.NewObject (class_ref, id_ctor_Landroid_content_Context_, new JValue (context)), + JNIEnv.NewObject (_members.JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_, new JValue (context)), JniHandleOwnership.TransferLocalRef); } else { SetHandle ( @@ -44,9 +44,9 @@ public AdapterViewAnimator (Android.Content.Context context, Android.Util.IAttri { if (GetType () == typeof (AdapterViewAnimator)) { if (id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;Landroid/util/AttributeSet;)V"); + id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;Landroid/util/AttributeSet;)V"); SetHandle ( - JNIEnv.NewObject (class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (context), new JValue (attrs)), + JNIEnv.NewObject (_members.JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_, new JValue (context), new JValue (attrs)), JniHandleOwnership.TransferLocalRef); } else { SetHandle ( @@ -62,9 +62,9 @@ public AdapterViewAnimator (Android.Content.Context context, Android.Util.IAttri { if (GetType () == typeof (AdapterViewAnimator)) { if (id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I == IntPtr.Zero) - id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;Landroid/util/AttributeSet;I)V"); + id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;Landroid/util/AttributeSet;I)V"); SetHandle ( - JNIEnv.NewObject (class_ref, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (context), new JValue (attrs), new JValue (defStyle)), + JNIEnv.NewObject (_members.JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_Landroid_util_AttributeSet_I, new JValue (context), new JValue (attrs), new JValue (defStyle)), JniHandleOwnership.TransferLocalRef); } else { SetHandle ( @@ -85,7 +85,7 @@ public Android.Widget.IAdapter? Adapter { [Register ("getAdapter", "()Landroid/widget/Adapter;", "GetGetAdapterHandler")] get { if (id_getAdapter == IntPtr.Zero) - id_getAdapter = JNIEnv.GetMethodID (class_ref, "getAdapter", "()Landroid/widget/Adapter;"); + id_getAdapter = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "getAdapter", "()Landroid/widget/Adapter;"); Android.Widget.IAdapter? result; if (GetType () == ThresholdType) result = Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (Handle, id_getAdapter), JniHandleOwnership.TransferLocalRef); @@ -101,7 +101,7 @@ public Android.Widget.IAdapter? Adapter { } set { if (id_setAdapter_Landroid_widget_Adapter_ == IntPtr.Zero) - id_setAdapter_Landroid_widget_Adapter_ = JNIEnv.GetMethodID (class_ref, "setAdapter", "(Landroid/widget/Adapter;)V"); + id_setAdapter_Landroid_widget_Adapter_ = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "setAdapter", "(Landroid/widget/Adapter;)V"); if (GetType () == ThresholdType) JNIEnv.CallVoidMethod (Handle, id_setAdapter_Landroid_widget_Adapter_, new JValue (JNIEnv.ToJniHandle (value))); diff --git a/src/Mono.Android/Android.Widget/ArrayAdapter.cs b/src/Mono.Android/Android.Widget/ArrayAdapter.cs index d59c1e126b7..ba14694dfeb 100644 --- a/src/Mono.Android/Android.Widget/ArrayAdapter.cs +++ b/src/Mono.Android/Android.Widget/ArrayAdapter.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Runtime.CompilerServices; using Android.Runtime; using Java.Interop; @@ -13,6 +14,9 @@ public partial class ArrayAdapter< T > : ArrayAdapter { + [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] + static extern ref JniPeerMembers GetPeerMembers (ArrayAdapter? _); + public ArrayAdapter (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) { @@ -28,11 +32,11 @@ public ArrayAdapter (Android.Content.Context context, int textViewResourceId) if (GetType () == typeof (ArrayAdapter)) { if (id_ctor_Landroid_content_Context_I == IntPtr.Zero) - id_ctor_Landroid_content_Context_I = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;I)V"); + id_ctor_Landroid_content_Context_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;I)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_I, new JValue (context), new JValue (textViewResourceId)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_I, new JValue (context), new JValue (textViewResourceId)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_I, new JValue (context), new JValue (textViewResourceId)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_I, new JValue (context), new JValue (textViewResourceId)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;I)V", new JValue (context), new JValue (textViewResourceId)), @@ -52,11 +56,11 @@ public ArrayAdapter (Android.Content.Context context, int resource, int textView if (GetType () == typeof (ArrayAdapter)) { if (id_ctor_Landroid_content_Context_II == IntPtr.Zero) - id_ctor_Landroid_content_Context_II = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;II)V"); + id_ctor_Landroid_content_Context_II = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;II)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_II, new JValue (context), new JValue (resource), new JValue (textViewResourceId)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_II, new JValue (context), new JValue (resource), new JValue (textViewResourceId)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_II, new JValue (context), new JValue (resource), new JValue (textViewResourceId)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_II, new JValue (context), new JValue (resource), new JValue (textViewResourceId)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;II)V", new JValue (context), new JValue (resource), new JValue (textViewResourceId)), @@ -77,11 +81,11 @@ public ArrayAdapter (Android.Content.Context context, int textViewResourceId, T[ IntPtr native_objects = JNIEnv.NewObjectArray (objects); if (GetType () == typeof (ArrayAdapter)) { if (id_ctor_Landroid_content_Context_IarrayLjava_lang_Object_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_IarrayLjava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;I[Ljava/lang/Object;)V"); + id_ctor_Landroid_content_Context_IarrayLjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;I[Ljava/lang/Object;)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_IarrayLjava_lang_Object_, new JValue (context), new JValue (textViewResourceId), new JValue (native_objects)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_IarrayLjava_lang_Object_, new JValue (context), new JValue (textViewResourceId), new JValue (native_objects)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_IarrayLjava_lang_Object_, new JValue (context), new JValue (textViewResourceId), new JValue (native_objects)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_IarrayLjava_lang_Object_, new JValue (context), new JValue (textViewResourceId), new JValue (native_objects)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;I[Ljava/lang/Object;)V", new JValue (context), new JValue (textViewResourceId), new JValue (native_objects)), @@ -103,11 +107,11 @@ public ArrayAdapter (Android.Content.Context context, int resource, int textView IntPtr native_objects = JNIEnv.NewObjectArray (objects);; if (GetType () == typeof (ArrayAdapter)) { if (id_ctor_Landroid_content_Context_IIarrayLjava_lang_Object_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_IIarrayLjava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;II[Ljava/lang/Object;)V"); + id_ctor_Landroid_content_Context_IIarrayLjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;II[Ljava/lang/Object;)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_IIarrayLjava_lang_Object_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (native_objects)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_IIarrayLjava_lang_Object_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (native_objects)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_IIarrayLjava_lang_Object_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (native_objects)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_IIarrayLjava_lang_Object_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (native_objects)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;II[Ljava/lang/Object;)V", new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (native_objects)), @@ -129,11 +133,11 @@ public ArrayAdapter (Android.Content.Context context, int textViewResourceId, Sy IntPtr lrefObjects = JavaList.ToLocalJniHandle (objects); if (GetType () == typeof (ArrayAdapter)) { if (id_ctor_Landroid_content_Context_ILjava_util_List_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_ILjava_util_List_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;ILjava/util/List;)V"); + id_ctor_Landroid_content_Context_ILjava_util_List_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;ILjava/util/List;)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_ILjava_util_List_, new JValue (context), new JValue (textViewResourceId), new JValue (lrefObjects)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_ILjava_util_List_, new JValue (context), new JValue (textViewResourceId), new JValue (lrefObjects)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_ILjava_util_List_, new JValue (context), new JValue (textViewResourceId), new JValue (lrefObjects)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_ILjava_util_List_, new JValue (context), new JValue (textViewResourceId), new JValue (lrefObjects)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;ILjava/util/List;)V", new JValue (context), new JValue (textViewResourceId), new JValue (lrefObjects)), @@ -155,11 +159,11 @@ public ArrayAdapter (Android.Content.Context context, int resource, int textView IntPtr lrefObjects = JavaList.ToLocalJniHandle (objects); if (GetType () == typeof (ArrayAdapter)) { if (id_ctor_Landroid_content_Context_IILjava_util_List_ == IntPtr.Zero) - id_ctor_Landroid_content_Context_IILjava_util_List_ = JNIEnv.GetMethodID (class_ref, "", "(Landroid/content/Context;IILjava/util/List;)V"); + id_ctor_Landroid_content_Context_IILjava_util_List_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "(Landroid/content/Context;IILjava/util/List;)V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor_Landroid_content_Context_IILjava_util_List_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (lrefObjects)), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_IILjava_util_List_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (lrefObjects)), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor_Landroid_content_Context_IILjava_util_List_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (lrefObjects)); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor_Landroid_content_Context_IILjava_util_List_, new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (lrefObjects)); } else { SetHandle ( JNIEnv.StartCreateInstance (GetType (), "(Landroid/content/Context;IILjava/util/List;)V", new JValue (context), new JValue (resource), new JValue (textViewResourceId), new JValue (lrefObjects)), @@ -175,9 +179,9 @@ public ArrayAdapter (Android.Content.Context context, int resource, int textView public void Add (T @object) { if (id_add_Ljava_lang_Object_ == IntPtr.Zero) - id_add_Ljava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "add", "(Ljava/lang/Object;)V"); + id_add_Ljava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "add", "(Ljava/lang/Object;)V"); JavaConvert.WithLocalJniHandle (@object, lref => { - JNIEnv.CallNonvirtualVoidMethod (Handle, class_ref, id_add_Ljava_lang_Object_, new JValue (lref)); + JNIEnv.CallNonvirtualVoidMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_add_Ljava_lang_Object_, new JValue (lref)); return IntPtr.Zero; }); } @@ -187,9 +191,9 @@ public void Add (T @object) public new static Android.Widget.ArrayAdapter CreateFromResource (Android.Content.Context context, int textArrayResId, int textViewResId) { if (id_createFromResource_Landroid_content_Context_II == IntPtr.Zero) - id_createFromResource_Landroid_content_Context_II = JNIEnv.GetStaticMethodID (class_ref, "createFromResource", "(Landroid/content/Context;II)Landroid/widget/ArrayAdapter;"); + id_createFromResource_Landroid_content_Context_II = JNIEnv.GetStaticMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "createFromResource", "(Landroid/content/Context;II)Landroid/widget/ArrayAdapter;"); var result = JavaConvert.FromJniHandle> ( - JNIEnv.CallStaticObjectMethod (class_ref, id_createFromResource_Landroid_content_Context_II, new JValue (context), new JValue (textArrayResId), new JValue (textViewResId)), + JNIEnv.CallStaticObjectMethod (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_createFromResource_Landroid_content_Context_II, new JValue (context), new JValue (textArrayResId), new JValue (textViewResId)), JniHandleOwnership.TransferLocalRef); GC.KeepAlive (context); return result ?? throw new InvalidOperationException ("Unable to marshal the return value to an Android.Widget.ArrayAdapter instance."); @@ -200,9 +204,9 @@ public void Add (T @object) public new T? GetItem (int position) { if (id_getItem_I == IntPtr.Zero) - id_getItem_I = JNIEnv.GetMethodID (class_ref, "getItem", "(I)Ljava/lang/Object;"); + id_getItem_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "getItem", "(I)Ljava/lang/Object;"); return JavaConvert.FromJniHandle( - JNIEnv.CallNonvirtualObjectMethod (Handle, class_ref, id_getItem_I, new JValue (position)), + JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_getItem_I, new JValue (position)), JniHandleOwnership.TransferLocalRef); } @@ -211,9 +215,9 @@ public void Add (T @object) public int GetPosition (T item) { if (id_getPosition_Ljava_lang_Object_ == IntPtr.Zero) - id_getPosition_Ljava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "getPosition", "(Ljava/lang/Object;)I"); + id_getPosition_Ljava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "getPosition", "(Ljava/lang/Object;)I"); return JavaConvert.WithLocalJniHandle (item, - lref => JNIEnv.CallNonvirtualIntMethod (Handle, class_ref, id_getPosition_Ljava_lang_Object_, new JValue (lref))); + lref => JNIEnv.CallNonvirtualIntMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_getPosition_Ljava_lang_Object_, new JValue (lref))); } static IntPtr id_insert_Ljava_lang_Object_I; @@ -221,9 +225,9 @@ public int GetPosition (T item) public void Insert (T @object, int index) { if (id_insert_Ljava_lang_Object_I == IntPtr.Zero) - id_insert_Ljava_lang_Object_I = JNIEnv.GetMethodID (class_ref, "insert", "(Ljava/lang/Object;I)V"); + id_insert_Ljava_lang_Object_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "insert", "(Ljava/lang/Object;I)V"); JavaConvert.WithLocalJniHandle (@object, lref => { - JNIEnv.CallNonvirtualVoidMethod (Handle, class_ref, id_insert_Ljava_lang_Object_I, new JValue (lref), new JValue (index)); + JNIEnv.CallNonvirtualVoidMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_insert_Ljava_lang_Object_I, new JValue (lref), new JValue (index)); return IntPtr.Zero; }); } @@ -233,9 +237,9 @@ public void Insert (T @object, int index) public void Remove (T @object) { if (id_remove_Ljava_lang_Object_ == IntPtr.Zero) - id_remove_Ljava_lang_Object_ = JNIEnv.GetMethodID (class_ref, "remove", "(Ljava/lang/Object;)V"); + id_remove_Ljava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "remove", "(Ljava/lang/Object;)V"); JavaConvert.WithLocalJniHandle (@object, lref => { - JNIEnv.CallNonvirtualVoidMethod (Handle, class_ref, id_remove_Ljava_lang_Object_, new JValue (lref)); + JNIEnv.CallNonvirtualVoidMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_remove_Ljava_lang_Object_, new JValue (lref)); return IntPtr.Zero; }); } @@ -245,8 +249,8 @@ public void Remove (T @object) public new void Sort (Java.Util.IComparator comparator) { if (id_sort_Ljava_util_Comparator_ == IntPtr.Zero) - id_sort_Ljava_util_Comparator_ = JNIEnv.GetMethodID (class_ref, "sort", "(Ljava/util/Comparator;)V"); - JNIEnv.CallNonvirtualVoidMethod (Handle, class_ref, id_sort_Ljava_util_Comparator_, new JValue (comparator)); + id_sort_Ljava_util_Comparator_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "sort", "(Ljava/util/Comparator;)V"); + JNIEnv.CallNonvirtualVoidMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_sort_Ljava_util_Comparator_, new JValue (comparator)); GC.KeepAlive (comparator); GC.KeepAlive (this); } diff --git a/src/Mono.Android/Android.Widget/BaseAdapter.cs b/src/Mono.Android/Android.Widget/BaseAdapter.cs index af41aa67e82..e846234668e 100644 --- a/src/Mono.Android/Android.Widget/BaseAdapter.cs +++ b/src/Mono.Android/Android.Widget/BaseAdapter.cs @@ -1,20 +1,16 @@ using System; +using System.Runtime.CompilerServices; using Android.Runtime; using Java.Interop; - namespace Android.Widget { [Register ("android/widget/BaseAdapter", DoNotGenerateAcw=true)] public abstract partial class BaseAdapter : BaseAdapter { - static IntPtr java_class_handle; - static new IntPtr class_ref { - get { - return JNIEnv.FindClass ("android/widget/BaseAdapter", ref java_class_handle); - } - } + [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] + static extern ref JniPeerMembers GetPeerMembers (BaseAdapter? _); public BaseAdapter (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) @@ -38,11 +34,11 @@ public BaseAdapter () } if (id_ctor == IntPtr.Zero) - id_ctor = JNIEnv.GetMethodID (class_ref, "", "()V"); + id_ctor = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "", "()V"); SetHandle ( - JNIEnv.StartCreateInstance (class_ref, id_ctor), + JNIEnv.StartCreateInstance (GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor), JniHandleOwnership.TransferLocalRef); - JNIEnv.FinishCreateInstance (Handle, class_ref, id_ctor); + JNIEnv.FinishCreateInstance (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_ctor); } public override Java.Lang.Object? GetItem (int position) @@ -54,4 +50,3 @@ public BaseAdapter () } } - diff --git a/src/Mono.Android/Android.Widget/TextView.cs b/src/Mono.Android/Android.Widget/TextView.cs index 5465af9f4b4..eeddb461e5c 100644 --- a/src/Mono.Android/Android.Widget/TextView.cs +++ b/src/Mono.Android/Android.Widget/TextView.cs @@ -11,7 +11,7 @@ public partial class TextView { void AddTextChangedListener (TextWatcherImplementor watcher) { if (id_addTextChangedListener == IntPtr.Zero) - id_addTextChangedListener = JNIEnv.GetMethodID (class_ref, "addTextChangedListener", "(Landroid/text/TextWatcher;)V"); + id_addTextChangedListener = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "addTextChangedListener", "(Landroid/text/TextWatcher;)V"); JNIEnv.CallVoidMethod (Handle, id_addTextChangedListener, new JValue (watcher)); GC.KeepAlive (watcher); GC.KeepAlive (this); diff --git a/src/Mono.Android/Java.Lang/Throwable.cs b/src/Mono.Android/Java.Lang/Throwable.cs index a6dcdb4422f..51c533f3251 100644 --- a/src/Mono.Android/Java.Lang/Throwable.cs +++ b/src/Mono.Android/Java.Lang/Throwable.cs @@ -66,7 +66,7 @@ public IntPtr Handle { [DebuggerBrowsable (DebuggerBrowsableState.Never)] [EditorBrowsable (EditorBrowsableState.Never)] protected virtual IntPtr ThresholdClass { - get { return class_ref; } + get { return _members.JniPeerType.PeerReference.Handle; } } [DebuggerBrowsable (DebuggerBrowsableState.Never)] diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs index 33132c9479e..2209f0b9791 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs +++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs @@ -98,7 +98,7 @@ public void Arrays () public void JavaSideActivation () { using (var i = new ConstructorTest ()) { - // To ensure that CallMethodFromCtor.class_ref is initialized + // Ensure the Java class handle is initialized. } using (var c = Java.Lang.Class.FromType (typeof (ConstructorTest))) { int initGref = Java.Interop.Runtime.GlobalReferenceCount; @@ -367,7 +367,7 @@ public ConstructorTest () { DefaultConstructorInvoked = true; - // Ensure that CallMethodFromCtor.class_ref is initialized + // Ensure the Java class handle is initialized. var ignore = ThresholdClass; ignore = ignore; } @@ -391,4 +391,3 @@ public class B : Java.Lang.Object { } } } - diff --git a/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Timing.cs b/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Timing.cs index dd592581889..4c8c53dee55 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Timing.cs +++ b/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Timing.cs @@ -21,7 +21,7 @@ public partial class Timing { public virtual unsafe void VirtualVoidMethod_Timing_Traditional () { if (jonp_id_VirtualVoidMethod == IntPtr.Zero) - jonp_id_VirtualVoidMethod = JNIEnv.GetMethodID (class_ref, "VirtualVoidMethod", "()V"); + jonp_id_VirtualVoidMethod = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "VirtualVoidMethod", "()V"); if (GetType () == ThresholdType) JNIEnv.CallVoidMethod (Handle, jonp_id_VirtualVoidMethod); @@ -34,7 +34,7 @@ public virtual unsafe void VirtualVoidMethod_Timing_Traditional () public virtual unsafe void VirtualVoidMethod_Timing_TraditionalWithCaching () { if (jonp_id_VirtualVoidMethod == IntPtr.Zero) - jonp_id_VirtualVoidMethod = JNIEnv.GetMethodID (class_ref, "VirtualVoidMethod", "()V"); + jonp_id_VirtualVoidMethod = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "VirtualVoidMethod", "()V"); if (GetType () == ThresholdType) JNIEnv.CallVoidMethod (Handle, jonp_id_VirtualVoidMethod); @@ -50,7 +50,7 @@ public virtual unsafe void VirtualVoidMethod_Timing_TraditionalWithCaching () public unsafe void VirtualVoidMethod_Timing_NoCache () { - var m = JNIEnv.GetMethodID (class_ref, "VirtualVoidMethod", "()V"); + var m = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "VirtualVoidMethod", "()V"); if (GetType () == ThresholdType) JNIEnv.CallVoidMethod (Handle, m); @@ -65,7 +65,7 @@ public unsafe void VirtualVoidMethod_Timing_DictWithLock () IntPtr m; lock (dictInstanceMethods) { if (!dictInstanceMethods.TryGetValue (id, out m)) - dictInstanceMethods.Add (id, m = JNIEnv.GetMethodID (class_ref, "VirtualVoidMethod", "()V")); + dictInstanceMethods.Add (id, m = JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "VirtualVoidMethod", "()V")); } if (GetType () == ThresholdType) @@ -80,8 +80,8 @@ public unsafe void VirtualVoidMethod_Timing_ConcurrentDict () const string id = "VirtualVoidMethod.()V"; var m = concurrentInstanceMethods.AddOrUpdate (id, - s => JNIEnv.GetMethodID (class_ref, "VirtualVoidMethod", "()V"), - (s, c) => c != IntPtr.Zero ? c : JNIEnv.GetMethodID (class_ref, "VirtualVoidMethod", "()V")); + s => JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "VirtualVoidMethod", "()V"), + (s, c) => c != IntPtr.Zero ? c : JNIEnv.GetMethodID (_members.JniPeerType.PeerReference.Handle, "VirtualVoidMethod", "()V")); if (GetType () == ThresholdType) JNIEnv.CallVoidMethod (Handle, m); diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Content/ContentValuesTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Content/ContentValuesTests.cs new file mode 100644 index 00000000000..1c5091bba4b --- /dev/null +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Content/ContentValuesTests.cs @@ -0,0 +1,20 @@ +using NUnit.Framework; + +using Android.Content; + +namespace Android.ContentTests { + + [TestFixture] + public class ContentValuesTests { + + [Test] + public void PrimitiveValueRoundTrips () + { + using var values = new ContentValues (); + + values.Put ("answer", 42); + + Assert.AreEqual (42, values.GetAsInteger ("answer")); + } + } +} diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Util/SparseArrayTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Util/SparseArrayTests.cs new file mode 100644 index 00000000000..b48b9e19ad4 --- /dev/null +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Util/SparseArrayTests.cs @@ -0,0 +1,20 @@ +using NUnit.Framework; + +using Android.Util; + +namespace Android.UtilTests { + + [TestFixture] + public class SparseArrayTests { + + [Test] + public void GenericSparseArrayUsesSparseArrayClass () + { + using var values = new SparseArray (); + + values.Put (1, "one"); + + Assert.AreEqual ("one", values.Get (1)); + } + } +} diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Widget/AdapterTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Widget/AdapterTests.cs index b19480f24ca..73c756c38bb 100644 --- a/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Widget/AdapterTests.cs +++ b/tests/Mono.Android-Tests/Mono.Android-Tests/Android.Widget/AdapterTests.cs @@ -59,6 +59,16 @@ public void GridView_Adapter () var adapter = view.Adapter; view.Adapter = adapter; } + + [Test] + public void GenericArrayAdapterUsesArrayAdapterClass () + { + using var adapter = new ArrayAdapter (Application.Context, Android.Resource.Layout.SimpleListItem1); + + adapter.Add ("first"); + + Assert.AreEqual ("first", adapter.GetItem (0)); + } } public class CanOverrideAbsListView_Adapter : AbsListView { From fb6346d6bce2d034b06575d62a292afb8784f6d5 Mon Sep 17 00:00:00 2001 From: Simon Rozsival Date: Fri, 4 Sep 2026 16:14:57 +0200 Subject: [PATCH 2/2] [generator] Address class_ref review feedback Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/Mono.Android/Android.OS/AsyncTask.cs | 4 ++-- src/Mono.Android/Android.Util/SparseArray.cs | 11 +++++++---- src/Mono.Android/Android.Widget/AdapterView.cs | 2 +- src/Mono.Android/Android.Widget/ArrayAdapter.cs | 2 +- src/Mono.Android/Android.Widget/BaseAdapter.cs | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Mono.Android/Android.OS/AsyncTask.cs b/src/Mono.Android/Android.OS/AsyncTask.cs index 970b99fd73c..725c5fb4da0 100644 --- a/src/Mono.Android/Android.OS/AsyncTask.cs +++ b/src/Mono.Android/Android.OS/AsyncTask.cs @@ -20,10 +20,10 @@ public abstract class AsyncTask< > : AsyncTask { [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] - static extern ref JniPeerMembers GetPeerMembers (AsyncTask? _); + static extern ref readonly JniPeerMembers GetPeerMembers (AsyncTask? _); protected override IntPtr ThresholdClass { - get { return GetPeerMembers (null).JniPeerType.PeerReference.Handle; } + get { return GetPeerMembers (null).JniPeerType.PeerReference.Handle; } } protected override global::System.Type ThresholdType { diff --git a/src/Mono.Android/Android.Util/SparseArray.cs b/src/Mono.Android/Android.Util/SparseArray.cs index 524eaaef3bd..73e984dda85 100644 --- a/src/Mono.Android/Android.Util/SparseArray.cs +++ b/src/Mono.Android/Android.Util/SparseArray.cs @@ -15,7 +15,7 @@ public partial class SparseArray< > : SparseArray { [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] - static extern ref JniPeerMembers GetPeerMembers (SparseArray? _); + static extern ref readonly JniPeerMembers GetPeerMembers (SparseArray? _); public SparseArray () { @@ -40,22 +40,24 @@ public virtual void Append (int key, E value) static IntPtr id_get_I; [Register ("get", "(I)Ljava/lang/Object;", "")] + [return: MaybeNull] public new virtual E Get (int key) { if (id_get_I == IntPtr.Zero) id_get_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "get", "(I)Ljava/lang/Object;"); - return JavaConvert.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_get_I, new JValue (key)), JniHandleOwnership.TransferLocalRef)!; + return JavaConvert.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_get_I, new JValue (key)), JniHandleOwnership.TransferLocalRef); } static IntPtr id_get_ILjava_lang_Object_; [Register ("get", "(ILjava/lang/Object;)Ljava/lang/Object;", "")] + [return: MaybeNull] public virtual E Get (int key, E valueIfKeyNotFound) { if (id_get_ILjava_lang_Object_ == IntPtr.Zero) id_get_ILjava_lang_Object_ = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "get", "(ILjava/lang/Object;)Ljava/lang/Object;"); IntPtr value = JavaConvert.WithLocalJniHandle (valueIfKeyNotFound, lref => JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_get_ILjava_lang_Object_, new JValue (key), new JValue (lref))); - return JavaConvert.FromJniHandle (value, JniHandleOwnership.TransferLocalRef)!; + return JavaConvert.FromJniHandle (value, JniHandleOwnership.TransferLocalRef); } static IntPtr id_indexOfValue_Ljava_lang_Object_; @@ -94,13 +96,14 @@ public virtual void SetValueAt (int index, E value) static IntPtr id_valueAt_I; [Register ("valueAt", "(I)Ljava/lang/Object;", "")] + [return: MaybeNull] public new virtual E ValueAt (int index) { if (id_valueAt_I == IntPtr.Zero) id_valueAt_I = JNIEnv.GetMethodID (GetPeerMembers (null).JniPeerType.PeerReference.Handle, "valueAt", "(I)Ljava/lang/Object;"); return JavaConvert.FromJniHandle ( JNIEnv.CallNonvirtualObjectMethod (Handle, GetPeerMembers (null).JniPeerType.PeerReference.Handle, id_valueAt_I, new JValue (index)), - JniHandleOwnership.TransferLocalRef)!; + JniHandleOwnership.TransferLocalRef); } } } diff --git a/src/Mono.Android/Android.Widget/AdapterView.cs b/src/Mono.Android/Android.Widget/AdapterView.cs index 00e86318358..c0cca6dd626 100644 --- a/src/Mono.Android/Android.Widget/AdapterView.cs +++ b/src/Mono.Android/Android.Widget/AdapterView.cs @@ -57,7 +57,7 @@ public abstract class AdapterView< > : AdapterView where T : IAdapter { [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] - static extern ref JniPeerMembers GetPeerMembers (AdapterView? _); + static extern ref readonly JniPeerMembers GetPeerMembers (AdapterView? _); public AdapterView (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) diff --git a/src/Mono.Android/Android.Widget/ArrayAdapter.cs b/src/Mono.Android/Android.Widget/ArrayAdapter.cs index ba14694dfeb..2243b97bf78 100644 --- a/src/Mono.Android/Android.Widget/ArrayAdapter.cs +++ b/src/Mono.Android/Android.Widget/ArrayAdapter.cs @@ -15,7 +15,7 @@ public partial class ArrayAdapter< > : ArrayAdapter { [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] - static extern ref JniPeerMembers GetPeerMembers (ArrayAdapter? _); + static extern ref readonly JniPeerMembers GetPeerMembers (ArrayAdapter? _); public ArrayAdapter (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) diff --git a/src/Mono.Android/Android.Widget/BaseAdapter.cs b/src/Mono.Android/Android.Widget/BaseAdapter.cs index e846234668e..b3507772479 100644 --- a/src/Mono.Android/Android.Widget/BaseAdapter.cs +++ b/src/Mono.Android/Android.Widget/BaseAdapter.cs @@ -10,7 +10,7 @@ namespace Android.Widget { public abstract partial class BaseAdapter : BaseAdapter { [UnsafeAccessor (UnsafeAccessorKind.StaticField, Name = "_members")] - static extern ref JniPeerMembers GetPeerMembers (BaseAdapter? _); + static extern ref readonly JniPeerMembers GetPeerMembers (BaseAdapter? _); public BaseAdapter (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)