From 59878b79dd550af05016159a08f27b69691c9e63 Mon Sep 17 00:00:00 2001 From: jrosen081 Date: Fri, 25 Oct 2024 22:22:55 -0400 Subject: [PATCH 1/2] Add Support for Final Fields --- Sources/Java2SwiftLib/JavaTranslator.swift | 2 +- Sources/JavaKit/Macros.swift | 4 +-- Sources/JavaKitMacros/JavaFieldMacro.swift | 25 ++++++++++++++++--- .../JavaKitReflection/Field+Utilities.swift | 5 ++++ Tests/Java2SwiftTests/Java2SwiftTests.swift | 2 +- .../JavaClassMacroTests.swift | 8 ++++++ 6 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Sources/Java2SwiftLib/JavaTranslator.swift b/Sources/Java2SwiftLib/JavaTranslator.swift index fa7e5789..fc0d0733 100644 --- a/Sources/Java2SwiftLib/JavaTranslator.swift +++ b/Sources/Java2SwiftLib/JavaTranslator.swift @@ -546,7 +546,7 @@ extension JavaTranslator { let fieldAttribute: AttributeSyntax = javaField.isStatic ? "@JavaStaticField" : "@JavaField"; let swiftFieldName = javaField.getName().escapedSwiftName return """ - \(fieldAttribute) + \(fieldAttribute)(isFinal: \(raw: javaField.isFinal)) public var \(raw: swiftFieldName): \(raw: typeName) """ } diff --git a/Sources/JavaKit/Macros.swift b/Sources/JavaKit/Macros.swift index 12ae0c26..4caef659 100644 --- a/Sources/JavaKit/Macros.swift +++ b/Sources/JavaKit/Macros.swift @@ -92,7 +92,7 @@ public macro JavaInterface(_ fullClassName: String, extends: (any AnyJavaObject. /// } /// ``` @attached(accessor) -public macro JavaField(_ javaFieldName: String? = nil) = #externalMacro(module: "JavaKitMacros", type: "JavaFieldMacro") +public macro JavaField(_ javaFieldName: String? = nil, isFinal: Bool = false) = #externalMacro(module: "JavaKitMacros", type: "JavaFieldMacro") /// Attached macro that turns a Swift property into one that accesses a Java static field on the underlying Java object. @@ -106,7 +106,7 @@ public macro JavaField(_ javaFieldName: String? = nil) = #externalMacro(module: /// } /// ``` @attached(accessor) -public macro JavaStaticField(_ javaFieldName: String? = nil) = #externalMacro(module: "JavaKitMacros", type: "JavaFieldMacro") +public macro JavaStaticField(_ javaFieldName: String? = nil, isFinal: Bool = false) = #externalMacro(module: "JavaKitMacros", type: "JavaFieldMacro") /// Attached macro that turns a Swift method into one that wraps a Java method on the underlying Java object. /// diff --git a/Sources/JavaKitMacros/JavaFieldMacro.swift b/Sources/JavaKitMacros/JavaFieldMacro.swift index d9c7929f..cb85d352 100644 --- a/Sources/JavaKitMacros/JavaFieldMacro.swift +++ b/Sources/JavaKitMacros/JavaFieldMacro.swift @@ -46,14 +46,31 @@ extension JavaFieldMacro: AccessorMacro { fieldNameAsWritten } + let createSetter = + if case .argumentList(let arguments) = node.arguments, + let wrapperIsBoolean = arguments.first(where: { $0.label?.text == "isFinal" })?.expression, + let booleanLiteral = wrapperIsBoolean.as(BooleanLiteralExprSyntax.self) + { + booleanLiteral.literal.text == "false" // Create the setter if we are not final + } else { + true + } + let getter: AccessorDeclSyntax = """ get { self[javaFieldName: \(literal: fieldName), fieldType: \(fieldType).self] } """ - let setter: AccessorDeclSyntax = """ - nonmutating set { self[javaFieldName: \(literal: fieldName), fieldType: \(fieldType).self] = newValue } - """ + var accessors: [AccessorDeclSyntax] = [ + getter + ] + + if createSetter { + let setter: AccessorDeclSyntax = """ + nonmutating set { self[javaFieldName: \(literal: fieldName), fieldType: \(fieldType).self] = newValue } + """ + accessors.append(setter) + } - return [getter, setter] + return accessors } } diff --git a/Sources/JavaKitReflection/Field+Utilities.swift b/Sources/JavaKitReflection/Field+Utilities.swift index 1f803bac..0fc1b2be 100644 --- a/Sources/JavaKitReflection/Field+Utilities.swift +++ b/Sources/JavaKitReflection/Field+Utilities.swift @@ -17,4 +17,9 @@ extension Field { public var isStatic: Bool { return (getModifiers() & 0x08) != 0 } + + /// Whether this is a 'final' field. + public var isFinal: Bool { + return (getModifiers() & 16) != 0 + } } diff --git a/Tests/Java2SwiftTests/Java2SwiftTests.swift b/Tests/Java2SwiftTests/Java2SwiftTests.swift index a2e3cb34..0217bd7d 100644 --- a/Tests/Java2SwiftTests/Java2SwiftTests.swift +++ b/Tests/Java2SwiftTests/Java2SwiftTests.swift @@ -75,7 +75,7 @@ class Java2SwiftTests: XCTestCase { } """, """ - @JavaStaticField + @JavaStaticField(isFinal: true) public var APRIL: Month? """ ]) diff --git a/Tests/JavaKitMacroTests/JavaClassMacroTests.swift b/Tests/JavaKitMacroTests/JavaClassMacroTests.swift index 82792df6..e033bc0f 100644 --- a/Tests/JavaKitMacroTests/JavaClassMacroTests.swift +++ b/Tests/JavaKitMacroTests/JavaClassMacroTests.swift @@ -41,6 +41,9 @@ class JavaKitMacroTests: XCTestCase { @JavaField public var myField: Int64 + + @JavaField(isFinal: true) + public var myFinalField: Int64 } """, expandedSource: """ @@ -73,6 +76,11 @@ class JavaKitMacroTests: XCTestCase { self[javaFieldName: "myField", fieldType: Int64.self] = newValue } } + public var myFinalField: Int64 { + get { + self[javaFieldName: "myFinalField", fieldType: Int64.self] + } + } /// The full Java class name for this Swift type. public static var fullJavaClassName: String { From 72756ce15653b24ee94a0964bcd75664685988e3 Mon Sep 17 00:00:00 2001 From: jrosen081 Date: Fri, 25 Oct 2024 22:24:17 -0400 Subject: [PATCH 2/2] Generate Classes --- Sources/JavaKit/generated/JavaBoolean.swift | 6 +- Sources/JavaKit/generated/JavaByte.swift | 10 +- Sources/JavaKit/generated/JavaCharacter.swift | 140 +++++++++--------- Sources/JavaKit/generated/JavaDouble.swift | 24 +-- Sources/JavaKit/generated/JavaFloat.swift | 24 +-- Sources/JavaKit/generated/JavaInteger.swift | 10 +- Sources/JavaKit/generated/JavaLong.swift | 10 +- Sources/JavaKit/generated/JavaShort.swift | 10 +- Sources/JavaKit/generated/JavaVoid.swift | 2 +- Sources/JavaKitJar/generated/JarEntry.swift | 84 +++++------ Sources/JavaKitJar/generated/JarFile.swift | 86 +++++------ .../JavaKitJar/generated/JarInputStream.swift | 80 +++++----- .../generated/JarOutputStream.swift | 84 +++++------ .../generated/Constructor.swift | 4 +- .../generated/Executable.swift | 4 +- .../JavaKitReflection/generated/Field.swift | 4 +- .../JavaKitReflection/generated/Method.swift | 4 +- 17 files changed, 293 insertions(+), 293 deletions(-) diff --git a/Sources/JavaKit/generated/JavaBoolean.swift b/Sources/JavaKit/generated/JavaBoolean.swift index c0cfbd04..310f46e4 100644 --- a/Sources/JavaKit/generated/JavaBoolean.swift +++ b/Sources/JavaKit/generated/JavaBoolean.swift @@ -46,13 +46,13 @@ public struct JavaBoolean { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var TRUE: JavaBoolean? - @JavaStaticField + @JavaStaticField(isFinal: true) public var FALSE: JavaBoolean? - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaByte.swift b/Sources/JavaKit/generated/JavaByte.swift index c00cae95..79b6b5f2 100644 --- a/Sources/JavaKit/generated/JavaByte.swift +++ b/Sources/JavaKit/generated/JavaByte.swift @@ -61,19 +61,19 @@ public struct JavaByte { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_VALUE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_VALUE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? - @JavaStaticField + @JavaStaticField(isFinal: true) public var SIZE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var BYTES: Int32 @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaCharacter.swift b/Sources/JavaKit/generated/JavaCharacter.swift index c5d2e8b9..68412f22 100644 --- a/Sources/JavaKit/generated/JavaCharacter.swift +++ b/Sources/JavaKit/generated/JavaCharacter.swift @@ -43,214 +43,214 @@ public struct JavaCharacter { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_RADIX: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_RADIX: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_VALUE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_VALUE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? - @JavaStaticField + @JavaStaticField(isFinal: true) public var UNASSIGNED: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var UPPERCASE_LETTER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOWERCASE_LETTER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TITLECASE_LETTER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MODIFIER_LETTER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var OTHER_LETTER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var NON_SPACING_MARK: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENCLOSING_MARK: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var COMBINING_SPACING_MARK: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DECIMAL_DIGIT_NUMBER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LETTER_NUMBER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var OTHER_NUMBER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var SPACE_SEPARATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LINE_SEPARATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var PARAGRAPH_SEPARATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CONTROL: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var FORMAT: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var PRIVATE_USE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var SURROGATE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DASH_PUNCTUATION: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var START_PUNCTUATION: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var END_PUNCTUATION: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CONNECTOR_PUNCTUATION: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var OTHER_PUNCTUATION: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MATH_SYMBOL: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CURRENCY_SYMBOL: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MODIFIER_SYMBOL: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var OTHER_SYMBOL: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var INITIAL_QUOTE_PUNCTUATION: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var FINAL_QUOTE_PUNCTUATION: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_UNDEFINED: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_LEFT_TO_RIGHT: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_RIGHT_TO_LEFT: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_EUROPEAN_NUMBER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_ARABIC_NUMBER: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_COMMON_NUMBER_SEPARATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_NONSPACING_MARK: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_BOUNDARY_NEUTRAL: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_PARAGRAPH_SEPARATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_SEGMENT_SEPARATOR: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_WHITESPACE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_OTHER_NEUTRALS: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_POP_DIRECTIONAL_FORMAT: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_FIRST_STRONG_ISOLATE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE: Int8 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_HIGH_SURROGATE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_HIGH_SURROGATE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_LOW_SURROGATE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_LOW_SURROGATE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_SURROGATE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_SURROGATE: UInt16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_SUPPLEMENTARY_CODE_POINT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_CODE_POINT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_CODE_POINT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var SIZE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var BYTES: Int32 @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaDouble.swift b/Sources/JavaKit/generated/JavaDouble.swift index 8d7a9abc..d5279a31 100644 --- a/Sources/JavaKit/generated/JavaDouble.swift +++ b/Sources/JavaKit/generated/JavaDouble.swift @@ -67,40 +67,40 @@ public struct JavaDouble { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var POSITIVE_INFINITY: Double - @JavaStaticField + @JavaStaticField(isFinal: true) public var NEGATIVE_INFINITY: Double - @JavaStaticField + @JavaStaticField(isFinal: true) public var NaN: Double - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_VALUE: Double - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_NORMAL: Double - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_VALUE: Double - @JavaStaticField + @JavaStaticField(isFinal: true) public var SIZE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var PRECISION: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_EXPONENT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_EXPONENT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var BYTES: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaFloat.swift b/Sources/JavaKit/generated/JavaFloat.swift index 83672479..5ff972c2 100644 --- a/Sources/JavaKit/generated/JavaFloat.swift +++ b/Sources/JavaKit/generated/JavaFloat.swift @@ -70,40 +70,40 @@ public struct JavaFloat { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var POSITIVE_INFINITY: Float - @JavaStaticField + @JavaStaticField(isFinal: true) public var NEGATIVE_INFINITY: Float - @JavaStaticField + @JavaStaticField(isFinal: true) public var NaN: Float - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_VALUE: Float - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_NORMAL: Float - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_VALUE: Float - @JavaStaticField + @JavaStaticField(isFinal: true) public var SIZE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var PRECISION: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_EXPONENT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_EXPONENT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var BYTES: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaInteger.swift b/Sources/JavaKit/generated/JavaInteger.swift index 09d27eed..f923016a 100644 --- a/Sources/JavaKit/generated/JavaInteger.swift +++ b/Sources/JavaKit/generated/JavaInteger.swift @@ -61,19 +61,19 @@ public struct JavaInteger { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_VALUE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_VALUE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? - @JavaStaticField + @JavaStaticField(isFinal: true) public var SIZE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var BYTES: Int32 @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaLong.swift b/Sources/JavaKit/generated/JavaLong.swift index f2aa72bd..64aeed13 100644 --- a/Sources/JavaKit/generated/JavaLong.swift +++ b/Sources/JavaKit/generated/JavaLong.swift @@ -61,19 +61,19 @@ public struct JavaLong { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_VALUE: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_VALUE: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? - @JavaStaticField + @JavaStaticField(isFinal: true) public var SIZE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var BYTES: Int32 @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaShort.swift b/Sources/JavaKit/generated/JavaShort.swift index b7c5de3f..6d5da70c 100644 --- a/Sources/JavaKit/generated/JavaShort.swift +++ b/Sources/JavaKit/generated/JavaShort.swift @@ -61,19 +61,19 @@ public struct JavaShort { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var MIN_VALUE: Int16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var MAX_VALUE: Int16 - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? - @JavaStaticField + @JavaStaticField(isFinal: true) public var SIZE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var BYTES: Int32 @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaVoid.swift b/Sources/JavaKit/generated/JavaVoid.swift index f6e0f4a6..4baedada 100644 --- a/Sources/JavaKit/generated/JavaVoid.swift +++ b/Sources/JavaKit/generated/JavaVoid.swift @@ -31,6 +31,6 @@ public struct JavaVoid { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var TYPE: JavaClass? } diff --git a/Sources/JavaKitJar/generated/JarEntry.swift b/Sources/JavaKitJar/generated/JarEntry.swift index 5fae3e56..fa688559 100644 --- a/Sources/JavaKitJar/generated/JarEntry.swift +++ b/Sources/JavaKitJar/generated/JarEntry.swift @@ -95,129 +95,129 @@ public struct JarEntry { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var STORED: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DEFLATED: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVEM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCOM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENDSK: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATX: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSUB: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDTOT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } diff --git a/Sources/JavaKitJar/generated/JarFile.swift b/Sources/JavaKitJar/generated/JarFile.swift index 5dbfdcad..60f51883 100644 --- a/Sources/JavaKitJar/generated/JarFile.swift +++ b/Sources/JavaKitJar/generated/JarFile.swift @@ -63,132 +63,132 @@ public struct JarFile { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var MANIFEST_NAME: String - @JavaStaticField + @JavaStaticField(isFinal: true) public var OPEN_READ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var OPEN_DELETE: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVEM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCOM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENDSK: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATX: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSUB: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDTOT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } diff --git a/Sources/JavaKitJar/generated/JarInputStream.swift b/Sources/JavaKitJar/generated/JarInputStream.swift index 467bb8f6..185636cd 100644 --- a/Sources/JavaKitJar/generated/JarInputStream.swift +++ b/Sources/JavaKitJar/generated/JarInputStream.swift @@ -80,123 +80,123 @@ public struct JarInputStream { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVEM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCOM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENDSK: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATX: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSUB: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDTOT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } diff --git a/Sources/JavaKitJar/generated/JarOutputStream.swift b/Sources/JavaKitJar/generated/JarOutputStream.swift index fdfbbbaa..cc915fe6 100644 --- a/Sources/JavaKitJar/generated/JarOutputStream.swift +++ b/Sources/JavaKitJar/generated/JarOutputStream.swift @@ -62,129 +62,129 @@ public struct JarOutputStream { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var STORED: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DEFLATED: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIG: Int64 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDHDR: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var LOCEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var EXTLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVEM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENVER: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENFLG: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENHOW: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENTIM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCRC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENLEN: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENNAM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENEXT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENCOM: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENDSK: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENATX: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var CENOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSUB: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDTOT: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDSIZ: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDOFF: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var ENDCOM: Int32 } diff --git a/Sources/JavaKitReflection/generated/Constructor.swift b/Sources/JavaKitReflection/generated/Constructor.swift index f3d1bb55..58ac5690 100644 --- a/Sources/JavaKitReflection/generated/Constructor.swift +++ b/Sources/JavaKitReflection/generated/Constructor.swift @@ -123,10 +123,10 @@ public struct Constructor { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var PUBLIC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DECLARED: Int32 @JavaStaticMethod diff --git a/Sources/JavaKitReflection/generated/Executable.swift b/Sources/JavaKitReflection/generated/Executable.swift index 4c337cbe..6f1fa6d8 100644 --- a/Sources/JavaKitReflection/generated/Executable.swift +++ b/Sources/JavaKitReflection/generated/Executable.swift @@ -120,10 +120,10 @@ public struct Executable { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var PUBLIC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DECLARED: Int32 @JavaStaticMethod diff --git a/Sources/JavaKitReflection/generated/Field.swift b/Sources/JavaKitReflection/generated/Field.swift index 72ab10a9..d68700b3 100644 --- a/Sources/JavaKitReflection/generated/Field.swift +++ b/Sources/JavaKitReflection/generated/Field.swift @@ -147,10 +147,10 @@ public struct Field { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var PUBLIC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DECLARED: Int32 @JavaStaticMethod diff --git a/Sources/JavaKitReflection/generated/Method.swift b/Sources/JavaKitReflection/generated/Method.swift index 2c6e1a46..74e74e10 100644 --- a/Sources/JavaKitReflection/generated/Method.swift +++ b/Sources/JavaKitReflection/generated/Method.swift @@ -138,10 +138,10 @@ public struct Method { public func wait() throws } extension JavaClass { - @JavaStaticField + @JavaStaticField(isFinal: true) public var PUBLIC: Int32 - @JavaStaticField + @JavaStaticField(isFinal: true) public var DECLARED: Int32 @JavaStaticMethod