Skip to content

Commit bd0c20d

Browse files
committed
Drop the "canonicalClassName" from JavaTypes because it is now incorrect
We're using the "normal" name now that uses $ for nested classes.
1 parent 03f923a commit bd0c20d

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Sources/JavaKit/Optional+JavaObject.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extension Optional: JavaValue where Wrapped: AnyJavaObject {
3737
}
3838

3939
public static var javaType: JavaType {
40-
JavaType(canonicalClassName: Wrapped.fullJavaClassName)
40+
JavaType(className: Wrapped.fullJavaClassName)
4141
}
4242

4343
public static func jniMethodCall(

Sources/JavaTypes/JavaType+JavaSource.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extension JavaType {
3232
self = try JavaType(mangledName: name)
3333

3434
case let className:
35-
self = JavaType(canonicalClassName: className)
35+
self = JavaType(className: className)
3636
}
3737
}
3838
}

Sources/JavaTypes/JavaType.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ public enum JavaType: Equatable, Hashable {
3131
/// A Java array.
3232
indirect case array(JavaType)
3333

34-
/// Given a canonical class name such as "java.lang.Object", split it into
34+
/// Given a class name such as "java.lang.Object", split it into
3535
/// its package and class name to form a class instance.
36-
public init(canonicalClassName name: some StringProtocol) {
36+
public init(className name: some StringProtocol) {
3737
if let lastDot = name.lastIndex(of: ".") {
3838
self = .class(
3939
package: String(name[..<lastDot]),

Sources/JavaTypes/Mangling.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ extension JavaType {
125125
string = string[string.index(after: semicolonIndex)...]
126126

127127
return JavaType(
128-
canonicalClassName: canonicalNameWithSlashes.replacingSlashesWithPeriods()
128+
className: canonicalNameWithSlashes.replacingSlashesWithPeriods()
129129
)
130130

131131
default:

0 commit comments

Comments
 (0)