[Java.Intreop] Rename Dispose methods

radekdoulik · radekdoulik · commit b8bd979558d6 · 2018-01-03T14:40:33.000+01:00
These have different signatures than the common dispose pattern methods, thus rename them to avoid confusion. Also rename other methods working with IJavaPeerable to be consistent. Catched by gendarme's https://github.com/spouliot/gendarme/wiki/Gendarme.Rules.Design.UseCorrectDisposeSignaturesRule(2.10)
diff --git a/gendarme-ignore.txt b/gendarme-ignore.txt
@@ -52,7 +52,7 @@ M: Java.Interop.JniType Java.Interop.JniLong::get_TypeRef()
 M: Java.Interop.JniType Java.Interop.JniPeerMembers::get_JniPeerType()
 M: Java.Interop.JniRuntime Java.Interop.JniRuntime::get_CurrentRuntime()
 M: System.Void Java.Interop.JniRuntime::RaisePendingException(System.Exception)
-M: System.Void Java.Interop.JniRuntime/JniValueManager::DisposeUnlessReferenced(Java.Interop.IJavaPeerable)
+M: System.Void Java.Interop.JniRuntime/JniValueManager::DisposePeerUnlessReferenced(Java.Interop.IJavaPeerable)
 M: System.Object Java.Interop.JniRuntime/JniValueManager::PeekValue(Java.Interop.JniObjectReference)
 M: System.Object Java.Interop.JniRuntime/JniValueManager::PeekBoxedObject(Java.Interop.JniObjectReference)
 M: Java.Interop.JniType Java.Interop.JniShort::get_TypeRef()
