Skip to content

Commit b188f6e

Browse files
committed
[Java.Intreop] Rename Dispose methods
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)
1 parent 85fc91d commit b188f6e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/Java.Interop/Java.Interop/JavaException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void UnregisterFromRuntime ()
153153

154154
public void Dispose ()
155155
{
156-
JniEnvironment.Runtime.ValueManager.Dispose (this);
156+
JniEnvironment.Runtime.ValueManager.DisposePeer (this);
157157
}
158158

159159
public void DisposeUnlessReferenced ()

src/Java.Interop/Java.Interop/JavaObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void UnregisterFromRuntime ()
105105

106106
public void Dispose ()
107107
{
108-
JniEnvironment.Runtime.ValueManager.Dispose (this);
108+
JniEnvironment.Runtime.ValueManager.DisposePeer (this);
109109
}
110110

111111
public void DisposeUnlessReferenced ()

src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public int GetJniIdentityHashCode (JniObjectReference reference)
121121
return JniSystem.IdentityHashCode (reference);
122122
}
123123

124-
public virtual void Dispose (IJavaPeerable value)
124+
public virtual void DisposePeer (IJavaPeerable value)
125125
{
126126
if (value == null)
127127
throw new ArgumentNullException (nameof (value));
@@ -130,10 +130,10 @@ public virtual void Dispose (IJavaPeerable value)
130130
if (!h.IsValid)
131131
return;
132132

133-
Dispose (h, value);
133+
DisposePeer (h, value);
134134
}
135135

136-
void Dispose (JniObjectReference h, IJavaPeerable value)
136+
void DisposePeer (JniObjectReference h, IJavaPeerable value)
137137
{
138138
value.Disposed ();
139139
Remove (value);
@@ -173,7 +173,7 @@ public virtual void DisposeUnlessReferenced (IJavaPeerable value)
173173
if (o != null && object.ReferenceEquals (o, value))
174174
return;
175175

176-
Dispose (h, value);
176+
DisposePeer (h, value);
177177
}
178178

179179
public abstract IJavaPeerable PeekPeer (JniObjectReference reference);

0 commit comments

Comments
 (0)