Skip to content

[Java.Interop] Rename methods with '_' in their names #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2018
Merged

[Java.Interop] Rename methods with '_' in their names #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Java.Interop/Java.Interop/JavaArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ internal static int CheckLength (IList<T> value)
return value.Count;
}

internal static IList<T> _ToList (IEnumerable<T> value)
internal static IList<T> ToList (IEnumerable<T> value)
{
if (value == null)
throw new ArgumentNullException ("value");
Expand Down Expand Up @@ -376,7 +376,7 @@ public override void CopyTo (T[] array, int arrayIndex)
CopyTo (0, array, arrayIndex, Length);
}

internal static T[] _ToArray (IEnumerable<T> value)
internal static T[] ToArray (IEnumerable<T> value)
{
var array = value as T[];
if (array != null)
Expand Down
16 changes: 8 additions & 8 deletions src/Java.Interop/Java.Interop/JavaException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public unsafe JavaException ()
var peer = JniPeerMembers.InstanceMethods.StartCreateInstance ("()V", GetType (), null);
Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
JniPeerMembers.InstanceMethods.FinishCreateInstance ("()V", this, null);
javaStackTrace = _GetJavaStack (PeerReference);
javaStackTrace = GetJavaStack (PeerReference);
}

public unsafe JavaException (string message)
Expand All @@ -54,7 +54,7 @@ public unsafe JavaException (string message)
} finally {
JniObjectReference.Dispose (ref native_message, JniObjectReferenceOptions.CopyAndDispose);
}
javaStackTrace = _GetJavaStack (PeerReference);
javaStackTrace = GetJavaStack (PeerReference);
}

public unsafe JavaException (string message, Exception innerException)
Expand All @@ -71,15 +71,15 @@ public unsafe JavaException (string message, Exception innerException)
} finally {
JniObjectReference.Dispose (ref native_message, JniObjectReferenceOptions.CopyAndDispose);
}
javaStackTrace = _GetJavaStack (PeerReference);
javaStackTrace = GetJavaStack (PeerReference);
}

public JavaException (ref JniObjectReference reference, JniObjectReferenceOptions transfer)
: base (_GetMessage (ref reference, transfer), _GetCause (ref reference, transfer))
: base (GetMessage (ref reference, transfer), GetCause (ref reference, transfer))
{
Construct (ref reference, transfer);
if (PeerReference.IsValid)
javaStackTrace = _GetJavaStack (PeerReference);
javaStackTrace = GetJavaStack (PeerReference);
}

protected void Construct (ref JniObjectReference reference, JniObjectReferenceOptions options)
Expand Down Expand Up @@ -186,7 +186,7 @@ public override unsafe int GetHashCode ()
return _members.InstanceMethods.InvokeVirtualInt32Method ("hashCode.()I", this, null);
}