@@ -104,7 +104,7 @@ M: System.Void Java.Interop.JniObjectReference::Dispose(Java.Interop.JniObjectRe
 M: System.Exception Java.Interop.JniRuntime::GetExceptionForThrowable(Java.Interop.JniObjectReference&,Java.Interop.JniObjectReferenceOptions)
 M: System.Void Java.Interop.JniRuntime/JniObjectReferenceManager::DeleteGlobalReference(Java.Interop.JniObjectReference&)
 M: System.Void Java.Interop.JniRuntime/JniObjectReferenceManager::DeleteWeakGlobalReference(Java.Interop.JniObjectReference&)
-M: System.Void Java.Interop.JniRuntime/JniValueManager::Construct(Java.Interop.IJavaPeerable,Java.Interop.JniObjectReference&,Java.Interop.JniObjectReferenceOptions)
+M: System.Void Java.Interop.JniRuntime/JniValueManager::ConstructPeer(Java.Interop.IJavaPeerable,Java.Interop.JniObjectReference&,Java.Interop.JniObjectReferenceOptions)
 M: Java.Interop.IJavaPeerable Java.Interop.JniRuntime/JniValueManager::CreatePeer(Java.Interop.JniObjectReference&,Java.Interop.JniObjectReferenceOptions,System.Type)
 M: System.Object Java.Interop.JniRuntime/JniValueManager::CreateValue(Java.Interop.JniObjectReference&,Java.Interop.JniObjectReferenceOptions,System.Type)
 M: T Java.Interop.JniRuntime/JniValueManager::CreateValue(Java.Interop.JniObjectReference&,Java.Interop.JniObjectReferenceOptions,System.Type)
diff --git a/src/Java.Interop/Java.Interop/JavaException.cs b/src/Java.Interop/Java.Interop/JavaException.cs
@@ -84,12 +84,12 @@ public JavaException (ref JniObjectReference reference, JniObjectReferenceOption
 
 		protected void Construct (ref JniObjectReference reference, JniObjectReferenceOptions options)
 		{
-			JniEnvironment.Runtime.ValueManager.Construct (this, ref reference, options);
+			JniEnvironment.Runtime.ValueManager.ConstructPeer (this, ref reference, options);
 		}
 
 		~JavaException ()
 		{
-			JniEnvironment.Runtime.ValueManager.Finalize (this);
+			JniEnvironment.Runtime.ValueManager.FinalizePeer (this);
 		}
 
 		public          JniObjectReference          PeerReference {
@@ -148,17 +148,17 @@ public void UnregisterFromRuntime ()
 		{
 			if (!PeerReference.IsValid)
 				throw new ObjectDisposedException (GetType ().FullName);
-			JniEnvironment.Runtime.ValueManager.Remove (this);
+			JniEnvironment.Runtime.ValueManager.RemovePeer (this);
 		}
 
 		public void Dispose ()
 		{
-			JniEnvironment.Runtime.ValueManager.Dispose (this);
+			JniEnvironment.Runtime.ValueManager.DisposePeer (this);
 		}
 
 		public void DisposeUnlessReferenced ()
 		{
-			JniEnvironment.Runtime.ValueManager.DisposeUnlessReferenced (this);
+			JniEnvironment.Runtime.ValueManager.DisposePeerUnlessReferenced (this);
 		}
 
 		protected virtual void Dispose (bool disposing)
diff --git a/src/Java.Interop/Java.Interop/JavaObject.cs b/src/Java.Interop/Java.Interop/JavaObject.cs
@@ -28,7 +28,7 @@ unsafe public class JavaObject : IJavaPeerable
 
 		~JavaObject ()
 		{
-			JniEnvironment.Runtime.ValueManager.Finalize (this);
+			JniEnvironment.Runtime.ValueManager.FinalizePeer (this);
 		}
 
 		public          JniObjectReference          PeerReference {
@@ -75,7 +75,7 @@ public unsafe JavaObject ()
 
 		protected void Construct (ref JniObjectReference reference, JniObjectReferenceOptions options)
 		{
-			JniEnvironment.Runtime.ValueManager.Construct (this, ref reference, options);
+			JniEnvironment.Runtime.ValueManager.ConstructPeer (this, ref reference, options);
 		}
 
 		protected void SetPeerReference (ref JniObjectReference reference, JniObjectReferenceOptions options)
@@ -100,17 +100,17 @@ public void UnregisterFromRuntime ()
 		{
 			if (!PeerReference.IsValid)
 				throw new ObjectDisposedException (GetType ().FullName);
-			JniEnvironment.Runtime.ValueManager.Remove (this);
+			JniEnvironment.Runtime.ValueManager.RemovePeer (this);
 		}
 
 		public void Dispose ()
 		{
-			JniEnvironment.Runtime.ValueManager.Dispose (this);
+			JniEnvironment.Runtime.ValueManager.DisposePeer (this);
 		}
 
 		public void DisposeUnlessReferenced ()
 		{
-			JniEnvironment.Runtime.ValueManager.DisposeUnlessReferenced (this);
+			JniEnvironment.Runtime.ValueManager.DisposePeerUnlessReferenced (this);
 		}
 
 		protected virtual void Dispose (bool disposing)
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
@@ -64,15 +64,15 @@ protected virtual void Dispose (bool disposing)
 
 			public abstract void Collect ();
 
-			public abstract void Add (IJavaPeerable value);
+			public abstract void AddPeer (IJavaPeerable value);
 
-			public abstract void Remove (IJavaPeerable value);
+			public abstract void RemovePeer (IJavaPeerable value);
 
-			public abstract void Finalize (IJavaPeerable value);
+			public abstract void FinalizePeer (IJavaPeerable value);
 
 			public abstract List<JniSurfacedPeerInfo>   GetSurfacedPeers ();
 
-			public void Construct (IJavaPeerable peer, ref JniObjectReference reference, JniObjectReferenceOptions options)
+			public void ConstructPeer (IJavaPeerable peer, ref JniObjectReference reference, JniObjectReferenceOptions options)
 			{
 				if (peer == null)
 					throw new ArgumentNullException (nameof (peer));
@@ -112,7 +112,7 @@ public void Construct (IJavaPeerable peer, ref JniObjectReference reference, Jni
 				}
 
 				if ((options & DoNotRegisterTarget) != DoNotRegisterTarget) {
-					Add (peer);
+					AddPeer (peer);
 				}
 			}
 
@@ -121,7 +121,7 @@ public int GetJniIdentityHashCode (JniObjectReference reference)
 				return JniSystem.IdentityHashCode (reference);
 			}
 
-			public virtual void Dispose (IJavaPeerable value)
+			public virtual void DisposePeer (IJavaPeerable value)
 			{
 				if (value == null)
 					throw new ArgumentNullException (nameof (value));
@@ -130,13 +130,13 @@ public virtual void Dispose (IJavaPeerable value)
 				if (!h.IsValid)
 					return;
 
-				Dispose (h, value);
+				DisposePeer (h, value);
 			}
 
-			void Dispose (JniObjectReference h, IJavaPeerable value)
+			void DisposePeer (JniObjectReference h, IJavaPeerable value)
 			{
 				value.Disposed ();
-				Remove (value);
+				RemovePeer (value);
 				var o = Runtime.ObjectReferenceManager;
 				if (o.LogGlobalReferenceMessages) {
 					o.WriteGlobalReferenceLine ("Disposing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3} Java.Type={4}",
@@ -160,7 +160,7 @@ void Dispose (JniObjectReference h, IJavaPeerable value)
 				GC.SuppressFinalize (value);
 			}
 
-			public virtual void DisposeUnlessReferenced (IJavaPeerable value)
+			public virtual void DisposePeerUnlessReferenced (IJavaPeerable value)
 			{
 				if (value == null)
 					throw new ArgumentNullException (nameof (value));
@@ -173,7 +173,7 @@ public virtual void DisposeUnlessReferenced (IJavaPeerable value)
 				if (o != null && object.ReferenceEquals (o, value))
 					return;
 
-				Dispose (h, value);
+				DisposePeer (h, value);
 			}
 
 			public abstract IJavaPeerable PeekPeer (JniObjectReference reference);
@@ -188,12 +188,12 @@ public object PeekValue (JniObjectReference reference)
 					return t;
 
 				object r;
-				return TryUnboxObject (t, out r)
+				return TryUnboxPeerObject (t, out r)
 					? r
 					: t;
 			}
 
-			protected virtual bool TryUnboxObject (IJavaPeerable value, out object result)
+			protected virtual bool TryUnboxPeerObject (IJavaPeerable value, out object result)
 			{
 				result  = null;
 				var p   = value as JavaProxyObject;
@@ -215,7 +215,7 @@ object PeekBoxedObject (JniObjectReference reference)
 				if (t == null)
 					return null;
 				object r;
-				return TryUnboxObject (t, out r)
+				return TryUnboxPeerObject (t, out r)
 					? r
 					: null;
 			}
diff --git a/src/Java.Interop/Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs b/src/Java.Interop/Tests/Java.Interop/JniRuntime.JniValueManagerTests.cs
@@ -38,15 +38,15 @@ public override void Collect ()
 			{
 			}
 
-			public override void Add (IJavaPeerable reference)
+			public override void AddPeer (IJavaPeerable reference)
 			{
 			}
 
-			public override void Remove (IJavaPeerable reference)
+			public override void RemovePeer (IJavaPeerable reference)
 			{
 			}
 
-			public override void Finalize (IJavaPeerable reference)
+			public override void FinalizePeer (IJavaPeerable reference)
 			{
 			}
 
diff --git a/src/Java.Interop/Tests/Java.Interop/JniRuntimeTest.cs b/src/Java.Interop/Tests/Java.Interop/JniRuntimeTest.cs
@@ -129,15 +129,15 @@ public override int WeakGlobalReferenceCount {
 
 		class ProxyValueManager : JniValueManager {
 
-			public override void Add (IJavaPeerable peer)
+			public override void AddPeer (IJavaPeerable peer)
 			{
 			}
 
 			public override void Collect ()
 			{
 			}
 
-			public override void Finalize (IJavaPeerable peer)
+			public override void FinalizePeer (IJavaPeerable peer)
 			{
 			}
 
@@ -151,7 +151,7 @@ public override IJavaPeerable PeekPeer (JniObjectReference reference)
 				return null;
 			}
 
-			public override void Remove (IJavaPeerable peer)
+			public override void RemovePeer (IJavaPeerable peer)
 			{
 			}
 
diff --git a/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs b/src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
@@ -101,7 +101,7 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()
 			}
 		}
 
-		public override void Add (IJavaPeerable value)
+		public override void AddPeer (IJavaPeerable value)
 		{
 			var r = value.PeerReference;
 			if (!r.IsValid)
@@ -169,7 +169,7 @@ static bool Replaceable (IJavaPeerable peer)
 			return (peer.JniManagedPeerState & JniManagedPeerStates.Replaceable) == JniManagedPeerStates.Replaceable;
 		}
 
-		public override void Remove (IJavaPeerable value)
+		public override void RemovePeer (IJavaPeerable value)
 		{
 			if (value == null)
 				throw new ArgumentNullException (nameof (value));
@@ -226,7 +226,7 @@ public override IJavaPeerable PeekPeer (JniObjectReference reference)
 			return null;
 		}
 
-		public override void Finalize (IJavaPeerable value)
+		public override void FinalizePeer (IJavaPeerable value)
 		{
 			var h = value.PeerReference;
 			var o = Runtime.ObjectReferenceManager;
@@ -242,7 +242,7 @@ public override void Finalize (IJavaPeerable value)
 							RuntimeHelpers.GetHashCode (value).ToString ("x"),
 							value.GetType ().ToString ());
 				}
-				Remove (value);
+				RemovePeer (value);
 				value.SetPeerReference (new JniObjectReference ());
 				value.Finalized ();
 				return;
@@ -251,7 +251,7 @@ public override void Finalize (IJavaPeerable value)
 			try {
 				bool collected  = TryGC (value, ref h);
 				if (collected) {
-					Remove (value);
+					RemovePeer (value);
 					value.SetPeerReference (new JniObjectReference ());
 					if (o.LogGlobalReferenceMessages) {
 						o.WriteGlobalReferenceLine ("Finalizing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3}",

Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,12 @@ public JavaException (ref JniObjectReference reference, JniObjectReferenceOption`
`84`	`84`
`85`	`85`	`protected void Construct (ref JniObjectReference reference, JniObjectReferenceOptions options)`
`86`	`86`	`{`
`87`		`- JniEnvironment.Runtime.ValueManager.Construct (this, ref reference, options);`
	`87`	`+ JniEnvironment.Runtime.ValueManager.ConstructPeer (this, ref reference, options);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`~JavaException ()`
`91`	`91`	`{`
`92`		`- JniEnvironment.Runtime.ValueManager.Finalize (this);`
	`92`	`+ JniEnvironment.Runtime.ValueManager.FinalizePeer (this);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public JniObjectReference PeerReference {`
`@@ -148,17 +148,17 @@ public void UnregisterFromRuntime ()`
`148`	`148`	`{`
`149`	`149`	`if (!PeerReference.IsValid)`
`150`	`150`	`throw new ObjectDisposedException (GetType ().FullName);`
`151`		`- JniEnvironment.Runtime.ValueManager.Remove (this);`
	`151`	`+ JniEnvironment.Runtime.ValueManager.RemovePeer (this);`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`public void Dispose ()`
`155`	`155`	`{`
`156`		`- JniEnvironment.Runtime.ValueManager.Dispose (this);`
	`156`	`+ JniEnvironment.Runtime.ValueManager.DisposePeer (this);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`public void DisposeUnlessReferenced ()`
`160`	`160`	`{`
`161`		`- JniEnvironment.Runtime.ValueManager.DisposeUnlessReferenced (this);`
	`161`	`+ JniEnvironment.Runtime.ValueManager.DisposePeerUnlessReferenced (this);`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`protected virtual void Dispose (bool disposing)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ unsafe public class JavaObject : IJavaPeerable`
`28`	`28`
`29`	`29`	`~JavaObject ()`
`30`	`30`	`{`
`31`		`- JniEnvironment.Runtime.ValueManager.Finalize (this);`
	`31`	`+ JniEnvironment.Runtime.ValueManager.FinalizePeer (this);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public JniObjectReference PeerReference {`
`@@ -75,7 +75,7 @@ public unsafe JavaObject ()`
`75`	`75`
`76`	`76`	`protected void Construct (ref JniObjectReference reference, JniObjectReferenceOptions options)`
`77`	`77`	`{`
`78`		`- JniEnvironment.Runtime.ValueManager.Construct (this, ref reference, options);`
	`78`	`+ JniEnvironment.Runtime.ValueManager.ConstructPeer (this, ref reference, options);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`protected void SetPeerReference (ref JniObjectReference reference, JniObjectReferenceOptions options)`
`@@ -100,17 +100,17 @@ public void UnregisterFromRuntime ()`
`100`	`100`	`{`
`101`	`101`	`if (!PeerReference.IsValid)`
`102`	`102`	`throw new ObjectDisposedException (GetType ().FullName);`
`103`		`- JniEnvironment.Runtime.ValueManager.Remove (this);`
	`103`	`+ JniEnvironment.Runtime.ValueManager.RemovePeer (this);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public void Dispose ()`
`107`	`107`	`{`
`108`		`- JniEnvironment.Runtime.ValueManager.Dispose (this);`
	`108`	`+ JniEnvironment.Runtime.ValueManager.DisposePeer (this);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public void DisposeUnlessReferenced ()`
`112`	`112`	`{`
`113`		`- JniEnvironment.Runtime.ValueManager.DisposeUnlessReferenced (this);`
	`113`	`+ JniEnvironment.Runtime.ValueManager.DisposePeerUnlessReferenced (this);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`protected virtual void Dispose (bool disposing)`
Original file line number	Diff line number	Diff line change
`@@ -64,15 +64,15 @@ protected virtual void Dispose (bool disposing)`
`64`	`64`
`65`	`65`	`public abstract void Collect ();`
`66`	`66`
`67`		`- public abstract void Add (IJavaPeerable value);`
	`67`	`+ public abstract void AddPeer (IJavaPeerable value);`
`68`	`68`
`69`		`- public abstract void Remove (IJavaPeerable value);`
	`69`	`+ public abstract void RemovePeer (IJavaPeerable value);`
`70`	`70`
`71`		`- public abstract void Finalize (IJavaPeerable value);`
	`71`	`+ public abstract void FinalizePeer (IJavaPeerable value);`
`72`	`72`
`73`	`73`	`public abstract List<JniSurfacedPeerInfo> GetSurfacedPeers ();`
`74`	`74`
`75`		`- public void Construct (IJavaPeerable peer, ref JniObjectReference reference, JniObjectReferenceOptions options)`
	`75`	`+ public void ConstructPeer (IJavaPeerable peer, ref JniObjectReference reference, JniObjectReferenceOptions options)`
`76`	`76`	`{`
`77`	`77`	`if (peer == null)`
`78`	`78`	`throw new ArgumentNullException (nameof (peer));`
`@@ -112,7 +112,7 @@ public void Construct (IJavaPeerable peer, ref JniObjectReference reference, Jni`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if ((options & DoNotRegisterTarget) != DoNotRegisterTarget) {`
`115`		`- Add (peer);`
	`115`	`+ AddPeer (peer);`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`@@ -121,7 +121,7 @@ public int GetJniIdentityHashCode (JniObjectReference reference)`
`121`	`121`	`return JniSystem.IdentityHashCode (reference);`
`122`	`122`	`}`
`123`	`123`
`124`		`- public virtual void Dispose (IJavaPeerable value)`
	`124`	`+ public virtual void DisposePeer (IJavaPeerable value)`
`125`	`125`	`{`
`126`	`126`	`if (value == null)`
`127`	`127`	`throw new ArgumentNullException (nameof (value));`
`@@ -130,13 +130,13 @@ public virtual void Dispose (IJavaPeerable value)`
`130`	`130`	`if (!h.IsValid)`
`131`	`131`	`return;`
`132`	`132`
`133`		`- Dispose (h, value);`
	`133`	`+ DisposePeer (h, value);`
`134`	`134`	`}`
`135`	`135`
`136`		`- void Dispose (JniObjectReference h, IJavaPeerable value)`
	`136`	`+ void DisposePeer (JniObjectReference h, IJavaPeerable value)`
`137`	`137`	`{`
`138`	`138`	`value.Disposed ();`
`139`		`- Remove (value);`
	`139`	`+ RemovePeer (value);`
`140`	`140`	`var o = Runtime.ObjectReferenceManager;`
`141`	`141`	`if (o.LogGlobalReferenceMessages) {`
`142`	`142`	`o.WriteGlobalReferenceLine ("Disposing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3} Java.Type={4}",`
`@@ -160,7 +160,7 @@ void Dispose (JniObjectReference h, IJavaPeerable value)`
`160`	`160`	`GC.SuppressFinalize (value);`
`161`	`161`	`}`
`162`	`162`
`163`		`- public virtual void DisposeUnlessReferenced (IJavaPeerable value)`
	`163`	`+ public virtual void DisposePeerUnlessReferenced (IJavaPeerable value)`
`164`	`164`	`{`
`165`	`165`	`if (value == null)`
`166`	`166`	`throw new ArgumentNullException (nameof (value));`
`@@ -173,7 +173,7 @@ public virtual void DisposeUnlessReferenced (IJavaPeerable value)`
`173`	`173`	`if (o != null && object.ReferenceEquals (o, value))`
`174`	`174`	`return;`
`175`	`175`
`176`		`- Dispose (h, value);`
	`176`	`+ DisposePeer (h, value);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`public abstract IJavaPeerable PeekPeer (JniObjectReference reference);`
`@@ -188,12 +188,12 @@ public object PeekValue (JniObjectReference reference)`
`188`	`188`	`return t;`
`189`	`189`
`190`	`190`	`object r;`
`191`		`- return TryUnboxObject (t, out r)`
	`191`	`+ return TryUnboxPeerObject (t, out r)`
`192`	`192`	`? r`
`193`	`193`	`: t;`
`194`	`194`	`}`
`195`	`195`
`196`		`- protected virtual bool TryUnboxObject (IJavaPeerable value, out object result)`
	`196`	`+ protected virtual bool TryUnboxPeerObject (IJavaPeerable value, out object result)`
`197`	`197`	`{`
`198`	`198`	`result = null;`
`199`	`199`	`var p = value as JavaProxyObject;`
`@@ -215,7 +215,7 @@ object PeekBoxedObject (JniObjectReference reference)`
`215`	`215`	`if (t == null)`
`216`	`216`	`return null;`
`217`	`217`	`object r;`
`218`		`- return TryUnboxObject (t, out r)`
	`218`	`+ return TryUnboxPeerObject (t, out r)`
`219`	`219`	`? r`
`220`	`220`	`: null;`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,15 @@ public override void Collect ()`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
`41`		`- public override void Add (IJavaPeerable reference)`
	`41`	`+ public override void AddPeer (IJavaPeerable reference)`
`42`	`42`	`{`
`43`	`43`	`}`
`44`	`44`
`45`		`- public override void Remove (IJavaPeerable reference)`
	`45`	`+ public override void RemovePeer (IJavaPeerable reference)`
`46`	`46`	`{`
`47`	`47`	`}`
`48`	`48`
`49`		`- public override void Finalize (IJavaPeerable reference)`
	`49`	`+ public override void FinalizePeer (IJavaPeerable reference)`
`50`	`50`	`{`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -129,15 +129,15 @@ public override int WeakGlobalReferenceCount {`
`129`	`129`
`130`	`130`	`class ProxyValueManager : JniValueManager {`
`131`	`131`
`132`		`- public override void Add (IJavaPeerable peer)`
	`132`	`+ public override void AddPeer (IJavaPeerable peer)`
`133`	`133`	`{`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`public override void Collect ()`
`137`	`137`	`{`
`138`	`138`	`}`
`139`	`139`
`140`		`- public override void Finalize (IJavaPeerable peer)`
	`140`	`+ public override void FinalizePeer (IJavaPeerable peer)`
`141`	`141`	`{`
`142`	`142`	`}`
`143`	`143`
`@@ -151,7 +151,7 @@ public override IJavaPeerable PeekPeer (JniObjectReference reference)`
`151`	`151`	`return null;`
`152`	`152`	`}`
`153`	`153`
`154`		`- public override void Remove (IJavaPeerable peer)`
	`154`	`+ public override void RemovePeer (IJavaPeerable peer)`
`155`	`155`	`{`
`156`	`156`	`}`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public override List<JniSurfacedPeerInfo> GetSurfacedPeers ()`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- public override void Add (IJavaPeerable value)`
	`104`	`+ public override void AddPeer (IJavaPeerable value)`
`105`	`105`	`{`
`106`	`106`	`var r = value.PeerReference;`
`107`	`107`	`if (!r.IsValid)`
`@@ -169,7 +169,7 @@ static bool Replaceable (IJavaPeerable peer)`
`169`	`169`	`return (peer.JniManagedPeerState & JniManagedPeerStates.Replaceable) == JniManagedPeerStates.Replaceable;`
`170`	`170`	`}`
`171`	`171`
`172`		`- public override void Remove (IJavaPeerable value)`
	`172`	`+ public override void RemovePeer (IJavaPeerable value)`
`173`	`173`	`{`
`174`	`174`	`if (value == null)`
`175`	`175`	`throw new ArgumentNullException (nameof (value));`
`@@ -226,7 +226,7 @@ public override IJavaPeerable PeekPeer (JniObjectReference reference)`
`226`	`226`	`return null;`
`227`	`227`	`}`
`228`	`228`
`229`		`- public override void Finalize (IJavaPeerable value)`
	`229`	`+ public override void FinalizePeer (IJavaPeerable value)`
`230`	`230`	`{`
`231`	`231`	`var h = value.PeerReference;`
`232`	`232`	`var o = Runtime.ObjectReferenceManager;`
`@@ -242,7 +242,7 @@ public override void Finalize (IJavaPeerable value)`
`242`	`242`	`RuntimeHelpers.GetHashCode (value).ToString ("x"),`
`243`	`243`	`value.GetType ().ToString ());`
`244`	`244`	`}`
`245`		`- Remove (value);`
	`245`	`+ RemovePeer (value);`
`246`	`246`	`value.SetPeerReference (new JniObjectReference ());`
`247`	`247`	`value.Finalized ();`
`248`	`248`	`return;`
`@@ -251,7 +251,7 @@ public override void Finalize (IJavaPeerable value)`
`251`	`251`	`try {`
`252`	`252`	`bool collected = TryGC (value, ref h);`
`253`	`253`	`if (collected) {`
`254`		`- Remove (value);`
	`254`	`+ RemovePeer (value);`
`255`	`255`	`value.SetPeerReference (new JniObjectReference ());`
`256`	`256`	`if (o.LogGlobalReferenceMessages) {`
`257`	`257`	`o.WriteGlobalReferenceLine ("Finalizing PeerReference={0} IdentityHashCode=0x{1} Instance=0x{2} Instance.Type={3}",`