Skip to content

Commit 7c0d9b5

Browse files
committed
Java2Swift: Don't omit "extends" clause when it's extending JavaObject
There's no reason to skip this; be more regular about it.
1 parent 6ca4ec3 commit 7c0d9b5

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Sources/Java2SwiftLib/JavaClassTranslator.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ struct JavaClassTranslator {
110110
self.nestedClasses = translator.nestedClasses[fullName] ?? []
111111

112112
// Superclass.
113-
if !javaClass.isInterface(),
114-
let javaSuperclass = javaClass.getSuperclass(),
115-
javaSuperclass.getName() != "java.lang.Object"
116-
{
113+
if !javaClass.isInterface(), let javaSuperclass = javaClass.getSuperclass() {
117114
do {
118115
self.swiftSuperclass = try translator.getSwiftTypeName(javaSuperclass).swiftName
119116
} catch {

Tests/Java2SwiftTests/Java2SwiftTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class Java2SwiftTests: XCTestCase {
6969
expectedChunks: [
7070
"import JavaKit",
7171
"""
72-
@JavaClass("java.lang.Class")
72+
@JavaClass("java.lang.Class", extends: JavaObject.self)
7373
public struct MyJavaClass<T: AnyJavaObject> {
7474
""",
7575
"""

0 commit comments

Comments
 (0)