static string _GetMessage (ref JniObjectReference reference, JniObjectReferenceOptions transfer)
static string GetMessage (ref JniObjectReference reference, JniObjectReferenceOptions transfer)
{
if (transfer == JniObjectReferenceOptions.None)
return null;
Expand All @@ -196,7 +196,7 @@ static string _GetMessage (ref JniObjectReference reference, JniObjectReferenceO
return JniEnvironment.Strings.ToString (ref s, JniObjectReferenceOptions.CopyAndDispose);
}

static Exception _GetCause (ref JniObjectReference reference, JniObjectReferenceOptions transfer)
static Exception GetCause (ref JniObjectReference reference, JniObjectReferenceOptions transfer)
{
if (transfer == JniObjectReferenceOptions.None)
return null;
Expand All @@ -206,7 +206,7 @@ static Exception _GetCause (ref JniObjectReference reference, JniObjectReference
return JniEnvironment.Runtime.GetExceptionForThrowable (ref e, JniObjectReferenceOptions.CopyAndDispose);
}

unsafe string _GetJavaStack (JniObjectReference handle)
unsafe string GetJavaStack (JniObjectReference handle)
{
using (var StringWriter_class = new JniType ("java/io/StringWriter"))
using (var PrintWriter_class = new JniType ("java/io/PrintWriter")) {
Expand Down
6 changes: 3 additions & 3 deletions src/Java.Interop/Java.Interop/JavaObjectArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public JavaObjectArray (ref JniObjectReference handle, JniObjectReferenceOptions
{
}

static JniObjectReference _NewArray (int length)
static JniObjectReference NewArray (int length)
{
var info = JniEnvironment.Runtime.TypeManager.GetTypeSignature (typeof (T));
if (info.SimpleReference == null)
Expand All @@ -27,7 +27,7 @@ static JniObjectReference _NewArray (int length)
public unsafe JavaObjectArray (int length)
: this (ref *InvalidJniObjectReference, JniObjectReferenceOptions.None)
{
var peer = _NewArray (CheckLength (length));
var peer = NewArray (CheckLength (length));
Construct (ref peer, JniObjectReferenceOptions.CopyAndDispose);
}

Expand All @@ -39,7 +39,7 @@ public JavaObjectArray (IList<T> value)
}

public JavaObjectArray (IEnumerable<T> value)
: this (_ToList (value))
: this (ToList (value))
{
}

Expand Down
32 changes: 16 additions & 16 deletions src/Java.Interop/Java.Interop/JavaPrimitiveArrays.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ public unsafe JavaBooleanArray (int length)
public JavaBooleanArray (System.Collections.Generic.IList<Boolean> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaBooleanArray (System.Collections.Generic.IEnumerable<Boolean> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down Expand Up @@ -249,11 +249,11 @@ public unsafe JavaSByteArray (int length)
public JavaSByteArray (System.Collections.Generic.IList<SByte> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaSByteArray (System.Collections.Generic.IEnumerable<SByte> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down Expand Up @@ -396,11 +396,11 @@ public unsafe JavaCharArray (int length)
public JavaCharArray (System.Collections.Generic.IList<Char> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaCharArray (System.Collections.Generic.IEnumerable<Char> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down Expand Up @@ -543,11 +543,11 @@ public unsafe JavaInt16Array (int length)
public JavaInt16Array (System.Collections.Generic.IList<Int16> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaInt16Array (System.Collections.Generic.IEnumerable<Int16> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down Expand Up @@ -690,11 +690,11 @@ public unsafe JavaInt32Array (int length)
public JavaInt32Array (System.Collections.Generic.IList<Int32> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaInt32Array (System.Collections.Generic.IEnumerable<Int32> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down Expand Up @@ -837,11 +837,11 @@ public unsafe JavaInt64Array (int length)
public JavaInt64Array (System.Collections.Generic.IList<Int64> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaInt64Array (System.Collections.Generic.IEnumerable<Int64> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down Expand Up @@ -984,11 +984,11 @@ public unsafe JavaSingleArray (int length)
public JavaSingleArray (System.Collections.Generic.IList<Single> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaSingleArray (System.Collections.Generic.IEnumerable<Single> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down Expand Up @@ -1131,11 +1131,11 @@ public unsafe JavaDoubleArray (int length)
public JavaDoubleArray (System.Collections.Generic.IList<Double> value)
: this (CheckLength (value))
{
CopyFrom (_ToArray (value), 0, 0, value.Count);
CopyFrom (ToArray (value), 0, 0, value.Count);
}

public JavaDoubleArray (System.Collections.Generic.IEnumerable<Double> value)
: this (_ToArray (value))
: this (ToArray (value))
{
}

Expand Down
13 changes: 6 additions & 7 deletions src/Java.Interop/Java.Interop/JavaProxyObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ sealed class JavaProxyObject : JavaObject
[JniAddNativeMethodRegistrationAttribute]
static void RegisterNativeMembers (JniNativeMethodRegistrationArguments args)
{
args.Registrations.Add (new JniNativeMethodRegistration ("equals", "(Ljava/lang/Object;)Z", (Func<IntPtr, IntPtr, IntPtr, bool>)_Equals));
args.Registrations.Add (new JniNativeMethodRegistration ("hashCode", "()I", (Func<IntPtr, IntPtr, int>)_GetHashCode));
args.Registrations.Add (new JniNativeMethodRegistration ("toString", "()Ljava/lang/String;", (Func<IntPtr, IntPtr, IntPtr>)_ToString));
args.Registrations.Add (new JniNativeMethodRegistration ("equals", "(Ljava/lang/Object;)Z", (Func<IntPtr, IntPtr, IntPtr, bool>)Equals));
args.Registrations.Add (new JniNativeMethodRegistration ("hashCode", "()I", (Func<IntPtr, IntPtr, int>)GetHashCode));
args.Registrations.Add (new JniNativeMethodRegistration ("toString", "()Ljava/lang/String;", (Func<IntPtr, IntPtr, IntPtr>)ToString));
}

public override JniPeerMembers JniPeerMembers {
Expand Down Expand Up @@ -68,7 +68,7 @@ public static JavaProxyObject GetProxy (object value)
}

// TODO: Keep in sync with the code generated by ExportedMemberBuilder
static bool _Equals (IntPtr jnienv, IntPtr n_self, IntPtr n_value)
static bool Equals (IntPtr jnienv, IntPtr n_self, IntPtr n_value)
{
var envp = new JniTransition (jnienv);
try {
Expand All @@ -87,7 +87,7 @@ static bool _Equals (IntPtr jnienv, IntPtr n_self, IntPtr n_value)
}

// TODO: Keep in sync with the code generated by ExportedMemberBuilder
static int _GetHashCode (IntPtr jnienv, IntPtr n_self)
static int GetHashCode (IntPtr jnienv, IntPtr n_self)
{
var envp = new JniTransition (jnienv);
try {
Expand All @@ -103,7 +103,7 @@ static int _GetHashCode (IntPtr jnienv, IntPtr n_self)
}
}

static IntPtr _ToString (IntPtr jnienv, IntPtr n_self)
static IntPtr ToString (IntPtr jnienv, IntPtr n_self)
{
var envp = new JniTransition (jnienv);
try {
Expand All @@ -126,4 +126,3 @@ static IntPtr _ToString (IntPtr jnienv, IntPtr n_self)
}
}
}

4 changes: 2 additions & 2 deletions src/Java.Interop/Java.Interop/JavaProxyThrowable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ sealed class JavaProxyThrowable : JavaException
public Exception Exception {get; private set;}

public JavaProxyThrowable (Exception exception)
: base (_GetMessage (exception))
: base (GetMessage (exception))
{
Exception = exception;
}

static string _GetMessage (Exception exception)
static string GetMessage (Exception exception)
{
if (exception == null)
throw new ArgumentNullException ("exception");
Expand Down