Skip to content

Commit e0d4a7f

Browse files
jpobstjonpryor
jpobst
authored and
jonpryor
committed
[generator] Make _members private (#522)
Because the `JniPeerMembers _members` field is exposed via the `IJavaPeerable.JniPeerMembers` interface property, we no longer need the field to be `internal`, which means we no longer need to worry about when to add `new`. Makes the `_members` field visibility `private`, which reduces the number of warnings that occur when building a binding project. static readonly JniPeerMembers _members = new JniPeerMembers ("xamarin/test/SomeObject", typeof (SomeObject)); public override global::Java.Interop.JniPeerMembers JniPeerMembers { get { return _members; } }
1 parent e7d96f2 commit e0d4a7f

File tree

100 files changed

+131
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+131
-131
lines changed

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public partial interface ISpannable : Android.Text.ISpanned {
1414
[global::Android.Runtime.Register ("android/text/Spannable", DoNotGenerateAcw=true)]
1515
internal partial class ISpannableInvoker : global::Java.Lang.Object, ISpannable {
1616

17-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker));
17+
static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spannable", typeof (ISpannableInvoker));
1818

1919
static IntPtr java_class_ref {
2020
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public partial interface ISpanned : IJavaObject, IJavaPeerable {
1919
[global::Android.Runtime.Register ("android/text/Spanned", DoNotGenerateAcw=true)]
2020
internal partial class ISpannedInvoker : global::Java.Lang.Object, ISpanned {
2121

22-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker));
22+
static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/Spanned", typeof (ISpannedInvoker));
2323

2424
static IntPtr java_class_ref {
2525
get { return _members.JniPeerType.PeerReference.Handle; }

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Android.Text {
99
[global::Android.Runtime.Register ("android/text/SpannableString", DoNotGenerateAcw=true)]
1010
public partial class SpannableString : Android.Text.SpannableStringInternal, Android.Text.ISpannable {
1111

12-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableString", typeof (SpannableString));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableString", typeof (SpannableString));
1313
internal static new IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Android.Text {
99
[global::Android.Runtime.Register ("android/text/SpannableStringInternal", DoNotGenerateAcw=true)]
1010
public abstract partial class SpannableStringInternal : Java.Lang.Object {
1111

12-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternal));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternal));
1313
internal static new IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;
@@ -70,7 +70,7 @@ internal partial class SpannableStringInternalInvoker : SpannableStringInternal
7070

7171
public SpannableStringInternalInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, transfer) {}
7272

73-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternalInvoker));
73+
static readonly JniPeerMembers _members = new JniPeerMembers ("android/text/SpannableStringInternal", typeof (SpannableStringInternalInvoker));
7474

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

‎tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public partial interface IOnClickListener : IJavaObject, IJavaPeerable {
2222
[global::Android.Runtime.Register ("android/view/View$OnClickListener", DoNotGenerateAcw=true)]
2323
internal partial class IOnClickListenerInvoker : global::Java.Lang.Object, IOnClickListener {
2424

25-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker));
25+
static readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View$OnClickListener", typeof (IOnClickListenerInvoker));
2626

2727
static IntPtr java_class_ref {
2828
get { return _members.JniPeerType.PeerReference.Handle; }
@@ -128,7 +128,7 @@ internal static bool __IsEmpty (IOnClickListenerImplementor value)
128128
}
129129

130130

131-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View", typeof (View));
131+
static readonly JniPeerMembers _members = new JniPeerMembers ("android/view/View", typeof (View));
132132
internal static new IntPtr class_ref {
133133
get {
134134
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Tests-Core/expected.ji/Java.Lang.Object.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Java.Lang {
99
[global::Android.Runtime.Register ("java/lang/Object", DoNotGenerateAcw=true)]
1010
public partial class Object {
1111

12-
internal static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object));
12+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/lang/Object", typeof (Object));
1313
internal static IntPtr class_ref {
1414
get {
1515
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[global::Android.Runtime.Register ("java/code/MyClass", DoNotGenerateAcw=true)]
33
public partial class MyClass {
44

5-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass));
5+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClass));
66
internal static new IntPtr class_ref {
77
get {
88
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassHandle.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo));
1+
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (foo));
22
internal static IntPtr class_ref {
33
get {
44
return _members.JniPeerType.PeerReference.Handle;

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvoker.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ internal partial class MyClassInvoker : MyClass {
33

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

6-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
6+
static readonly JniPeerMembers _members = new JniPeerMembers ("java/code/MyClass", typeof (MyClassInvoker));
77

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

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClassInvokerHandle.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
internal static new readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
1+
static readonly JniPeerMembers _members = new JniPeerMembers ("com/mypackage/foo", typeof (Com.MyPackage.Foo));
22

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

0 commit comments

Comments
 (0)