Skip to content

Commit

Permalink
[Java.Intreop] Rename Dispose methods
Browse files Browse the repository at this point in the history
These have different signatures than the common dispose pattern
methods, thus rename them to avoid confusion.

Catched by gendarme's
https://github.com/spouliot/gendarme/wiki/Gendarme.Rules.Design.UseCorrectDisposeSignaturesRule(2.10)
  • Loading branch information
radekdoulik committed Jan 2, 2018
1 parent 85fc91d commit b188f6e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/JavaException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void UnregisterFromRuntime ()

public void Dispose ()
{
JniEnvironment.Runtime.ValueManager.Dispose (this);
JniEnvironment.Runtime.ValueManager.DisposePeer (this);
}

public void DisposeUnlessReferenced ()
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop/JavaObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void UnregisterFromRuntime ()

public void Dispose ()
{
JniEnvironment.Runtime.ValueManager.Dispose (this);
JniEnvironment.Runtime.ValueManager.DisposePeer (this);
}

public void DisposeUnlessReferenced ()
Expand Down
8 changes: 4 additions & 4 deletions src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -130,10 +130,10 @@ 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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b188f6e

Please sign in to comment.