Skip to content

Commit 32d0960

Browse files
jonpryorjonpryor
committed
[Java.Interop] Naming: s/Char/Character.
FxDG: Avoid Language-specific names: https://msdn.microsoft.com/en-us/library/ms229045(v=vs.110).aspx#Anchor_2 We've been pretty good on this front -- see also SByte -- but somehow I've overlooked "Char", which should be "Character" in the higher-level types and methods, not "Char", which is a C#/Java name.
1 parent ff8041e commit 32d0960

19 files changed

+136
-136
lines changed

‎src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaFieldInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ object GetStaticValue ()
6767
switch (JniSignature [n + 1]) {
6868
case 'Z': return members.StaticFields.GetBooleanValue (JniSignature);
6969
case 'B': return members.StaticFields.GetByteValue (JniSignature);
70-
case 'C': return members.StaticFields.GetCharValue (JniSignature);
70+
case 'C': return members.StaticFields.GetCharacterValue (JniSignature);
7171
case 'S': return members.StaticFields.GetInt16Value (JniSignature);
7272
case 'I': return members.StaticFields.GetInt32Value (JniSignature);
7373
case 'J': return members.StaticFields.GetInt64Value (JniSignature);
@@ -88,7 +88,7 @@ object GetInstanceValue (IJavaPeerable self)
8888
switch (JniSignature [n + 1]) {
8989
case 'Z': return members.InstanceFields.GetBooleanValue (JniSignature, self);
9090
case 'B': return members.InstanceFields.GetByteValue (JniSignature, self);
91-
case 'C': return members.InstanceFields.GetCharValue (JniSignature, self);
91+
case 'C': return members.InstanceFields.GetCharacterValue (JniSignature, self);
9292
case 'S': return members.InstanceFields.GetInt16Value (JniSignature, self);
9393
case 'I': return members.InstanceFields.GetInt32Value (JniSignature, self);
9494
case 'J': return members.InstanceFields.GetInt64Value (JniSignature, self);

‎src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaMethodInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ unsafe object InvokeInstanceMethod (IJavaPeerable self, JValue* arguments)
8585
switch (JniSignature [e + 1]) {
8686
case 'Z': return members.InstanceMethods.InvokeVirtualBooleanMethod (JniSignature, self, arguments);
8787
case 'B': return members.InstanceMethods.InvokeVirtualSByteMethod (JniSignature, self, arguments);
88-
case 'C': return members.InstanceMethods.InvokeVirtualCharMethod (JniSignature, self, arguments);
88+
case 'C': return members.InstanceMethods.InvokeVirtualCharacterMethod (JniSignature, self, arguments);
8989
case 'S': return members.InstanceMethods.InvokeVirtualInt16Method (JniSignature, self, arguments);
9090
case 'I': return members.InstanceMethods.InvokeVirtualInt32Method (JniSignature, self, arguments);
9191
case 'J': return members.InstanceMethods.InvokeVirtualInt64Method (JniSignature, self, arguments);
@@ -109,7 +109,7 @@ unsafe object InvokeStaticMethod (JValue* arguments)
109109
switch (JniSignature [e + 1]) {
110110
case 'Z': return members.StaticMethods.InvokeBooleanMethod (JniSignature, arguments);
111111
case 'B': return members.StaticMethods.InvokeSByteMethod (JniSignature, arguments);
112-
case 'C': return members.StaticMethods.InvokeCharMethod (JniSignature, arguments);
112+
case 'C': return members.StaticMethods.InvokeCharacterMethod (JniSignature, arguments);
113113
case 'S': return members.StaticMethods.InvokeInt16Method (JniSignature, arguments);
114114
case 'I': return members.StaticMethods.InvokeInt32Method (JniSignature, arguments);
115115
case 'J': return members.StaticMethods.InvokeInt64Method (JniSignature, arguments);

‎src/Java.Interop/Java.Interop.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<Exec Command="$(Runtime) &quot;$(OutputPath)\jnienv-gen.exe&quot; Java.Interop\JniEnvironment.g.cs" />
120120
</Target>
121121
<ItemGroup>
122-
<JavaInteropJar Include="$(OutputPath)java-interop.jar" />
122+
<JavaInteropJar Include="%24%28OutputPath%29java-interop.jar" />
123123
</ItemGroup>
124124
<Target Name="BuildInteropJar" Inputs="@(CompileJavaInteropJar)" Outputs="@(JavaInteropJar)">
125125
<MakeDir Directories="$(OutputPath)ji-classes" />

‎src/Java.Interop/Java.Interop/JavaPrimitiveArrays.cs‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,28 @@ partial class JavaVM {
7575
CleanupMarshalCollection = JavaSByteArray.CleanupMarshalCollection,
7676
}),
7777
new KeyValuePair<Type, JniMarshalInfo>(typeof (Char[]), new JniMarshalInfo {
78-
GetValueFromJni = JavaCharArray.GetValueFromJni,
79-
CreateLocalRef = JavaCharArray.CreateLocalRef,
80-
CreateMarshalCollection = JavaCharArray.CreateMarshalCollection,
81-
CleanupMarshalCollection = JavaCharArray.CleanupMarshalCollection,
78+
GetValueFromJni = JavaCharacterArray.GetValueFromJni,
79+
CreateLocalRef = JavaCharacterArray.CreateLocalRef,
80+
CreateMarshalCollection = JavaCharacterArray.CreateMarshalCollection,
81+
CleanupMarshalCollection = JavaCharacterArray.CleanupMarshalCollection,
8282
}),
8383
new KeyValuePair<Type, JniMarshalInfo>(typeof (JavaArray<Char>), new JniMarshalInfo {
84-
GetValueFromJni = JavaCharArray.GetValueFromJni,
85-
CreateLocalRef = JavaCharArray.CreateLocalRef,
86-
CreateMarshalCollection = JavaCharArray.CreateMarshalCollection,
87-
CleanupMarshalCollection = JavaCharArray.CleanupMarshalCollection,
84+
GetValueFromJni = JavaCharacterArray.GetValueFromJni,
85+
CreateLocalRef = JavaCharacterArray.CreateLocalRef,
86+
CreateMarshalCollection = JavaCharacterArray.CreateMarshalCollection,
87+
CleanupMarshalCollection = JavaCharacterArray.CleanupMarshalCollection,
8888
}),
8989
new KeyValuePair<Type, JniMarshalInfo>(typeof (JavaPrimitiveArray<Char>), new JniMarshalInfo {
90-
GetValueFromJni = JavaCharArray.GetValueFromJni,
91-
CreateLocalRef = JavaCharArray.CreateLocalRef,
92-
CreateMarshalCollection = JavaCharArray.CreateMarshalCollection,
93-
CleanupMarshalCollection = JavaCharArray.CleanupMarshalCollection,
90+
GetValueFromJni = JavaCharacterArray.GetValueFromJni,
91+
CreateLocalRef = JavaCharacterArray.CreateLocalRef,
92+
CreateMarshalCollection = JavaCharacterArray.CreateMarshalCollection,
93+
CleanupMarshalCollection = JavaCharacterArray.CleanupMarshalCollection,
9494
}),
95-
new KeyValuePair<Type, JniMarshalInfo>(typeof (JavaCharArray), new JniMarshalInfo {
96-
GetValueFromJni = JavaCharArray.GetValueFromJni,
97-
CreateLocalRef = JavaCharArray.CreateLocalRef,
98-
CreateMarshalCollection = JavaCharArray.CreateMarshalCollection,
99-
CleanupMarshalCollection = JavaCharArray.CleanupMarshalCollection,
95+
new KeyValuePair<Type, JniMarshalInfo>(typeof (JavaCharacterArray), new JniMarshalInfo {
96+
GetValueFromJni = JavaCharacterArray.GetValueFromJni,
97+
CreateLocalRef = JavaCharacterArray.CreateLocalRef,
98+
CreateMarshalCollection = JavaCharacterArray.CreateMarshalCollection,
99+
CleanupMarshalCollection = JavaCharacterArray.CleanupMarshalCollection,
100100
}),
101101
new KeyValuePair<Type, JniMarshalInfo>(typeof (Int16[]), new JniMarshalInfo {
102102
GetValueFromJni = JavaInt16Array.GetValueFromJni,
@@ -512,11 +512,11 @@ internal static void CleanupMarshalCollection (IJavaPeerable marshalObject, obje
512512
}
513513
}
514514

515-
public sealed class JniCharArrayElements : JniArrayElements {
515+
public sealed class JniCharacterArrayElements : JniArrayElements {
516516

517517
JniObjectReference arrayHandle;
518518

519-
internal JniCharArrayElements (JniObjectReference arrayHandle, IntPtr elements)
519+
internal JniCharacterArrayElements (JniObjectReference arrayHandle, IntPtr elements)
520520
: base (elements)
521521
{
522522
this.arrayHandle = arrayHandle;
@@ -533,28 +533,28 @@ protected override void Synchronize (JniArrayElementsReleaseMode releaseMode)
533533
}
534534

535535
[JniTypeInfo ("C", ArrayRank=1, TypeIsKeyword=true)]
536-
public sealed partial class JavaCharArray : JavaPrimitiveArray<Char> {
536+
public sealed partial class JavaCharacterArray : JavaPrimitiveArray<Char> {
537537

538-
public JavaCharArray (ref JniObjectReference handle, JniObjectReferenceOptions transfer)
538+
public JavaCharacterArray (ref JniObjectReference handle, JniObjectReferenceOptions transfer)
539539
: base (ref handle, transfer)
540540
{
541541
}
542542

543-
public unsafe JavaCharArray (int length)
543+
public unsafe JavaCharacterArray (int length)
544544
: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.Invalid)
545545
{
546546
var peer = JniEnvironment.Arrays.NewCharArray (CheckLength (length));
547547
using (SetPeerReference (ref peer, JniObjectReferenceOptions.DisposeSourceReference)) {
548548
}
549549
}
550550

551-
public JavaCharArray (System.Collections.Generic.IList<Char> value)
551+
public JavaCharacterArray (System.Collections.Generic.IList<Char> value)
552552
: this (CheckLength (value))
553553
{
554554
CopyFrom (_ToArray (value), 0, 0, value.Count);
555555
}
556556

557-
public JavaCharArray (System.Collections.Generic.IEnumerable<Char> value)
557+
public JavaCharacterArray (System.Collections.Generic.IEnumerable<Char> value)
558558
: this (_ToArray (value))
559559
{
560560
}
@@ -564,10 +564,10 @@ protected override JniArrayElements CreateElements ()
564564
return GetElements ();
565565
}
566566

567-
public new JniCharArrayElements GetElements ()
567+
public new JniCharacterArrayElements GetElements ()
568568
{
569569
IntPtr elements = JniEnvironment.Arrays.GetCharArrayElements (PeerReference, IntPtr.Zero);
570-
return elements == IntPtr.Zero ? null : new JniCharArrayElements (PeerReference, elements);
570+
return elements == IntPtr.Zero ? null : new JniCharacterArrayElements (PeerReference, elements);
571571
}
572572

573573
public override unsafe int IndexOf (Char item)
@@ -576,7 +576,7 @@ public override unsafe int IndexOf (Char item)
576576
if (len == 0)
577577
return -1;
578578
using (var e = GetElements ()) {
579-
Debug.Assert (e != null, "Java.Char.Array.GetElements() returned null! OOM?");
579+
Debug.Assert (e != null, "Java.Character.Array.GetElements() returned null! OOM?");
580580
if (e == null)
581581
return -1; // IList<T>.IndexOf() documents no exceptions. :-/
582582

@@ -626,14 +626,14 @@ internal override bool TargetTypeIsCurrentType (Type targetType)
626626
{
627627
return base.TargetTypeIsCurrentType (targetType) ||
628628
typeof (JavaPrimitiveArray<Char>) == targetType ||
629-
typeof (JavaCharArray) == targetType;
629+
typeof (JavaCharacterArray) == targetType;
630630
}
631631

632632
internal static JniObjectReference CreateLocalRef (object value)
633633
{
634-
return JavaArray<Char>.CreateLocalRef<JavaCharArray> (
634+
return JavaArray<Char>.CreateLocalRef<JavaCharacterArray> (
635635
value,
636-
list => new JavaCharArray (list));
636+
list => new JavaCharacterArray (list));
637637
}
638638

639639
internal static IList<Char> GetValueFromJni (ref JniObjectReference reference, JniObjectReferenceOptions transfer, Type targetType)
@@ -642,19 +642,19 @@ internal static IList<Char> GetValueFromJni (ref JniObjectReference reference, J
642642
ref reference,
643643
transfer,
644644
targetType,
645-
(ref JniObjectReference h, JniObjectReferenceOptions t) => new JavaCharArray (ref h, t));
645+
(ref JniObjectReference h, JniObjectReferenceOptions t) => new JavaCharacterArray (ref h, t));
646646
}
647647

648648
internal static IJavaPeerable CreateMarshalCollection (object value)
649649
{
650-
return JavaArray<Char>.CreateMarshalCollection (value, list => new JavaCharArray (list) {
650+
return JavaArray<Char>.CreateMarshalCollection (value, list => new JavaCharacterArray (list) {
651651
forMarshalCollection = true,
652652
});
653653
}
654654

655655
internal static void CleanupMarshalCollection (IJavaPeerable marshalObject, object value)
656656
{
657-
JavaArray<Char>.CleanupMarshalCollection<JavaCharArray> (marshalObject, value);
657+
JavaArray<Char>.CleanupMarshalCollection<JavaCharacterArray> (marshalObject, value);
658658
}
659659
}
660660

‎src/Java.Interop/Java.Interop/JavaPrimitiveArrays.tt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Java.Interop {
1414
var arrayTypeInfo = new[]{
1515
new { JniType = "Z", JniMarshalType = "Boolean", ManagedType = "Boolean",TypeModifier = "Boolean" },
1616
new { JniType = "B", JniMarshalType = "Byte", ManagedType = "SByte", TypeModifier = "SByte" },
17-
new { JniType = "C", JniMarshalType = "Char", ManagedType = "Char", TypeModifier = "Char" },
17+
new { JniType = "C", JniMarshalType = "Char", ManagedType = "Char", TypeModifier = "Character" },
1818
new { JniType = "S", JniMarshalType = "Short", ManagedType = "Int16", TypeModifier = "Int16" },
1919
new { JniType = "I", JniMarshalType = "Int", ManagedType = "Int32", TypeModifier = "Int32" },
2020
new { JniType = "J", JniMarshalType = "Long", ManagedType = "Int64", TypeModifier = "Int64" },
@@ -93,16 +93,16 @@ namespace Java.Interop {
9393
[JniTypeInfo ("<#= info.JniType #>", ArrayRank=1, TypeIsKeyword=true)]
9494
public sealed partial class Java<#= info.TypeModifier #>Array : JavaPrimitiveArray<<#= info.ManagedType #>> {
9595

96-
public Java<#= info.TypeModifier #>Array (ref JniObjectReference handle, JniHandleOwnership transfer)
96+
public Java<#= info.TypeModifier #>Array (ref JniObjectReference handle, JniObjectReferenceOptions transfer)
9797
: base (ref handle, transfer)
9898
{
9999
}
100100

101101
public unsafe Java<#= info.TypeModifier #>Array (int length)
102-
: base (ref *InvalidJniObjectReference, JniHandleOwnership.Invalid)
102+
: base (ref *InvalidJniObjectReference, JniObjectReferenceOptions.Invalid)
103103
{
104104
var peer = JniEnvironment.Arrays.New<#= info.JniMarshalType #>Array (CheckLength (length));
105-
using (SetPeerReference (ref peer, JniHandleOwnership.Transfer)) {
105+
using (SetPeerReference (ref peer, JniObjectReferenceOptions.DisposeSourceReference)) {
106106
}
107107
}
108108

@@ -194,13 +194,13 @@ namespace Java.Interop {
194194
list => new Java<#= info.TypeModifier #>Array (list));
195195
}
196196

197-
internal static IList<<#= info.ManagedType #>> GetValueFromJni (ref JniObjectReference reference, JniHandleOwnership transfer, Type targetType)
197+
internal static IList<<#= info.ManagedType #>> GetValueFromJni (ref JniObjectReference reference, JniObjectReferenceOptions transfer, Type targetType)
198198
{
199199
return JavaArray<<#= info.ManagedType #>>.GetValueFromJni (
200200
ref reference,
201201
transfer,
202202
targetType,
203-
(ref JniObjectReference h, JniHandleOwnership t) => new Java<#= info.TypeModifier #>Array (ref h, t));
203+
(ref JniObjectReference h, JniObjectReferenceOptions t) => new Java<#= info.TypeModifier #>Array (ref h, t));
204204
}
205205

206206
internal static IJavaPeerable CreateMarshalCollection (object value)

‎src/Java.Interop/Java.Interop/JniBuiltinMarshalers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ internal static object GetValueFromJni (ref JniObjectReference self, JniObjectRe
185185
Debug.Assert (targetType == null || targetType == typeof (Char), "Expected targetType==typeof(Char); was: " + targetType);
186186
TypeRef.GetCachedInstanceMethod (ref charValue, "charValue", "()C");
187187
try {
188-
return charValue.InvokeVirtualCharMethod (self);
188+
return charValue.InvokeVirtualCharacterMethod (self);
189189
} finally {
190190
JniEnvironment.References.Dispose (ref self, transfer);
191191
}

‎src/Java.Interop/Java.Interop/JniInstanceFieldInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public sbyte GetByteValue (JniObjectReference @this)
2525
return JniEnvironment.InstanceFields.GetByteField (@this, this);
2626
}
2727

28-
public char GetCharValue (JniObjectReference @this)
28+
public char GetCharacterValue (JniObjectReference @this)
2929
{
3030
return JniEnvironment.InstanceFields.GetCharField (@this, this);
3131
}

‎src/Java.Interop/Java.Interop/JniInstanceMethodInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public unsafe sbyte InvokeVirtualSByteMethod (JniObjectReference @this, JValue*
5050
return JniEnvironment.InstanceMethods.CallByteMethod (@this, this, parameters);
5151
}
5252

53-
public char InvokeVirtualCharMethod (JniObjectReference @this)
53+
public char InvokeVirtualCharacterMethod (JniObjectReference @this)
5454
{
5555
return JniEnvironment.InstanceMethods.CallCharMethod (@this, this);
5656
}
5757

58-
public unsafe char InvokeVirtualCharMethod (JniObjectReference @this, JValue* parameters)
58+
public unsafe char InvokeVirtualCharacterMethod (JniObjectReference @this, JValue* parameters)
5959
{
6060
return JniEnvironment.InstanceMethods.CallCharMethod (@this, this, parameters);
6161
}
@@ -150,12 +150,12 @@ public unsafe sbyte InvokeNonvirtualSByteMethod (JniObjectReference @this, JniOb
150150
return JniEnvironment.InstanceMethods.CallNonvirtualByteMethod (@this, declaringType, this, parameters);
151151
}
152152

153-
public char InvokeNonvirtualCharMethod (JniObjectReference @this, JniObjectReference declaringType)
153+
public char InvokeNonvirtualCharacterMethod (JniObjectReference @this, JniObjectReference declaringType)
154154
{
155155
return JniEnvironment.InstanceMethods.CallNonvirtualCharMethod (@this, declaringType, this);
156156
}
157157

158-
public unsafe char InvokeNonvirtualCharMethod (JniObjectReference @this, JniObjectReference declaringType, JValue* parameters)
158+
public unsafe char InvokeNonvirtualCharacterMethod (JniObjectReference @this, JniObjectReference declaringType, JValue* parameters)
159159
{
160160
return JniEnvironment.InstanceMethods.CallNonvirtualCharMethod (@this, declaringType, this, parameters);
161161
}

‎src/Java.Interop/Java.Interop/JniPeerFields.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public void SetValue (string encodedMember, IJavaPeerable self, sbyte value)
3838
.SetValue (self.PeerReference, value);
3939
}
4040

41-
public char GetCharValue (
41+
public char GetCharacterValue (
4242
string encodedMember,
4343
IJavaPeerable self)
4444
{
4545
JniPeerMembers.AssertSelf (self);
4646

4747
return GetFieldID (encodedMember)
48-
.GetCharValue (self.PeerReference);
48+
.GetCharacterValue (self.PeerReference);
4949
}
5050

5151
public void SetValue (string encodedMember, IJavaPeerable self, char value)
@@ -191,10 +191,10 @@ public void SetValue (string encodedMember, sbyte value)
191191
.SetValue (Members.JniPeerType.PeerReference, value);
192192
}
193193

194-
public char GetCharValue (string encodedMember)
194+
public char GetCharacterValue (string encodedMember)
195195
{
196196
return GetFieldID (encodedMember)
197-
.GetCharValue (Members.JniPeerType.PeerReference);
197+
.GetCharacterValue (Members.JniPeerType.PeerReference);
198198
}
199199

200200
public void SetValue (string encodedMember, char value)

‎src/Java.Interop/Java.Interop/JniPeerFields.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
var jniReturnTypes = new[]{
88
new { JniCallType = "Boolean", ReturnType = "bool", ParameterType = "bool" },
99
new { JniCallType = "Byte", ReturnType = "sbyte", ParameterType = "sbyte" },
10-
new { JniCallType = "Char", ReturnType = "char", ParameterType = "char" },
10+
new { JniCallType = "Character", ReturnType = "char", ParameterType = "char" },
1111
new { JniCallType = "Int16", ReturnType = "short", ParameterType = "short" },
1212
new { JniCallType = "Int32", ReturnType = "int", ParameterType = "int" },
1313
new { JniCallType = "Int64", ReturnType = "long", ParameterType = "long" },

0 commit comments

Comments
 (0)