Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Microsoft.Android-Tests.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Project Path="tests/CodeGen-Binding/Xamarin.Android.FixJavaAbstractMethod-APIv2Binding/Xamarin.Android.FixJavaAbstractMethod-APIv2Binding.csproj" />
<Project Path="tests/CodeGen-Binding/Xamarin.Android.FixJavaAbstractMethod-Library/Xamarin.Android.FixJavaAbstractMethod-Library.csproj" />
<Project Path="tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/Xamarin.Android.JcwGen-Tests.csproj" />
<Project Path="tests/CodeGen-Binding/Xamarin.Android.LegacyThresholdBinding/Xamarin.Android.LegacyThresholdBinding.csproj" />
<Project Path="tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.csproj" />
<Project Path="tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Xamarin.Android.McwGen-Tests.csproj" />
</Folder>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +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));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass));

protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (foo));
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo));
internal static IntPtr class_ref {
get {
return _members.JniPeerType.PeerReference.Handle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ internal partial class MyClassInvoker : MyClass {

public MyClassInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {}

static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));

public override global::Java.Interop.JniPeerMembers JniPeerMembers {
get { return _members; }
}

protected override global::System.Type ThresholdType {
get { return _members.ManagedPeerType; }
}

public override unsafe int AbstractCount {
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_AbstractCount' and count(parameter)=0]"
[Register ("get_AbstractCount", "()I", "Getget_AbstractCountHandler")]
Expand Down Expand Up @@ -49,4 +45,3 @@ internal partial class MyClassInvoker : MyClass {
}

}

Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));

public override global::Java.Interop.JniPeerMembers JniPeerMembers {
get { return _members; }
}

protected override global::System.Type ThresholdType {
get { return _members.ManagedPeerType; }
}

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public abstract class MyInterface : Java.Lang.Object {
_members.StaticMethods.InvokeVoidMethod (__id, null);
}

static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface));

}

Expand Down Expand Up @@ -80,19 +80,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
get { return _members_java_code_IMyInterface; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override IntPtr ThresholdClass {
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)]
protected override global::System.Type ThresholdType {
get { return _members_java_code_IMyInterface.ManagedPeerType; }
}

static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
static readonly JniPeerMembers _members_java_code_IMyInterface = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));

public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[global::Android.Runtime.Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterface {

static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));

static IntPtr java_class_ref {
get { return _members.JniPeerType.PeerReference.Handle; }
Expand All @@ -11,14 +11,6 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
get { return _members; }
}

protected override IntPtr ThresholdClass {
get { return class_ref; }
}

protected override global::System.Type ThresholdType {
get { return _members.ManagedPeerType; }
}

IntPtr class_ref;

public static IMyInterface? GetObject (IntPtr handle, JniHandleOwnership transfer)
Expand Down Expand Up @@ -279,4 +271,3 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
}

}

Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
// 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));
static readonly JniPeerMembers _members = new JniPeerMembers ("com/example/MyClass", typeof (MyClass));

[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 {
get { return _members; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override IntPtr ThresholdClass {
get { return _members.JniPeerType.PeerReference.Handle; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override global::System.Type ThresholdType {
get { return _members.ManagedPeerType; }
}

protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer)
{
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public partial class MyClass {
}
}

static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClass));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass));

protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ public abstract class Parent : Java.Lang.Object {
return __rm;
}

static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/Parent", typeof (Parent));
static readonly JniPeerMembers _members = new JniPeerMembers ("com/xamarin/android/Parent", typeof (Parent));

}

// Metadata.xml XPath interface reference: path="/api/package[@name='com.xamarin.android']/interface[@name='Parent']"
[Register ("com/xamarin/android/Parent", "", "Com.Xamarin.Android.IParentInvoker")]
public partial interface IParent : IJavaObject, IJavaPeerable {
private static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParent), isInterface: true);
private static readonly JniPeerMembers _members = new JniPeerMembers ("com/xamarin/android/Parent", typeof (IParent), isInterface: true);

