diff --git a/tools/generator/ClassGen.cs b/tools/generator/ClassGen.cs index d71f58949..5928ba747 100644 --- a/tools/generator/ClassGen.cs +++ b/tools/generator/ClassGen.cs @@ -162,10 +162,6 @@ public override string NativeType { get { return "IntPtr"; } } - public bool HasClassHandle { - get { return ctors.Count > 0 || Fields.Count > 0 || Methods.Count > 0 || Properties.Count > 0 || IsAnnotation; } - } - public IList Ctors { get { return ctors; } } @@ -451,17 +447,16 @@ public override void Generate (StreamWriter sw, string indent, CodeGenerationOpt sw.WriteLine (); } - if (HasClassHandle) { - bool requireNew = false; + bool requireNew = InheritsObject; + if (!requireNew) { for (var bg = BaseGen; bg != null && bg is XmlClassGen; bg = bg.BaseGen) { - if (bg.HasClassHandle) { + if (bg.InheritsObject) { requireNew = true; break; } } - - opt.CodeGenerator.WriteClassHandle (this, sw, indent, opt, requireNew); } + opt.CodeGenerator.WriteClassHandle (this, sw, indent, opt, requireNew); GenConstructors (sw, indent + "\t", opt); diff --git a/tools/generator/Tests/expected.ji/Adapters/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/Adapters/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/Adapters/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/Adapters/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs b/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs index a0977be65..6190389b8 100644 --- a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs +++ b/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs @@ -10,8 +10,8 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.Adapter"})] public abstract partial class AdapterView : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AdapterView", typeof (AdapterView)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/AdapterView", typeof (AdapterView)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs index 83c6ffba3..0ff044d66 100644 --- a/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tools/generator/Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/GenericReturnObject", DoNotGenerateAcw=true)] public partial class GenericReturnObject : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/GenericReturnObject", typeof (GenericReturnObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/GenericReturnObject", typeof (GenericReturnObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/Android.Graphics.Color/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index cd58c734f..2b86b9ea7 100644 --- a/tools/generator/Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -29,8 +29,8 @@ public abstract partial class SomeObject : global::Java.Lang.Object { } } } - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/Arrays/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/Arrays/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/Arrays/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/Arrays/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs index b3dd70b53..837f75d54 100644 --- a/tools/generator/Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs @@ -163,8 +163,8 @@ public IList Mylongs { } } } - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tools/generator/Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index 9a6c3aaa9..a41eff6bf 100644 --- a/tools/generator/Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tools/generator/Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/CSharpKeywords", DoNotGenerateAcw=true)] public partial class CSharpKeywords : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/CSharpKeywords", typeof (CSharpKeywords)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/CSharpKeywords", typeof (CSharpKeywords)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/Constructors/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/Constructors/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/Constructors/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/Constructors/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs index 9d93bd535..75541cac0 100644 --- a/tools/generator/Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs b/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs index adbbeb330..7fd8756f0 100644 --- a/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs +++ b/tools/generator/Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs @@ -9,8 +9,8 @@ namespace Com.Google.Android.Exoplayer.Drm { [global::Android.Runtime.Register ("com/google/android/exoplayer/drm/FrameworkMediaDrm", DoNotGenerateAcw=true)] public sealed partial class FrameworkMediaDrm : global::Java.Lang.Object, global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaDrm", typeof (FrameworkMediaDrm)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("com/google/android/exoplayer/drm/FrameworkMediaDrm", typeof (FrameworkMediaDrm)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/GenericArguments/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/GenericArguments/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/GenericArguments/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/GenericArguments/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/NestedTypes/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/NestedTypes/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/NestedTypes/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/NestedTypes/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 5fd145a45..8637c3507 100644 --- a/tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tools/generator/Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -103,6 +103,25 @@ static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) } + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$Action", typeof (Action)); + internal static new IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + protected override IntPtr ThresholdClass { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + protected Action (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } @@ -129,8 +148,8 @@ public ActionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle [global::Android.Runtime.Register ("xamarin/test/NotificationCompatBase$InstanceInner", DoNotGenerateAcw=true)] public abstract partial class InstanceInner : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInner)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase$InstanceInner", typeof (InstanceInner)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } @@ -190,6 +209,25 @@ public InstanceInnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base } + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/NotificationCompatBase", typeof (NotificationCompatBase)); + internal static new IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + protected override IntPtr ThresholdClass { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + protected NotificationCompatBase (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/NonStaticFields/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs index 665e17a4e..33dff2b78 100644 --- a/tools/generator/Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs @@ -29,8 +29,8 @@ public int Value { } } } - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Class.cs b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Class.cs index 96b1be034..2694e8521 100644 --- a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Class.cs +++ b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Class.cs @@ -10,6 +10,25 @@ namespace Java.Lang { [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] public partial class Class : global::Java.Lang.Object { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Class", typeof (Class)); + internal static new IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + protected override IntPtr ThresholdClass { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + protected Class (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs index e202ede47..8684a3119 100644 --- a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs +++ b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Integer.cs @@ -9,6 +9,25 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Integer", DoNotGenerateAcw=true)] public partial class Integer : global::Java.Lang.Object { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Integer", typeof (Integer)); + internal static new IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + protected override IntPtr ThresholdClass { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + protected Integer (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs index da03ab54d..78a940f2b 100644 --- a/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs +++ b/tools/generator/Tests/expected.ji/NormalMethods/Java.Lang.Throwable.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Throwable", DoNotGenerateAcw=true)] public partial class Throwable { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Throwable", typeof (Throwable)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs b/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs index 42d47b718..8b22b759a 100644 --- a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs +++ b/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.A.cs @@ -14,8 +14,8 @@ public partial class A : global::Java.Lang.Object { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.A.B"})] public partial class B : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A$B", typeof (B)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A$B", typeof (B)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } @@ -67,8 +67,8 @@ static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int in } - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs b/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs index 034084998..7dcac800a 100644 --- a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs +++ b/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.C.cs @@ -10,8 +10,8 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.C"})] public partial class C : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/C", typeof (C)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/C", typeof (C)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs index 4d57e4f54..8d526043c 100644 --- a/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/NormalProperties/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/NormalProperties/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/NormalProperties/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/NormalProperties/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs index 89d5af172..2cc70f125 100644 --- a/tools/generator/Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public abstract partial class SomeObject : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs b/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs index e202ede47..8684a3119 100644 --- a/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs +++ b/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Integer.cs @@ -9,6 +9,25 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Integer", DoNotGenerateAcw=true)] public partial class Integer : global::Java.Lang.Object { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Integer", typeof (Integer)); + internal static new IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + protected override IntPtr ThresholdClass { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + protected Integer (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/ParameterXPath/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs b/tools/generator/Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs index 2b360caa5..db35f0bd7 100644 --- a/tools/generator/Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs +++ b/tools/generator/Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs @@ -10,8 +10,8 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends java.lang.Object"})] public partial class A : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/A", typeof (A)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/StaticFields/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/StaticFields/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/StaticFields/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/StaticFields/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs index 53127679a..e48f91bcd 100644 --- a/tools/generator/Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs @@ -41,8 +41,8 @@ public static int Value2 { } } } - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/StaticMethods/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/StaticMethods/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/StaticMethods/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/StaticMethods/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs index 9704a5e7f..d6d427485 100644 --- a/tools/generator/Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/StaticProperties/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/StaticProperties/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/StaticProperties/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/StaticProperties/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs index dbc1fe4fb..d560fe275 100644 --- a/tools/generator/Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/Streams/Java.IO.InputStream.cs b/tools/generator/Tests/expected.ji/Streams/Java.IO.InputStream.cs index 197b3f0f8..5ad3786ca 100644 --- a/tools/generator/Tests/expected.ji/Streams/Java.IO.InputStream.cs +++ b/tools/generator/Tests/expected.ji/Streams/Java.IO.InputStream.cs @@ -9,8 +9,8 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/InputStream", DoNotGenerateAcw=true)] public abstract partial class InputStream : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/InputStream", typeof (InputStream)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/InputStream", typeof (InputStream)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/Streams/Java.IO.OutputStream.cs b/tools/generator/Tests/expected.ji/Streams/Java.IO.OutputStream.cs index f536bd179..46e3562ab 100644 --- a/tools/generator/Tests/expected.ji/Streams/Java.IO.OutputStream.cs +++ b/tools/generator/Tests/expected.ji/Streams/Java.IO.OutputStream.cs @@ -9,8 +9,8 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/OutputStream", DoNotGenerateAcw=true)] public abstract partial class OutputStream : global::Java.Lang.Object { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/OutputStream", typeof (OutputStream)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/io/OutputStream", typeof (OutputStream)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/Streams/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/Streams/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/Streams/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/Streams/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.String.cs b/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.String.cs index 01fd8ad01..62cc22cfa 100644 --- a/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.String.cs +++ b/tools/generator/Tests/expected.ji/TestInterface/Java.Lang.String.cs @@ -9,6 +9,25 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/String", DoNotGenerateAcw=true)] public partial class String : global::Java.Lang.Object { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/String", typeof (String)); + internal static new IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + protected override IntPtr ThresholdClass { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + protected String (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs index afece635d..b5d58b5e8 100644 --- a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs +++ b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs @@ -9,8 +9,8 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericImplementation", DoNotGenerateAcw=true)] public partial class GenericImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericImplementation", typeof (GenericImplementation)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericImplementation", typeof (GenericImplementation)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs index 578dc75f7..e2b6c5c35 100644 --- a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -9,8 +9,8 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericStringImplementation", DoNotGenerateAcw=true)] public partial class GenericStringImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericStringImplementation", typeof (GenericStringImplementation)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/GenericStringImplementation", typeof (GenericStringImplementation)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 38ad4966f..eec041867 100644 --- a/tools/generator/Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tools/generator/Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -31,8 +31,8 @@ public static class InterfaceConsts { } } - internal static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementation)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("test/me/TestInterfaceImplementation", typeof (TestInterfaceImplementation)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs b/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs index 715fcd8d2..960f6e807 100644 --- a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs +++ b/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs @@ -10,8 +10,8 @@ namespace Java.Lang { [global::Java.Interop.JavaTypeParameters (new string [] {"E extends java.lang.Enum"})] public abstract partial class Enum : global::Java.Lang.Object, global::Java.Lang.IComparable { - internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Enum", typeof (Enum)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Enum", typeof (Enum)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/java.lang.Enum/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/java.lang.Object/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/java.util.List/Java.Lang.Object.cs b/tools/generator/Tests/expected.ji/java.util.List/Java.Lang.Object.cs index af30ec490..ca9179fee 100644 --- a/tools/generator/Tests/expected.ji/java.util.List/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected.ji/java.util.List/Java.Lang.Object.cs @@ -9,5 +9,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object)); + internal static IntPtr class_ref { + get { + return _members.JniPeerType.PeerReference.Handle; + } + } + } } diff --git a/tools/generator/Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs index 43c62f518..c2c62b667 100644 --- a/tools/generator/Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs @@ -163,8 +163,8 @@ public partial class SomeObject : global::Java.Lang.Object { } } } - internal static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); - internal static IntPtr class_ref { + internal new static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); + internal static new IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.AdapterView.cs b/tools/generator/Tests/expected/Adapters/Xamarin.Test.AdapterView.cs index d05e0ac13..563d8837f 100644 --- a/tools/generator/Tests/expected/Adapters/Xamarin.Test.AdapterView.cs +++ b/tools/generator/Tests/expected/Adapters/Xamarin.Test.AdapterView.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.Adapter"})] public abstract partial class AdapterView : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/AdapterView", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs b/tools/generator/Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs index 920a44ca3..b8e38860b 100644 --- a/tools/generator/Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tools/generator/Tests/expected/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/GenericReturnObject", DoNotGenerateAcw=true)] public partial class GenericReturnObject : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/GenericReturnObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 5ec4e811e..6b95c8495 100644 --- a/tools/generator/Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -29,8 +29,8 @@ public abstract partial class SomeObject : global::Java.Lang.Object { } } } - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/Arrays/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/Arrays/Xamarin.Test.SomeObject.cs index 5c5e1b964..b06f262b2 100644 --- a/tools/generator/Tests/expected/Arrays/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/Arrays/Xamarin.Test.SomeObject.cs @@ -162,8 +162,8 @@ public IList Mylongs { } } } - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tools/generator/Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index b7c270c30..567d62dfd 100644 --- a/tools/generator/Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tools/generator/Tests/expected/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/CSharpKeywords", DoNotGenerateAcw=true)] public partial class CSharpKeywords : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/CSharpKeywords", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject.cs index 37d6e0550..80ad1d74a 100644 --- a/tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/Constructors/Xamarin.Test.SomeObject.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/EnumerationFixup/Java.Lang.Object.cs b/tools/generator/Tests/expected/EnumerationFixup/Java.Lang.Object.cs index 1aa80ac6b..f9126387e 100644 --- a/tools/generator/Tests/expected/EnumerationFixup/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected/EnumerationFixup/Java.Lang.Object.cs @@ -8,5 +8,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static IntPtr java_class_handle; + internal static IntPtr class_ref { + get { + return JNIEnv.FindClass ("java/lang/Object", ref java_class_handle); + } + } + } } diff --git a/tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs index 533b5098e..cec1db509 100644 --- a/tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/EnumerationFixup/Xamarin.Test.SomeObject.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs b/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs index b6eb6a108..5bfb3529b 100644 --- a/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs +++ b/tools/generator/Tests/expected/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs @@ -8,8 +8,8 @@ namespace Com.Google.Android.Exoplayer.Drm { [global::Android.Runtime.Register ("com/google/android/exoplayer/drm/FrameworkMediaDrm", DoNotGenerateAcw=true)] public sealed partial class FrameworkMediaDrm : global::Java.Lang.Object, global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("com/google/android/exoplayer/drm/FrameworkMediaDrm", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/GenericArguments/Java.Lang.Object.cs b/tools/generator/Tests/expected/GenericArguments/Java.Lang.Object.cs index 1aa80ac6b..f9126387e 100644 --- a/tools/generator/Tests/expected/GenericArguments/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected/GenericArguments/Java.Lang.Object.cs @@ -8,5 +8,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static IntPtr java_class_handle; + internal static IntPtr class_ref { + get { + return JNIEnv.FindClass ("java/lang/Object", ref java_class_handle); + } + } + } } diff --git a/tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index a55517e06..a4f375d34 100644 --- a/tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tools/generator/Tests/expected/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -94,6 +94,21 @@ static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) } + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { + get { + return JNIEnv.FindClass ("xamarin/test/NotificationCompatBase$Action", ref java_class_handle); + } + } + + protected override IntPtr ThresholdClass { + get { return class_ref; } + } + + protected override global::System.Type ThresholdType { + get { return typeof (Action); } + } + protected Action (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } @@ -114,8 +129,8 @@ public ActionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle [global::Android.Runtime.Register ("xamarin/test/NotificationCompatBase$InstanceInner", DoNotGenerateAcw=true)] public abstract partial class InstanceInner : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/NotificationCompatBase$InstanceInner", ref java_class_handle); } @@ -175,6 +190,21 @@ public InstanceInnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base } + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { + get { + return JNIEnv.FindClass ("xamarin/test/NotificationCompatBase", ref java_class_handle); + } + } + + protected override IntPtr ThresholdClass { + get { return class_ref; } + } + + protected override global::System.Type ThresholdType { + get { return typeof (NotificationCompatBase); } + } + protected NotificationCompatBase (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer) {} } diff --git a/tools/generator/Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs index 001c2fac8..85b72a02f 100644 --- a/tools/generator/Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/NonStaticFields/Xamarin.Test.SomeObject.cs @@ -28,8 +28,8 @@ public int Value { } } } - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/NormalMethods/Java.Lang.Throwable.cs b/tools/generator/Tests/expected/NormalMethods/Java.Lang.Throwable.cs index 48941d63c..a4120d2a3 100644 --- a/tools/generator/Tests/expected/NormalMethods/Java.Lang.Throwable.cs +++ b/tools/generator/Tests/expected/NormalMethods/Java.Lang.Throwable.cs @@ -8,5 +8,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Throwable", DoNotGenerateAcw=true)] public partial class Throwable { + internal static IntPtr java_class_handle; + internal static IntPtr class_ref { + get { + return JNIEnv.FindClass ("java/lang/Throwable", ref java_class_handle); + } + } + } } diff --git a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.A.cs b/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.A.cs index 6fa525920..22674a43d 100644 --- a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.A.cs +++ b/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.A.cs @@ -13,8 +13,8 @@ public partial class A : global::Java.Lang.Object { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.A.B"})] public partial class B : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/A$B", ref java_class_handle); } @@ -67,8 +67,8 @@ static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int in } - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/A", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.C.cs b/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.C.cs index 25babee02..bde8d119e 100644 --- a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.C.cs +++ b/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.C.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends xamarin.test.C"})] public partial class C : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/C", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs index 39983a318..076a51cd6 100644 --- a/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/NormalMethods/Xamarin.Test.SomeObject.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs index 2b6e7a26e..8f41cc46b 100644 --- a/tools/generator/Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/NormalProperties/Xamarin.Test.SomeObject.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public abstract partial class SomeObject : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/ParameterXPath/Xamarin.Test.A.cs b/tools/generator/Tests/expected/ParameterXPath/Xamarin.Test.A.cs index 999325733..a2a1f5999 100644 --- a/tools/generator/Tests/expected/ParameterXPath/Xamarin.Test.A.cs +++ b/tools/generator/Tests/expected/ParameterXPath/Xamarin.Test.A.cs @@ -9,8 +9,8 @@ namespace Xamarin.Test { [global::Java.Interop.JavaTypeParameters (new string [] {"T extends java.lang.Object"})] public partial class A : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/A", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs index ed7e39925..364f322f6 100644 --- a/tools/generator/Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/StaticFields/Xamarin.Test.SomeObject.cs @@ -40,8 +40,8 @@ public static int Value2 { } } } - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs index cfb3a78f0..65e1e5278 100644 --- a/tools/generator/Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/StaticMethods/Xamarin.Test.SomeObject.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs index 16a683ba3..d8748d502 100644 --- a/tools/generator/Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/StaticProperties/Xamarin.Test.SomeObject.cs @@ -8,8 +8,8 @@ namespace Xamarin.Test { [global::Android.Runtime.Register ("xamarin/test/SomeObject", DoNotGenerateAcw=true)] public partial class SomeObject : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/Streams/Java.IO.InputStream.cs b/tools/generator/Tests/expected/Streams/Java.IO.InputStream.cs index bdcbdecb6..5f0c0d95e 100644 --- a/tools/generator/Tests/expected/Streams/Java.IO.InputStream.cs +++ b/tools/generator/Tests/expected/Streams/Java.IO.InputStream.cs @@ -8,8 +8,8 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/InputStream", DoNotGenerateAcw=true)] public abstract partial class InputStream : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("java/io/InputStream", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/Streams/Java.IO.OutputStream.cs b/tools/generator/Tests/expected/Streams/Java.IO.OutputStream.cs index 600855ce6..223bf7a1f 100644 --- a/tools/generator/Tests/expected/Streams/Java.IO.OutputStream.cs +++ b/tools/generator/Tests/expected/Streams/Java.IO.OutputStream.cs @@ -8,8 +8,8 @@ namespace Java.IO { [global::Android.Runtime.Register ("java/io/OutputStream", DoNotGenerateAcw=true)] public abstract partial class OutputStream : global::Java.Lang.Object { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("java/io/OutputStream", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericImplementation.cs b/tools/generator/Tests/expected/TestInterface/Test.ME.GenericImplementation.cs index 1e3f6a5f0..bad6e22c0 100644 --- a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericImplementation.cs +++ b/tools/generator/Tests/expected/TestInterface/Test.ME.GenericImplementation.cs @@ -8,8 +8,8 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericImplementation", DoNotGenerateAcw=true)] public partial class GenericImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("test/me/GenericImplementation", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs b/tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs index ad93f8864..ce8075d6f 100644 --- a/tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tools/generator/Tests/expected/TestInterface/Test.ME.GenericStringImplementation.cs @@ -8,8 +8,8 @@ namespace Test.ME { [global::Android.Runtime.Register ("test/me/GenericStringImplementation", DoNotGenerateAcw=true)] public partial class GenericStringImplementation : global::Java.Lang.Object, global::Test.ME.IGenericInterface { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("test/me/GenericStringImplementation", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tools/generator/Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs index 73f6c1206..51abaf9ef 100644 --- a/tools/generator/Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tools/generator/Tests/expected/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -31,8 +31,8 @@ public static class InterfaceConsts { } } - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("test/me/TestInterfaceImplementation", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.cs b/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.cs index 6f86a4d31..32152a9a0 100644 --- a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.cs +++ b/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Enum.cs @@ -9,8 +9,8 @@ namespace Java.Lang { [global::Java.Interop.JavaTypeParameters (new string [] {"E extends java.lang.Enum"})] public abstract partial class Enum : global::Java.Lang.Object, global::Java.Lang.IComparable { - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("java/lang/Enum", ref java_class_handle); } diff --git a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Object.cs b/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Object.cs index 1aa80ac6b..f9126387e 100644 --- a/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected/java.lang.Enum/Java.Lang.Object.cs @@ -8,5 +8,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static IntPtr java_class_handle; + internal static IntPtr class_ref { + get { + return JNIEnv.FindClass ("java/lang/Object", ref java_class_handle); + } + } + } } diff --git a/tools/generator/Tests/expected/java.lang.Object/Java.Lang.Object.cs b/tools/generator/Tests/expected/java.lang.Object/Java.Lang.Object.cs index 1aa80ac6b..f9126387e 100644 --- a/tools/generator/Tests/expected/java.lang.Object/Java.Lang.Object.cs +++ b/tools/generator/Tests/expected/java.lang.Object/Java.Lang.Object.cs @@ -8,5 +8,12 @@ namespace Java.Lang { [global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)] public partial class Object { + internal static IntPtr java_class_handle; + internal static IntPtr class_ref { + get { + return JNIEnv.FindClass ("java/lang/Object", ref java_class_handle); + } + } + } } diff --git a/tools/generator/Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs b/tools/generator/Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs index c4af45824..1f761e762 100644 --- a/tools/generator/Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs +++ b/tools/generator/Tests/expected/java.util.List/Xamarin.Test.SomeObject.cs @@ -169,8 +169,8 @@ public partial class SomeObject : global::Java.Lang.Object { } } } - internal static IntPtr java_class_handle; - internal static IntPtr class_ref { + internal static new IntPtr java_class_handle; + internal static new IntPtr class_ref { get { return JNIEnv.FindClass ("xamarin/test/SomeObject", ref java_class_handle); }