Skip to content

Commit bbc4fc8

Browse files
committed
Add small updates
1 parent 70edd09 commit bbc4fc8

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

Sources/Java2Swift/JavaTranslator.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,25 @@ extension JavaTranslator {
257257
}
258258
}
259259
)
260+
261+
var staticFields: [Field] = []
262+
members.append(
263+
contentsOf: javaClass.getFields().compactMap {
264+
$0.flatMap { field in
265+
if field.isStatic {
266+
staticFields.append(field)
267+
return nil
268+
}
269+
270+
do {
271+
return try translateField(field)
272+
} catch {
273+
logUntranslated("Unable to translate '\(fullName)' field '\(field.getName())': \(error)")
274+
return nil
275+
}
276+
}
277+
}
278+
)
260279

261280
// Methods
262281
var staticMethods: [Method] = []
@@ -280,25 +299,6 @@ extension JavaTranslator {
280299
}
281300
}
282301
)
283-
284-
var staticFields: [Field] = []
285-
members.append(
286-
contentsOf: javaClass.getFields().compactMap {
287-
$0.flatMap { field in
288-
if field.isStatic {
289-
staticFields.append(field)
290-
return nil
291-
}
292-
293-
do {
294-
return try translateField(field)
295-
} catch {
296-
logUntranslated("Unable to translate '\(fullName)' field '\(field.getName())': \(error)")
297-
return nil
298-
}
299-
}
300-
}
301-
)
302302

303303
// Map the generic parameters.
304304
let genericParameterClause: String
@@ -449,7 +449,7 @@ extension JavaTranslator {
449449
let fieldAttribute: AttributeSyntax = "@JavaField";
450450
return """
451451
\(fieldAttribute)
452-
public func \(raw: javaField.getName()): \(raw: typeName)
452+
public var \(raw: javaField.getName()): \(raw: typeName)
453453
"""
454454
}
455455

Sources/JavaKitReflection/generated/JavaKitReflection.swift2java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"java.lang.reflect.AnnotatedType" : "AnnotatedType",
77
"java.lang.reflect.Constructor" : "Constructor",
88
"java.lang.reflect.Executable" : "Executable",
9+
"java.lang.reflect.Field" : "Field",
910
"java.lang.reflect.GenericArrayType" : "GenericArrayType",
1011
"java.lang.reflect.GenericDeclaration" : "GenericDeclaration",
1112
"java.lang.reflect.Method" : "Method",

0 commit comments

Comments
 (0)