// Metadata.xml XPath field reference: path="/api/package[@name='com.xamarin.android']/interface[@name='Parent']/field[@name='ACCEPT_HANDOVER']"
[Register ("ACCEPT_HANDOVER")]
Expand Down Expand Up @@ -107,19 +107,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent {
get { return _members_com_xamarin_android_Parent; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override IntPtr ThresholdClass {
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)]
protected override global::System.Type ThresholdType {
get { return _members_com_xamarin_android_Parent.ManagedPeerType; }
}

static readonly JniPeerMembers _members_com_xamarin_android_Parent = new XAPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker));
static readonly JniPeerMembers _members_com_xamarin_android_Parent = new JniPeerMembers ("com/xamarin/android/Parent", typeof (IParentInvoker));

public IParentInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +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));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass));

protected MyClass (IntPtr javaReference, JniHandleOwnership transfer) : base (javaReference, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (foo));
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo));
internal static IntPtr class_ref {
get {
return _members.JniPeerType.PeerReference.Handle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@ internal partial class MyClassInvoker : MyClass {

public MyClassInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {}

static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));

public override global::Java.Interop.JniPeerMembers JniPeerMembers {
get { return _members; }
}

protected override global::System.Type ThresholdType {
get { return _members.ManagedPeerType; }
}

public override unsafe int AbstractCount {
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_AbstractCount' and count(parameter)=0]"
[Register ("get_AbstractCount", "()I", "Getget_AbstractCountHandler")]
Expand Down Expand Up @@ -49,4 +45,3 @@ internal partial class MyClassInvoker : MyClass {
}

}

Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
static readonly JniPeerMembers _members = new XAPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));

public override global::Java.Interop.JniPeerMembers JniPeerMembers {
get { return _members; }
}

protected override global::System.Type ThresholdType {
get { return _members.ManagedPeerType; }
}

Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public abstract class MyInterface : Java.Lang.Object {
}
}

static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface));

}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
private static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);

// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='DoDeclaration' and count(parameter)=0]"
[Register ("DoDeclaration", "()V", "GetDoDeclarationHandler:java.code.IMyInterfaceInvoker, MyAssembly")]
Expand Down Expand Up @@ -45,19 +45,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
get { return _members_java_code_IMyInterface; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override IntPtr ThresholdClass {
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)]
protected override global::System.Type ThresholdType {
get { return _members_java_code_IMyInterface.ManagedPeerType; }
}

static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
static readonly JniPeerMembers _members_java_code_IMyInterface = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));

public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,7 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima
get { return _members_java_code_AnimatorListener; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override IntPtr ThresholdClass {
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)]
protected override global::System.Type ThresholdType {
get { return _members_java_code_AnimatorListener.ManagedPeerType; }
}

static readonly JniPeerMembers _members_java_code_AnimatorListener = new XAPeerMembers ("java/code/AnimatorListener", typeof (AnimatorListenerInvoker));
static readonly JniPeerMembers _members_java_code_AnimatorListener = new JniPeerMembers ("java/code/AnimatorListener", typeof (AnimatorListenerInvoker));

public AnimatorListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public abstract class MyInterface : Java.Lang.Object {
_members.StaticMethods.InvokeVoidMethod (__id, null);
}

static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface));
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (MyInterface));

}

Expand Down Expand Up @@ -80,19 +80,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
get { return _members_java_code_IMyInterface; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override IntPtr ThresholdClass {
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)]
protected override global::System.Type ThresholdType {
get { return _members_java_code_IMyInterface.ManagedPeerType; }
}

static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
static readonly JniPeerMembers _members_java_code_IMyInterface = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));

public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Metadata.xml XPath interface reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']"
[Register ("java/code/IMyInterface", "", "java.code.IMyInterfaceInvoker")]
public partial interface IMyInterface : IJavaObject, IJavaPeerable {
private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);
private static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true);

private static Delegate cb_DoSomething_DoSomething_V;
#pragma warning disable 0169
Expand Down Expand Up @@ -41,19 +41,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf
get { return _members_java_code_IMyInterface; }
}

[global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)]
[global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)]
protected override IntPtr ThresholdClass {
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)]
protected override global::System.Type ThresholdType {
get { return _members_java_code_IMyInterface.ManagedPeerType; }
}

static readonly JniPeerMembers _members_java_code_IMyInterface = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));
static readonly JniPeerMembers _members_java_code_IMyInterface = new JniPeerMembers ("java/code/IMyInterface", typeof (IMyInterfaceInvoker));

public IMyInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer)
{
Expand Down
Loading
Loading