From 4c86346eaac4f8527f441625b13e9a8b73239b2e Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Thu, 31 Oct 2024 01:11:58 -0700 Subject: [PATCH 1/2] JavaKit: Enable imported Java classes as Swift classes by default Flip the switch to have Java2Swift generate Swift classes to represent each imported Java class, and make the (relatively few) adjustments needed to the JavaKit library to make that work. Implements issue #132. --- Sources/Java2Swift/JavaToSwift.swift | 2 +- Sources/JavaKit/AnyJavaObject.swift | 3 - .../JavaKit/Exceptions/Exception+Error.swift | 7 - .../JavaKit/JavaClass+Initialization.swift | 3 +- Sources/JavaKit/JavaObject+Inheritance.swift | 5 - Sources/JavaKit/JavaObject+MethodCalls.swift | 2 +- Sources/JavaKit/generated/Exception.swift | 63 +-- Sources/JavaKit/generated/JavaArray.swift | 29 +- Sources/JavaKit/generated/JavaBoolean.swift | 38 +- Sources/JavaKit/generated/JavaByte.swift | 48 +- Sources/JavaKit/generated/JavaCharacter.swift | 496 +++++++----------- Sources/JavaKit/generated/JavaClass.swift | 112 ++-- Sources/JavaKit/generated/JavaDouble.swift | 52 +- Sources/JavaKit/generated/JavaError.swift | 63 +-- Sources/JavaKit/generated/JavaFloat.swift | 54 +- Sources/JavaKit/generated/JavaInteger.swift | 48 +- Sources/JavaKit/generated/JavaLong.swift | 48 +- Sources/JavaKit/generated/JavaNumber.swift | 45 +- Sources/JavaKit/generated/JavaObject.swift | 28 +- Sources/JavaKit/generated/JavaShort.swift | 48 +- Sources/JavaKit/generated/JavaString.swift | 158 +++--- Sources/JavaKit/generated/JavaVoid.swift | 29 +- .../JavaKit/generated/RuntimeException.swift | 63 +-- Sources/JavaKit/generated/Throwable.swift | 54 +- .../generated/ArrayDeque.swift | 110 ++-- .../generated/ArrayList.swift | 102 ++-- .../JavaKitCollection/generated/BitSet.swift | 86 ++- .../JavaKitCollection/generated/HashMap.swift | 69 +-- .../JavaKitCollection/generated/HashSet.swift | 71 +-- .../generated/JavaDictionary.swift | 47 +- .../generated/PriorityQueue.swift | 80 +-- .../JavaKitCollection/generated/Stack.swift | 187 +------ .../JavaKitCollection/generated/TreeMap.swift | 156 ++---- .../JavaKitCollection/generated/TreeSet.swift | 102 +--- Sources/JavaKitJar/generated/Attributes.swift | 108 +--- Sources/JavaKitJar/generated/JarEntry.swift | 92 +--- Sources/JavaKitJar/generated/JarFile.swift | 57 +- .../JavaKitJar/generated/JarInputStream.swift | 77 +-- .../generated/JarOutputStream.swift | 63 +-- Sources/JavaKitJar/generated/Manifest.swift | 41 +- Sources/JavaKitJar/generated/ZipEntry.swift | 67 +-- Sources/JavaKitNetwork/generated/URI.swift | 90 ++-- Sources/JavaKitNetwork/generated/URL.swift | 66 +-- .../generated/URLClassLoader.swift | 72 +-- .../Constructor+Utilities.swift | 5 - .../JavaKitReflection/Method+Utilities.swift | 5 - .../generated/AccessibleObject.swift | 53 +- .../generated/Constructor.swift | 103 +--- .../generated/Executable.swift | 100 +--- .../JavaKitReflection/generated/Field.swift | 114 ++-- .../JavaKitReflection/generated/Method.swift | 114 +--- .../generated/Parameter.swift | 63 +-- Tests/JavaKitTests/BasicRuntimeTests.swift | 2 +- 53 files changed, 1026 insertions(+), 2774 deletions(-) diff --git a/Sources/Java2Swift/JavaToSwift.swift b/Sources/Java2Swift/JavaToSwift.swift index 112c015b..1434629f 100644 --- a/Sources/Java2Swift/JavaToSwift.swift +++ b/Sources/Java2Swift/JavaToSwift.swift @@ -184,7 +184,7 @@ struct JavaToSwift: ParsableCommand { let translator = JavaTranslator( swiftModuleName: moduleName, environment: environment, - translateAsClass: false + translateAsClass: true ) // Keep track of all of the Java classes that will have diff --git a/Sources/JavaKit/AnyJavaObject.swift b/Sources/JavaKit/AnyJavaObject.swift index 711b953d..6e39766a 100644 --- a/Sources/JavaKit/AnyJavaObject.swift +++ b/Sources/JavaKit/AnyJavaObject.swift @@ -42,9 +42,6 @@ public protocol AnyJavaObject { /// Retrieve the full Java class name (e.g., java.util.Vector) static var fullJavaClassName: String { get } - /// The Java superclass type - associatedtype JavaSuperclass: AnyJavaObject - /// Initialize a Java object from the Swift instance that keeps it alive. init(javaHolder: JavaObjectHolder) diff --git a/Sources/JavaKit/Exceptions/Exception+Error.swift b/Sources/JavaKit/Exceptions/Exception+Error.swift index 688ae9d0..e0075179 100644 --- a/Sources/JavaKit/Exceptions/Exception+Error.swift +++ b/Sources/JavaKit/Exceptions/Exception+Error.swift @@ -12,13 +12,6 @@ // //===----------------------------------------------------------------------===// -// Translate all Java Exception instances in a Swift error. -extension Exception: Error, CustomStringConvertible { - public var description: String { - return getMessage() - } -} - extension JavaClass { /// Determine whether this instance is a checked exception (which must be /// handled) vs. an unchecked exception (which is not handled). diff --git a/Sources/JavaKit/JavaClass+Initialization.swift b/Sources/JavaKit/JavaClass+Initialization.swift index a9302bd8..9881e0dc 100644 --- a/Sources/JavaKit/JavaClass+Initialization.swift +++ b/Sources/JavaKit/JavaClass+Initialization.swift @@ -18,7 +18,8 @@ extension JavaClass { public typealias ObjectType = T /// Lookup this Java class within the given environment. - public init(environment: JNIEnvironment? = nil) throws { + @_nonoverride + public convenience init(environment: JNIEnvironment? = nil) throws { let environment = try environment ?? JavaVirtualMachine.shared().environment() self.init( javaThis: try ObjectType.getJNIClass(in: environment), diff --git a/Sources/JavaKit/JavaObject+Inheritance.swift b/Sources/JavaKit/JavaObject+Inheritance.swift index cbd27c91..a8557b97 100644 --- a/Sources/JavaKit/JavaObject+Inheritance.swift +++ b/Sources/JavaKit/JavaObject+Inheritance.swift @@ -15,11 +15,6 @@ import JavaRuntime extension AnyJavaObject { - /// Retrieve the same object instance but with the superclass type. - public var `super`: JavaSuperclass { - JavaSuperclass(javaHolder: javaHolder) - } - /// Look up the other class type /// /// - Returns: `nil` when either `OtherClass` isn't known to the diff --git a/Sources/JavaKit/JavaObject+MethodCalls.swift b/Sources/JavaKit/JavaObject+MethodCalls.swift index 453358ce..28558d49 100644 --- a/Sources/JavaKit/JavaObject+MethodCalls.swift +++ b/Sources/JavaKit/JavaObject+MethodCalls.swift @@ -387,7 +387,7 @@ extension JavaClass { return FieldType(fromJNI: jniMethod(javaEnvironment, javaThis, fieldID), in: javaEnvironment) } - nonmutating set { + set { let fieldID = getJNIStaticFieldID(fieldName, fieldType: fieldType)! let jniMethod = FieldType.jniStaticFieldSet(in: javaEnvironment) jniMethod(javaEnvironment, javaThis, fieldID, newValue.getJNIValue(in: javaEnvironment)) diff --git a/Sources/JavaKit/generated/Exception.swift b/Sources/JavaKit/generated/Exception.swift index 694dc112..6fc9de8c 100644 --- a/Sources/JavaKit/generated/Exception.swift +++ b/Sources/JavaKit/generated/Exception.swift @@ -1,68 +1,17 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Exception", extends: Throwable.self) -public struct Exception { +@JavaClass("java.lang.Exception") +open class Exception: Throwable { @JavaMethod - public init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) - - @JavaMethod - public func printStackTrace() - - @JavaMethod - public func fillInStackTrace() -> Throwable! - - @JavaMethod - public func getCause() -> Throwable! - - @JavaMethod - public func initCause(_ arg0: Throwable?) -> Throwable! - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func getMessage() -> String - - @JavaMethod - public func getSuppressed() -> [Throwable?] - - @JavaMethod - public func getLocalizedMessage() -> String - - @JavaMethod - public func addSuppressed(_ arg0: Throwable?) - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) } diff --git a/Sources/JavaKit/generated/JavaArray.swift b/Sources/JavaKit/generated/JavaArray.swift index 805b3929..147f24df 100644 --- a/Sources/JavaKit/generated/JavaArray.swift +++ b/Sources/JavaKit/generated/JavaArray.swift @@ -1,34 +1,9 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.reflect.Array", extends: JavaObject.self) -public struct JavaArray { - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool +@JavaClass("java.lang.reflect.Array") +open class JavaArray: JavaObject { - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaBoolean.swift b/Sources/JavaKit/generated/JavaBoolean.swift index e942fb44..0ab51f6d 100644 --- a/Sources/JavaKit/generated/JavaBoolean.swift +++ b/Sources/JavaKit/generated/JavaBoolean.swift @@ -1,49 +1,31 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Boolean", extends: JavaObject.self) -public struct JavaBoolean { +@JavaClass("java.lang.Boolean") +open class JavaBoolean: JavaObject { @JavaMethod - public init(_ arg0: Bool, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Bool, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaBoolean?) -> Int32 + open func compareTo(_ arg0: JavaBoolean?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func booleanValue() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func booleanValue() -> Bool } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/JavaByte.swift b/Sources/JavaKit/generated/JavaByte.swift index 7b832217..e75c5996 100644 --- a/Sources/JavaKit/generated/JavaByte.swift +++ b/Sources/JavaKit/generated/JavaByte.swift @@ -1,64 +1,46 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Byte", extends: JavaNumber.self) -public struct JavaByte { +@JavaClass("java.lang.Byte") +open class JavaByte: JavaNumber { @JavaMethod - public init(_ arg0: Int8, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int8, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaByte?) -> Int32 + open func compareTo(_ arg0: JavaByte?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func byteValue() -> Int8 + open override func byteValue() -> Int8 @JavaMethod - public func shortValue() -> Int16 + open override func shortValue() -> Int16 @JavaMethod - public func intValue() -> Int32 + open override func intValue() -> Int32 @JavaMethod - public func longValue() -> Int64 + open override func longValue() -> Int64 @JavaMethod - public func floatValue() -> Float + open override func floatValue() -> Float @JavaMethod - public func doubleValue() -> Double - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open override func doubleValue() -> Double } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/JavaCharacter.swift b/Sources/JavaKit/generated/JavaCharacter.swift index 82b92a23..eead7dfd 100644 --- a/Sources/JavaKit/generated/JavaCharacter.swift +++ b/Sources/JavaKit/generated/JavaCharacter.swift @@ -1,107 +1,46 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Character", extends: JavaObject.self) -public struct JavaCharacter { +@JavaClass("java.lang.Character") +open class JavaCharacter: JavaObject { @JavaMethod - public init(_ arg0: UInt16, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: UInt16, environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaCharacter?) -> Int32 + open func compareTo(_ arg0: JavaCharacter?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func charValue() -> UInt16 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func charValue() -> UInt16 } extension JavaCharacter { - @JavaClass("java.lang.Character$Subset", extends: JavaObject.self) - public struct Subset { - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - + @JavaClass("java.lang.Character$Subset") + open class Subset: JavaObject { @JavaMethod - public func hashCode() -> Int32 + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func getClass() -> JavaClass! + open override func toString() -> String @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open override func hashCode() -> Int32 } } extension JavaCharacter { - @JavaClass("java.lang.Character$UnicodeBlock", extends: JavaCharacter.Subset.self) - public struct UnicodeBlock { - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! + @JavaClass("java.lang.Character$UnicodeBlock") + open class UnicodeBlock: JavaCharacter.Subset { - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws } } extension JavaClass { @@ -1102,8 +1041,8 @@ extension JavaClass { public func of(_ arg0: UInt16) -> JavaCharacter.UnicodeBlock! } extension JavaCharacter { - @JavaClass("java.lang.Character$UnicodeScript", extends: JavaObject.self) - public struct UnicodeScript { + @JavaClass("java.lang.Character$UnicodeScript") + open class UnicodeScript: JavaObject { public enum UnicodeScriptCases: Equatable { case COMMON case LATIN @@ -1606,7 +1545,7 @@ extension JavaCharacter { } } - public init(_ enumValue: UnicodeScriptCases, environment: JNIEnvironment? = nil) { + public convenience init(_ enumValue: UnicodeScriptCases, environment: JNIEnvironment? = nil) { let _environment = if let environment { environment } else { @@ -1616,1060 +1555,997 @@ extension JavaCharacter { switch enumValue { case .COMMON: if let COMMON = classObj.COMMON { - self = COMMON + self.init(javaHolder: COMMON.javaHolder) } else { fatalError("Enum value COMMON was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LATIN: if let LATIN = classObj.LATIN { - self = LATIN + self.init(javaHolder: LATIN.javaHolder) } else { fatalError("Enum value LATIN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GREEK: if let GREEK = classObj.GREEK { - self = GREEK + self.init(javaHolder: GREEK.javaHolder) } else { fatalError("Enum value GREEK was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CYRILLIC: if let CYRILLIC = classObj.CYRILLIC { - self = CYRILLIC + self.init(javaHolder: CYRILLIC.javaHolder) } else { fatalError("Enum value CYRILLIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ARMENIAN: if let ARMENIAN = classObj.ARMENIAN { - self = ARMENIAN + self.init(javaHolder: ARMENIAN.javaHolder) } else { fatalError("Enum value ARMENIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .HEBREW: if let HEBREW = classObj.HEBREW { - self = HEBREW + self.init(javaHolder: HEBREW.javaHolder) } else { fatalError("Enum value HEBREW was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ARABIC: if let ARABIC = classObj.ARABIC { - self = ARABIC + self.init(javaHolder: ARABIC.javaHolder) } else { fatalError("Enum value ARABIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SYRIAC: if let SYRIAC = classObj.SYRIAC { - self = SYRIAC + self.init(javaHolder: SYRIAC.javaHolder) } else { fatalError("Enum value SYRIAC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .THAANA: if let THAANA = classObj.THAANA { - self = THAANA + self.init(javaHolder: THAANA.javaHolder) } else { fatalError("Enum value THAANA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .DEVANAGARI: if let DEVANAGARI = classObj.DEVANAGARI { - self = DEVANAGARI + self.init(javaHolder: DEVANAGARI.javaHolder) } else { fatalError("Enum value DEVANAGARI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BENGALI: if let BENGALI = classObj.BENGALI { - self = BENGALI + self.init(javaHolder: BENGALI.javaHolder) } else { fatalError("Enum value BENGALI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GURMUKHI: if let GURMUKHI = classObj.GURMUKHI { - self = GURMUKHI + self.init(javaHolder: GURMUKHI.javaHolder) } else { fatalError("Enum value GURMUKHI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GUJARATI: if let GUJARATI = classObj.GUJARATI { - self = GUJARATI + self.init(javaHolder: GUJARATI.javaHolder) } else { fatalError("Enum value GUJARATI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ORIYA: if let ORIYA = classObj.ORIYA { - self = ORIYA + self.init(javaHolder: ORIYA.javaHolder) } else { fatalError("Enum value ORIYA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TAMIL: if let TAMIL = classObj.TAMIL { - self = TAMIL + self.init(javaHolder: TAMIL.javaHolder) } else { fatalError("Enum value TAMIL was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TELUGU: if let TELUGU = classObj.TELUGU { - self = TELUGU + self.init(javaHolder: TELUGU.javaHolder) } else { fatalError("Enum value TELUGU was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KANNADA: if let KANNADA = classObj.KANNADA { - self = KANNADA + self.init(javaHolder: KANNADA.javaHolder) } else { fatalError("Enum value KANNADA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MALAYALAM: if let MALAYALAM = classObj.MALAYALAM { - self = MALAYALAM + self.init(javaHolder: MALAYALAM.javaHolder) } else { fatalError("Enum value MALAYALAM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SINHALA: if let SINHALA = classObj.SINHALA { - self = SINHALA + self.init(javaHolder: SINHALA.javaHolder) } else { fatalError("Enum value SINHALA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .THAI: if let THAI = classObj.THAI { - self = THAI + self.init(javaHolder: THAI.javaHolder) } else { fatalError("Enum value THAI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LAO: if let LAO = classObj.LAO { - self = LAO + self.init(javaHolder: LAO.javaHolder) } else { fatalError("Enum value LAO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TIBETAN: if let TIBETAN = classObj.TIBETAN { - self = TIBETAN + self.init(javaHolder: TIBETAN.javaHolder) } else { fatalError("Enum value TIBETAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MYANMAR: if let MYANMAR = classObj.MYANMAR { - self = MYANMAR + self.init(javaHolder: MYANMAR.javaHolder) } else { fatalError("Enum value MYANMAR was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GEORGIAN: if let GEORGIAN = classObj.GEORGIAN { - self = GEORGIAN + self.init(javaHolder: GEORGIAN.javaHolder) } else { fatalError("Enum value GEORGIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .HANGUL: if let HANGUL = classObj.HANGUL { - self = HANGUL + self.init(javaHolder: HANGUL.javaHolder) } else { fatalError("Enum value HANGUL was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ETHIOPIC: if let ETHIOPIC = classObj.ETHIOPIC { - self = ETHIOPIC + self.init(javaHolder: ETHIOPIC.javaHolder) } else { fatalError("Enum value ETHIOPIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CHEROKEE: if let CHEROKEE = classObj.CHEROKEE { - self = CHEROKEE + self.init(javaHolder: CHEROKEE.javaHolder) } else { fatalError("Enum value CHEROKEE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CANADIAN_ABORIGINAL: if let CANADIAN_ABORIGINAL = classObj.CANADIAN_ABORIGINAL { - self = CANADIAN_ABORIGINAL + self.init(javaHolder: CANADIAN_ABORIGINAL.javaHolder) } else { fatalError("Enum value CANADIAN_ABORIGINAL was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OGHAM: if let OGHAM = classObj.OGHAM { - self = OGHAM + self.init(javaHolder: OGHAM.javaHolder) } else { fatalError("Enum value OGHAM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .RUNIC: if let RUNIC = classObj.RUNIC { - self = RUNIC + self.init(javaHolder: RUNIC.javaHolder) } else { fatalError("Enum value RUNIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KHMER: if let KHMER = classObj.KHMER { - self = KHMER + self.init(javaHolder: KHMER.javaHolder) } else { fatalError("Enum value KHMER was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MONGOLIAN: if let MONGOLIAN = classObj.MONGOLIAN { - self = MONGOLIAN + self.init(javaHolder: MONGOLIAN.javaHolder) } else { fatalError("Enum value MONGOLIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .HIRAGANA: if let HIRAGANA = classObj.HIRAGANA { - self = HIRAGANA + self.init(javaHolder: HIRAGANA.javaHolder) } else { fatalError("Enum value HIRAGANA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KATAKANA: if let KATAKANA = classObj.KATAKANA { - self = KATAKANA + self.init(javaHolder: KATAKANA.javaHolder) } else { fatalError("Enum value KATAKANA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BOPOMOFO: if let BOPOMOFO = classObj.BOPOMOFO { - self = BOPOMOFO + self.init(javaHolder: BOPOMOFO.javaHolder) } else { fatalError("Enum value BOPOMOFO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .HAN: if let HAN = classObj.HAN { - self = HAN + self.init(javaHolder: HAN.javaHolder) } else { fatalError("Enum value HAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .YI: if let YI = classObj.YI { - self = YI + self.init(javaHolder: YI.javaHolder) } else { fatalError("Enum value YI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_ITALIC: if let OLD_ITALIC = classObj.OLD_ITALIC { - self = OLD_ITALIC + self.init(javaHolder: OLD_ITALIC.javaHolder) } else { fatalError("Enum value OLD_ITALIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GOTHIC: if let GOTHIC = classObj.GOTHIC { - self = GOTHIC + self.init(javaHolder: GOTHIC.javaHolder) } else { fatalError("Enum value GOTHIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .DESERET: if let DESERET = classObj.DESERET { - self = DESERET + self.init(javaHolder: DESERET.javaHolder) } else { fatalError("Enum value DESERET was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .INHERITED: if let INHERITED = classObj.INHERITED { - self = INHERITED + self.init(javaHolder: INHERITED.javaHolder) } else { fatalError("Enum value INHERITED was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TAGALOG: if let TAGALOG = classObj.TAGALOG { - self = TAGALOG + self.init(javaHolder: TAGALOG.javaHolder) } else { fatalError("Enum value TAGALOG was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .HANUNOO: if let HANUNOO = classObj.HANUNOO { - self = HANUNOO + self.init(javaHolder: HANUNOO.javaHolder) } else { fatalError("Enum value HANUNOO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BUHID: if let BUHID = classObj.BUHID { - self = BUHID + self.init(javaHolder: BUHID.javaHolder) } else { fatalError("Enum value BUHID was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TAGBANWA: if let TAGBANWA = classObj.TAGBANWA { - self = TAGBANWA + self.init(javaHolder: TAGBANWA.javaHolder) } else { fatalError("Enum value TAGBANWA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LIMBU: if let LIMBU = classObj.LIMBU { - self = LIMBU + self.init(javaHolder: LIMBU.javaHolder) } else { fatalError("Enum value LIMBU was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TAI_LE: if let TAI_LE = classObj.TAI_LE { - self = TAI_LE + self.init(javaHolder: TAI_LE.javaHolder) } else { fatalError("Enum value TAI_LE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LINEAR_B: if let LINEAR_B = classObj.LINEAR_B { - self = LINEAR_B + self.init(javaHolder: LINEAR_B.javaHolder) } else { fatalError("Enum value LINEAR_B was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .UGARITIC: if let UGARITIC = classObj.UGARITIC { - self = UGARITIC + self.init(javaHolder: UGARITIC.javaHolder) } else { fatalError("Enum value UGARITIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SHAVIAN: if let SHAVIAN = classObj.SHAVIAN { - self = SHAVIAN + self.init(javaHolder: SHAVIAN.javaHolder) } else { fatalError("Enum value SHAVIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OSMANYA: if let OSMANYA = classObj.OSMANYA { - self = OSMANYA + self.init(javaHolder: OSMANYA.javaHolder) } else { fatalError("Enum value OSMANYA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CYPRIOT: if let CYPRIOT = classObj.CYPRIOT { - self = CYPRIOT + self.init(javaHolder: CYPRIOT.javaHolder) } else { fatalError("Enum value CYPRIOT was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BRAILLE: if let BRAILLE = classObj.BRAILLE { - self = BRAILLE + self.init(javaHolder: BRAILLE.javaHolder) } else { fatalError("Enum value BRAILLE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BUGINESE: if let BUGINESE = classObj.BUGINESE { - self = BUGINESE + self.init(javaHolder: BUGINESE.javaHolder) } else { fatalError("Enum value BUGINESE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .COPTIC: if let COPTIC = classObj.COPTIC { - self = COPTIC + self.init(javaHolder: COPTIC.javaHolder) } else { fatalError("Enum value COPTIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NEW_TAI_LUE: if let NEW_TAI_LUE = classObj.NEW_TAI_LUE { - self = NEW_TAI_LUE + self.init(javaHolder: NEW_TAI_LUE.javaHolder) } else { fatalError("Enum value NEW_TAI_LUE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GLAGOLITIC: if let GLAGOLITIC = classObj.GLAGOLITIC { - self = GLAGOLITIC + self.init(javaHolder: GLAGOLITIC.javaHolder) } else { fatalError("Enum value GLAGOLITIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TIFINAGH: if let TIFINAGH = classObj.TIFINAGH { - self = TIFINAGH + self.init(javaHolder: TIFINAGH.javaHolder) } else { fatalError("Enum value TIFINAGH was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SYLOTI_NAGRI: if let SYLOTI_NAGRI = classObj.SYLOTI_NAGRI { - self = SYLOTI_NAGRI + self.init(javaHolder: SYLOTI_NAGRI.javaHolder) } else { fatalError("Enum value SYLOTI_NAGRI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_PERSIAN: if let OLD_PERSIAN = classObj.OLD_PERSIAN { - self = OLD_PERSIAN + self.init(javaHolder: OLD_PERSIAN.javaHolder) } else { fatalError("Enum value OLD_PERSIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KHAROSHTHI: if let KHAROSHTHI = classObj.KHAROSHTHI { - self = KHAROSHTHI + self.init(javaHolder: KHAROSHTHI.javaHolder) } else { fatalError("Enum value KHAROSHTHI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BALINESE: if let BALINESE = classObj.BALINESE { - self = BALINESE + self.init(javaHolder: BALINESE.javaHolder) } else { fatalError("Enum value BALINESE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CUNEIFORM: if let CUNEIFORM = classObj.CUNEIFORM { - self = CUNEIFORM + self.init(javaHolder: CUNEIFORM.javaHolder) } else { fatalError("Enum value CUNEIFORM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .PHOENICIAN: if let PHOENICIAN = classObj.PHOENICIAN { - self = PHOENICIAN + self.init(javaHolder: PHOENICIAN.javaHolder) } else { fatalError("Enum value PHOENICIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .PHAGS_PA: if let PHAGS_PA = classObj.PHAGS_PA { - self = PHAGS_PA + self.init(javaHolder: PHAGS_PA.javaHolder) } else { fatalError("Enum value PHAGS_PA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NKO: if let NKO = classObj.NKO { - self = NKO + self.init(javaHolder: NKO.javaHolder) } else { fatalError("Enum value NKO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SUNDANESE: if let SUNDANESE = classObj.SUNDANESE { - self = SUNDANESE + self.init(javaHolder: SUNDANESE.javaHolder) } else { fatalError("Enum value SUNDANESE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BATAK: if let BATAK = classObj.BATAK { - self = BATAK + self.init(javaHolder: BATAK.javaHolder) } else { fatalError("Enum value BATAK was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LEPCHA: if let LEPCHA = classObj.LEPCHA { - self = LEPCHA + self.init(javaHolder: LEPCHA.javaHolder) } else { fatalError("Enum value LEPCHA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OL_CHIKI: if let OL_CHIKI = classObj.OL_CHIKI { - self = OL_CHIKI + self.init(javaHolder: OL_CHIKI.javaHolder) } else { fatalError("Enum value OL_CHIKI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .VAI: if let VAI = classObj.VAI { - self = VAI + self.init(javaHolder: VAI.javaHolder) } else { fatalError("Enum value VAI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SAURASHTRA: if let SAURASHTRA = classObj.SAURASHTRA { - self = SAURASHTRA + self.init(javaHolder: SAURASHTRA.javaHolder) } else { fatalError("Enum value SAURASHTRA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KAYAH_LI: if let KAYAH_LI = classObj.KAYAH_LI { - self = KAYAH_LI + self.init(javaHolder: KAYAH_LI.javaHolder) } else { fatalError("Enum value KAYAH_LI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .REJANG: if let REJANG = classObj.REJANG { - self = REJANG + self.init(javaHolder: REJANG.javaHolder) } else { fatalError("Enum value REJANG was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LYCIAN: if let LYCIAN = classObj.LYCIAN { - self = LYCIAN + self.init(javaHolder: LYCIAN.javaHolder) } else { fatalError("Enum value LYCIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CARIAN: if let CARIAN = classObj.CARIAN { - self = CARIAN + self.init(javaHolder: CARIAN.javaHolder) } else { fatalError("Enum value CARIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LYDIAN: if let LYDIAN = classObj.LYDIAN { - self = LYDIAN + self.init(javaHolder: LYDIAN.javaHolder) } else { fatalError("Enum value LYDIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CHAM: if let CHAM = classObj.CHAM { - self = CHAM + self.init(javaHolder: CHAM.javaHolder) } else { fatalError("Enum value CHAM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TAI_THAM: if let TAI_THAM = classObj.TAI_THAM { - self = TAI_THAM + self.init(javaHolder: TAI_THAM.javaHolder) } else { fatalError("Enum value TAI_THAM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TAI_VIET: if let TAI_VIET = classObj.TAI_VIET { - self = TAI_VIET + self.init(javaHolder: TAI_VIET.javaHolder) } else { fatalError("Enum value TAI_VIET was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .AVESTAN: if let AVESTAN = classObj.AVESTAN { - self = AVESTAN + self.init(javaHolder: AVESTAN.javaHolder) } else { fatalError("Enum value AVESTAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .EGYPTIAN_HIEROGLYPHS: if let EGYPTIAN_HIEROGLYPHS = classObj.EGYPTIAN_HIEROGLYPHS { - self = EGYPTIAN_HIEROGLYPHS + self.init(javaHolder: EGYPTIAN_HIEROGLYPHS.javaHolder) } else { fatalError("Enum value EGYPTIAN_HIEROGLYPHS was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SAMARITAN: if let SAMARITAN = classObj.SAMARITAN { - self = SAMARITAN + self.init(javaHolder: SAMARITAN.javaHolder) } else { fatalError("Enum value SAMARITAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MANDAIC: if let MANDAIC = classObj.MANDAIC { - self = MANDAIC + self.init(javaHolder: MANDAIC.javaHolder) } else { fatalError("Enum value MANDAIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LISU: if let LISU = classObj.LISU { - self = LISU + self.init(javaHolder: LISU.javaHolder) } else { fatalError("Enum value LISU was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BAMUM: if let BAMUM = classObj.BAMUM { - self = BAMUM + self.init(javaHolder: BAMUM.javaHolder) } else { fatalError("Enum value BAMUM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .JAVANESE: if let JAVANESE = classObj.JAVANESE { - self = JAVANESE + self.init(javaHolder: JAVANESE.javaHolder) } else { fatalError("Enum value JAVANESE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MEETEI_MAYEK: if let MEETEI_MAYEK = classObj.MEETEI_MAYEK { - self = MEETEI_MAYEK + self.init(javaHolder: MEETEI_MAYEK.javaHolder) } else { fatalError("Enum value MEETEI_MAYEK was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .IMPERIAL_ARAMAIC: if let IMPERIAL_ARAMAIC = classObj.IMPERIAL_ARAMAIC { - self = IMPERIAL_ARAMAIC + self.init(javaHolder: IMPERIAL_ARAMAIC.javaHolder) } else { fatalError("Enum value IMPERIAL_ARAMAIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_SOUTH_ARABIAN: if let OLD_SOUTH_ARABIAN = classObj.OLD_SOUTH_ARABIAN { - self = OLD_SOUTH_ARABIAN + self.init(javaHolder: OLD_SOUTH_ARABIAN.javaHolder) } else { fatalError("Enum value OLD_SOUTH_ARABIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .INSCRIPTIONAL_PARTHIAN: if let INSCRIPTIONAL_PARTHIAN = classObj.INSCRIPTIONAL_PARTHIAN { - self = INSCRIPTIONAL_PARTHIAN + self.init(javaHolder: INSCRIPTIONAL_PARTHIAN.javaHolder) } else { fatalError("Enum value INSCRIPTIONAL_PARTHIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .INSCRIPTIONAL_PAHLAVI: if let INSCRIPTIONAL_PAHLAVI = classObj.INSCRIPTIONAL_PAHLAVI { - self = INSCRIPTIONAL_PAHLAVI + self.init(javaHolder: INSCRIPTIONAL_PAHLAVI.javaHolder) } else { fatalError("Enum value INSCRIPTIONAL_PAHLAVI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_TURKIC: if let OLD_TURKIC = classObj.OLD_TURKIC { - self = OLD_TURKIC + self.init(javaHolder: OLD_TURKIC.javaHolder) } else { fatalError("Enum value OLD_TURKIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BRAHMI: if let BRAHMI = classObj.BRAHMI { - self = BRAHMI + self.init(javaHolder: BRAHMI.javaHolder) } else { fatalError("Enum value BRAHMI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KAITHI: if let KAITHI = classObj.KAITHI { - self = KAITHI + self.init(javaHolder: KAITHI.javaHolder) } else { fatalError("Enum value KAITHI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MEROITIC_HIEROGLYPHS: if let MEROITIC_HIEROGLYPHS = classObj.MEROITIC_HIEROGLYPHS { - self = MEROITIC_HIEROGLYPHS + self.init(javaHolder: MEROITIC_HIEROGLYPHS.javaHolder) } else { fatalError("Enum value MEROITIC_HIEROGLYPHS was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MEROITIC_CURSIVE: if let MEROITIC_CURSIVE = classObj.MEROITIC_CURSIVE { - self = MEROITIC_CURSIVE + self.init(javaHolder: MEROITIC_CURSIVE.javaHolder) } else { fatalError("Enum value MEROITIC_CURSIVE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SORA_SOMPENG: if let SORA_SOMPENG = classObj.SORA_SOMPENG { - self = SORA_SOMPENG + self.init(javaHolder: SORA_SOMPENG.javaHolder) } else { fatalError("Enum value SORA_SOMPENG was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CHAKMA: if let CHAKMA = classObj.CHAKMA { - self = CHAKMA + self.init(javaHolder: CHAKMA.javaHolder) } else { fatalError("Enum value CHAKMA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SHARADA: if let SHARADA = classObj.SHARADA { - self = SHARADA + self.init(javaHolder: SHARADA.javaHolder) } else { fatalError("Enum value SHARADA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TAKRI: if let TAKRI = classObj.TAKRI { - self = TAKRI + self.init(javaHolder: TAKRI.javaHolder) } else { fatalError("Enum value TAKRI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MIAO: if let MIAO = classObj.MIAO { - self = MIAO + self.init(javaHolder: MIAO.javaHolder) } else { fatalError("Enum value MIAO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CAUCASIAN_ALBANIAN: if let CAUCASIAN_ALBANIAN = classObj.CAUCASIAN_ALBANIAN { - self = CAUCASIAN_ALBANIAN + self.init(javaHolder: CAUCASIAN_ALBANIAN.javaHolder) } else { fatalError("Enum value CAUCASIAN_ALBANIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BASSA_VAH: if let BASSA_VAH = classObj.BASSA_VAH { - self = BASSA_VAH + self.init(javaHolder: BASSA_VAH.javaHolder) } else { fatalError("Enum value BASSA_VAH was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .DUPLOYAN: if let DUPLOYAN = classObj.DUPLOYAN { - self = DUPLOYAN + self.init(javaHolder: DUPLOYAN.javaHolder) } else { fatalError("Enum value DUPLOYAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ELBASAN: if let ELBASAN = classObj.ELBASAN { - self = ELBASAN + self.init(javaHolder: ELBASAN.javaHolder) } else { fatalError("Enum value ELBASAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GRANTHA: if let GRANTHA = classObj.GRANTHA { - self = GRANTHA + self.init(javaHolder: GRANTHA.javaHolder) } else { fatalError("Enum value GRANTHA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .PAHAWH_HMONG: if let PAHAWH_HMONG = classObj.PAHAWH_HMONG { - self = PAHAWH_HMONG + self.init(javaHolder: PAHAWH_HMONG.javaHolder) } else { fatalError("Enum value PAHAWH_HMONG was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KHOJKI: if let KHOJKI = classObj.KHOJKI { - self = KHOJKI + self.init(javaHolder: KHOJKI.javaHolder) } else { fatalError("Enum value KHOJKI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .LINEAR_A: if let LINEAR_A = classObj.LINEAR_A { - self = LINEAR_A + self.init(javaHolder: LINEAR_A.javaHolder) } else { fatalError("Enum value LINEAR_A was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MAHAJANI: if let MAHAJANI = classObj.MAHAJANI { - self = MAHAJANI + self.init(javaHolder: MAHAJANI.javaHolder) } else { fatalError("Enum value MAHAJANI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MANICHAEAN: if let MANICHAEAN = classObj.MANICHAEAN { - self = MANICHAEAN + self.init(javaHolder: MANICHAEAN.javaHolder) } else { fatalError("Enum value MANICHAEAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MENDE_KIKAKUI: if let MENDE_KIKAKUI = classObj.MENDE_KIKAKUI { - self = MENDE_KIKAKUI + self.init(javaHolder: MENDE_KIKAKUI.javaHolder) } else { fatalError("Enum value MENDE_KIKAKUI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MODI: if let MODI = classObj.MODI { - self = MODI + self.init(javaHolder: MODI.javaHolder) } else { fatalError("Enum value MODI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MRO: if let MRO = classObj.MRO { - self = MRO + self.init(javaHolder: MRO.javaHolder) } else { fatalError("Enum value MRO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_NORTH_ARABIAN: if let OLD_NORTH_ARABIAN = classObj.OLD_NORTH_ARABIAN { - self = OLD_NORTH_ARABIAN + self.init(javaHolder: OLD_NORTH_ARABIAN.javaHolder) } else { fatalError("Enum value OLD_NORTH_ARABIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NABATAEAN: if let NABATAEAN = classObj.NABATAEAN { - self = NABATAEAN + self.init(javaHolder: NABATAEAN.javaHolder) } else { fatalError("Enum value NABATAEAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .PALMYRENE: if let PALMYRENE = classObj.PALMYRENE { - self = PALMYRENE + self.init(javaHolder: PALMYRENE.javaHolder) } else { fatalError("Enum value PALMYRENE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .PAU_CIN_HAU: if let PAU_CIN_HAU = classObj.PAU_CIN_HAU { - self = PAU_CIN_HAU + self.init(javaHolder: PAU_CIN_HAU.javaHolder) } else { fatalError("Enum value PAU_CIN_HAU was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_PERMIC: if let OLD_PERMIC = classObj.OLD_PERMIC { - self = OLD_PERMIC + self.init(javaHolder: OLD_PERMIC.javaHolder) } else { fatalError("Enum value OLD_PERMIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .PSALTER_PAHLAVI: if let PSALTER_PAHLAVI = classObj.PSALTER_PAHLAVI { - self = PSALTER_PAHLAVI + self.init(javaHolder: PSALTER_PAHLAVI.javaHolder) } else { fatalError("Enum value PSALTER_PAHLAVI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SIDDHAM: if let SIDDHAM = classObj.SIDDHAM { - self = SIDDHAM + self.init(javaHolder: SIDDHAM.javaHolder) } else { fatalError("Enum value SIDDHAM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KHUDAWADI: if let KHUDAWADI = classObj.KHUDAWADI { - self = KHUDAWADI + self.init(javaHolder: KHUDAWADI.javaHolder) } else { fatalError("Enum value KHUDAWADI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TIRHUTA: if let TIRHUTA = classObj.TIRHUTA { - self = TIRHUTA + self.init(javaHolder: TIRHUTA.javaHolder) } else { fatalError("Enum value TIRHUTA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .WARANG_CITI: if let WARANG_CITI = classObj.WARANG_CITI { - self = WARANG_CITI + self.init(javaHolder: WARANG_CITI.javaHolder) } else { fatalError("Enum value WARANG_CITI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .AHOM: if let AHOM = classObj.AHOM { - self = AHOM + self.init(javaHolder: AHOM.javaHolder) } else { fatalError("Enum value AHOM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ANATOLIAN_HIEROGLYPHS: if let ANATOLIAN_HIEROGLYPHS = classObj.ANATOLIAN_HIEROGLYPHS { - self = ANATOLIAN_HIEROGLYPHS + self.init(javaHolder: ANATOLIAN_HIEROGLYPHS.javaHolder) } else { fatalError("Enum value ANATOLIAN_HIEROGLYPHS was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .HATRAN: if let HATRAN = classObj.HATRAN { - self = HATRAN + self.init(javaHolder: HATRAN.javaHolder) } else { fatalError("Enum value HATRAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MULTANI: if let MULTANI = classObj.MULTANI { - self = MULTANI + self.init(javaHolder: MULTANI.javaHolder) } else { fatalError("Enum value MULTANI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_HUNGARIAN: if let OLD_HUNGARIAN = classObj.OLD_HUNGARIAN { - self = OLD_HUNGARIAN + self.init(javaHolder: OLD_HUNGARIAN.javaHolder) } else { fatalError("Enum value OLD_HUNGARIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SIGNWRITING: if let SIGNWRITING = classObj.SIGNWRITING { - self = SIGNWRITING + self.init(javaHolder: SIGNWRITING.javaHolder) } else { fatalError("Enum value SIGNWRITING was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ADLAM: if let ADLAM = classObj.ADLAM { - self = ADLAM + self.init(javaHolder: ADLAM.javaHolder) } else { fatalError("Enum value ADLAM was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .BHAIKSUKI: if let BHAIKSUKI = classObj.BHAIKSUKI { - self = BHAIKSUKI + self.init(javaHolder: BHAIKSUKI.javaHolder) } else { fatalError("Enum value BHAIKSUKI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MARCHEN: if let MARCHEN = classObj.MARCHEN { - self = MARCHEN + self.init(javaHolder: MARCHEN.javaHolder) } else { fatalError("Enum value MARCHEN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NEWA: if let NEWA = classObj.NEWA { - self = NEWA + self.init(javaHolder: NEWA.javaHolder) } else { fatalError("Enum value NEWA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OSAGE: if let OSAGE = classObj.OSAGE { - self = OSAGE + self.init(javaHolder: OSAGE.javaHolder) } else { fatalError("Enum value OSAGE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TANGUT: if let TANGUT = classObj.TANGUT { - self = TANGUT + self.init(javaHolder: TANGUT.javaHolder) } else { fatalError("Enum value TANGUT was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MASARAM_GONDI: if let MASARAM_GONDI = classObj.MASARAM_GONDI { - self = MASARAM_GONDI + self.init(javaHolder: MASARAM_GONDI.javaHolder) } else { fatalError("Enum value MASARAM_GONDI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NUSHU: if let NUSHU = classObj.NUSHU { - self = NUSHU + self.init(javaHolder: NUSHU.javaHolder) } else { fatalError("Enum value NUSHU was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SOYOMBO: if let SOYOMBO = classObj.SOYOMBO { - self = SOYOMBO + self.init(javaHolder: SOYOMBO.javaHolder) } else { fatalError("Enum value SOYOMBO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ZANABAZAR_SQUARE: if let ZANABAZAR_SQUARE = classObj.ZANABAZAR_SQUARE { - self = ZANABAZAR_SQUARE + self.init(javaHolder: ZANABAZAR_SQUARE.javaHolder) } else { fatalError("Enum value ZANABAZAR_SQUARE was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .HANIFI_ROHINGYA: if let HANIFI_ROHINGYA = classObj.HANIFI_ROHINGYA { - self = HANIFI_ROHINGYA + self.init(javaHolder: HANIFI_ROHINGYA.javaHolder) } else { fatalError("Enum value HANIFI_ROHINGYA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_SOGDIAN: if let OLD_SOGDIAN = classObj.OLD_SOGDIAN { - self = OLD_SOGDIAN + self.init(javaHolder: OLD_SOGDIAN.javaHolder) } else { fatalError("Enum value OLD_SOGDIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .SOGDIAN: if let SOGDIAN = classObj.SOGDIAN { - self = SOGDIAN + self.init(javaHolder: SOGDIAN.javaHolder) } else { fatalError("Enum value SOGDIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .DOGRA: if let DOGRA = classObj.DOGRA { - self = DOGRA + self.init(javaHolder: DOGRA.javaHolder) } else { fatalError("Enum value DOGRA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .GUNJALA_GONDI: if let GUNJALA_GONDI = classObj.GUNJALA_GONDI { - self = GUNJALA_GONDI + self.init(javaHolder: GUNJALA_GONDI.javaHolder) } else { fatalError("Enum value GUNJALA_GONDI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MAKASAR: if let MAKASAR = classObj.MAKASAR { - self = MAKASAR + self.init(javaHolder: MAKASAR.javaHolder) } else { fatalError("Enum value MAKASAR was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .MEDEFAIDRIN: if let MEDEFAIDRIN = classObj.MEDEFAIDRIN { - self = MEDEFAIDRIN + self.init(javaHolder: MEDEFAIDRIN.javaHolder) } else { fatalError("Enum value MEDEFAIDRIN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .ELYMAIC: if let ELYMAIC = classObj.ELYMAIC { - self = ELYMAIC + self.init(javaHolder: ELYMAIC.javaHolder) } else { fatalError("Enum value ELYMAIC was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NANDINAGARI: if let NANDINAGARI = classObj.NANDINAGARI { - self = NANDINAGARI + self.init(javaHolder: NANDINAGARI.javaHolder) } else { fatalError("Enum value NANDINAGARI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NYIAKENG_PUACHUE_HMONG: if let NYIAKENG_PUACHUE_HMONG = classObj.NYIAKENG_PUACHUE_HMONG { - self = NYIAKENG_PUACHUE_HMONG + self.init(javaHolder: NYIAKENG_PUACHUE_HMONG.javaHolder) } else { fatalError("Enum value NYIAKENG_PUACHUE_HMONG was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .WANCHO: if let WANCHO = classObj.WANCHO { - self = WANCHO + self.init(javaHolder: WANCHO.javaHolder) } else { fatalError("Enum value WANCHO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .YEZIDI: if let YEZIDI = classObj.YEZIDI { - self = YEZIDI + self.init(javaHolder: YEZIDI.javaHolder) } else { fatalError("Enum value YEZIDI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CHORASMIAN: if let CHORASMIAN = classObj.CHORASMIAN { - self = CHORASMIAN + self.init(javaHolder: CHORASMIAN.javaHolder) } else { fatalError("Enum value CHORASMIAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .DIVES_AKURU: if let DIVES_AKURU = classObj.DIVES_AKURU { - self = DIVES_AKURU + self.init(javaHolder: DIVES_AKURU.javaHolder) } else { fatalError("Enum value DIVES_AKURU was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KHITAN_SMALL_SCRIPT: if let KHITAN_SMALL_SCRIPT = classObj.KHITAN_SMALL_SCRIPT { - self = KHITAN_SMALL_SCRIPT + self.init(javaHolder: KHITAN_SMALL_SCRIPT.javaHolder) } else { fatalError("Enum value KHITAN_SMALL_SCRIPT was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .VITHKUQI: if let VITHKUQI = classObj.VITHKUQI { - self = VITHKUQI + self.init(javaHolder: VITHKUQI.javaHolder) } else { fatalError("Enum value VITHKUQI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .OLD_UYGHUR: if let OLD_UYGHUR = classObj.OLD_UYGHUR { - self = OLD_UYGHUR + self.init(javaHolder: OLD_UYGHUR.javaHolder) } else { fatalError("Enum value OLD_UYGHUR was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .CYPRO_MINOAN: if let CYPRO_MINOAN = classObj.CYPRO_MINOAN { - self = CYPRO_MINOAN + self.init(javaHolder: CYPRO_MINOAN.javaHolder) } else { fatalError("Enum value CYPRO_MINOAN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TANGSA: if let TANGSA = classObj.TANGSA { - self = TANGSA + self.init(javaHolder: TANGSA.javaHolder) } else { fatalError("Enum value TANGSA was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .TOTO: if let TOTO = classObj.TOTO { - self = TOTO + self.init(javaHolder: TOTO.javaHolder) } else { fatalError("Enum value TOTO was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .KAWI: if let KAWI = classObj.KAWI { - self = KAWI + self.init(javaHolder: KAWI.javaHolder) } else { fatalError("Enum value KAWI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .NAG_MUNDARI: if let NAG_MUNDARI = classObj.NAG_MUNDARI { - self = NAG_MUNDARI + self.init(javaHolder: NAG_MUNDARI.javaHolder) } else { fatalError("Enum value NAG_MUNDARI was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } case .UNKNOWN: if let UNKNOWN = classObj.UNKNOWN { - self = UNKNOWN + self.init(javaHolder: UNKNOWN.javaHolder) } else { fatalError("Enum value UNKNOWN was unexpectedly nil, please re-run Java2Swift on the most updated Java class") } } } - - @JavaMethod - public func name() -> String - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 - - @JavaMethod - public func ordinal() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws } } extension JavaCharacter.UnicodeScript { - @JavaClass("java.lang.Enum$EnumDesc", extends: JavaObject.self) - public struct EnumDesc { - @JavaMethod - public func toString() -> String - - @JavaMethod - public func constantName() -> String - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - + @JavaClass("java.lang.Enum$EnumDesc") + open class EnumDesc: JavaObject { @JavaMethod - public func wait() throws + open override func toString() -> String } } extension JavaClass { diff --git a/Sources/JavaKit/generated/JavaClass.swift b/Sources/JavaKit/generated/JavaClass.swift index a3d52d21..b66835aa 100644 --- a/Sources/JavaKit/generated/JavaClass.swift +++ b/Sources/JavaKit/generated/JavaClass.swift @@ -1,157 +1,133 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Class", extends: JavaObject.self) -public struct JavaClass { +@JavaClass("java.lang.Class") +open class JavaClass: JavaObject { @JavaMethod - public func getName() -> String + open func getName() -> String @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func isAssignableFrom(_ arg0: JavaClass?) -> Bool + open func isAssignableFrom(_ arg0: JavaClass?) -> Bool @JavaMethod - public func isInstance(_ arg0: JavaObject?) -> Bool + open func isInstance(_ arg0: JavaObject?) -> Bool @JavaMethod - public func getModifiers() -> Int32 + open func getModifiers() -> Int32 @JavaMethod - public func isInterface() -> Bool + open func isInterface() -> Bool @JavaMethod - public func isArray() -> Bool + open func isArray() -> Bool @JavaMethod - public func isPrimitive() -> Bool + open func isPrimitive() -> Bool @JavaMethod - public func isHidden() -> Bool + open func isHidden() -> Bool @JavaMethod - public func getSuperclass() -> JavaClass! + open func getSuperclass() -> JavaClass! @JavaMethod - public func cast(_ arg0: JavaObject?) -> JavaObject! + open func cast(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func componentType() -> JavaClass! + open func componentType() -> JavaClass! @JavaMethod - public func getComponentType() -> JavaClass! + open func getComponentType() -> JavaClass! @JavaMethod - public func isAnnotation() -> Bool + open func isAnnotation() -> Bool @JavaMethod - public func isEnum() -> Bool + open func isEnum() -> Bool @JavaMethod - public func isRecord() -> Bool + open func isRecord() -> Bool @JavaMethod - public func newInstance() throws -> JavaObject! + open func newInstance() throws -> JavaObject! @JavaMethod - public func getInterfaces() -> [JavaClass?] + open func getInterfaces() -> [JavaClass?] @JavaMethod - public func isMemberClass() -> Bool + open func isMemberClass() -> Bool @JavaMethod - public func isLocalClass() -> Bool + open func isLocalClass() -> Bool @JavaMethod - public func isAnonymousClass() -> Bool + open func isAnonymousClass() -> Bool @JavaMethod - public func getEnclosingClass() throws -> JavaClass! + open func getEnclosingClass() throws -> JavaClass! @JavaMethod - public func arrayType() -> JavaClass! + open func arrayType() -> JavaClass! @JavaMethod - public func getSimpleName() -> String + open func getSimpleName() -> String @JavaMethod - public func getCanonicalName() -> String + open func getCanonicalName() -> String @JavaMethod - public func getPackageName() -> String + open func getPackageName() -> String @JavaMethod - public func desiredAssertionStatus() -> Bool + open func desiredAssertionStatus() -> Bool @JavaMethod - public func getNestHost() -> JavaClass! + open func getNestHost() -> JavaClass! @JavaMethod - public func descriptorString() -> String + open func descriptorString() -> String @JavaMethod - public func getPermittedSubclasses() -> [JavaClass?] + open func getPermittedSubclasses() -> [JavaClass?] @JavaMethod - public func toGenericString() -> String + open func toGenericString() -> String @JavaMethod - public func isSynthetic() -> Bool + open func isSynthetic() -> Bool @JavaMethod - public func getSigners() -> [JavaObject?] + open func getSigners() -> [JavaObject?] @JavaMethod - public func getDeclaringClass() throws -> JavaClass! + open func getDeclaringClass() throws -> JavaClass! @JavaMethod - public func getTypeName() -> String + open func getTypeName() -> String @JavaMethod - public func getClasses() -> [JavaClass?] + open func getClasses() -> [JavaClass?] @JavaMethod - public func getDeclaredClasses() throws -> [JavaClass?] + open func getDeclaredClasses() throws -> [JavaClass?] @JavaMethod - public func getEnumConstants() -> [JavaObject?] + open func getEnumConstants() -> [JavaObject?] @JavaMethod - public func asSubclass(_ arg0: JavaClass?) -> JavaClass! + open func asSubclass(_ arg0: JavaClass?) -> JavaClass! @JavaMethod - public func isNestmateOf(_ arg0: JavaClass?) -> Bool + open func isNestmateOf(_ arg0: JavaClass?) -> Bool @JavaMethod - public func getNestMembers() -> [JavaClass?] + open func getNestMembers() -> [JavaClass?] @JavaMethod - public func isSealed() -> Bool - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func isSealed() -> Bool } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaDouble.swift b/Sources/JavaKit/generated/JavaDouble.swift index da2eb571..4eaa425e 100644 --- a/Sources/JavaKit/generated/JavaDouble.swift +++ b/Sources/JavaKit/generated/JavaDouble.swift @@ -1,70 +1,52 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Double", extends: JavaNumber.self) -public struct JavaDouble { +@JavaClass("java.lang.Double") +open class JavaDouble: JavaNumber { @JavaMethod - public init(_ arg0: Double, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Double, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func isInfinite() -> Bool + open func isInfinite() -> Bool @JavaMethod - public func compareTo(_ arg0: JavaDouble?) -> Int32 + open func compareTo(_ arg0: JavaDouble?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func byteValue() -> Int8 + open override func byteValue() -> Int8 @JavaMethod - public func shortValue() -> Int16 + open override func shortValue() -> Int16 @JavaMethod - public func intValue() -> Int32 + open override func intValue() -> Int32 @JavaMethod - public func longValue() -> Int64 + open override func longValue() -> Int64 @JavaMethod - public func floatValue() -> Float + open override func floatValue() -> Float @JavaMethod - public func doubleValue() -> Double + open override func doubleValue() -> Double @JavaMethod - public func isNaN() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func isNaN() -> Bool } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/JavaError.swift b/Sources/JavaKit/generated/JavaError.swift index 86398c9b..97c2e555 100644 --- a/Sources/JavaKit/generated/JavaError.swift +++ b/Sources/JavaKit/generated/JavaError.swift @@ -1,68 +1,17 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Error", extends: Throwable.self) -public struct JavaError { +@JavaClass("java.lang.Error") +open class JavaError: Throwable { @JavaMethod - public init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) - - @JavaMethod - public func printStackTrace() - - @JavaMethod - public func fillInStackTrace() -> Throwable! - - @JavaMethod - public func getCause() -> Throwable! - - @JavaMethod - public func initCause(_ arg0: Throwable?) -> Throwable! - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func getMessage() -> String - - @JavaMethod - public func getSuppressed() -> [Throwable?] - - @JavaMethod - public func getLocalizedMessage() -> String - - @JavaMethod - public func addSuppressed(_ arg0: Throwable?) - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) } diff --git a/Sources/JavaKit/generated/JavaFloat.swift b/Sources/JavaKit/generated/JavaFloat.swift index 4df63cbb..6ad0536e 100644 --- a/Sources/JavaKit/generated/JavaFloat.swift +++ b/Sources/JavaKit/generated/JavaFloat.swift @@ -1,73 +1,55 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Float", extends: JavaNumber.self) -public struct JavaFloat { +@JavaClass("java.lang.Float") +open class JavaFloat: JavaNumber { @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: Double, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Double, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: Float, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Float, environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func isInfinite() -> Bool + open func isInfinite() -> Bool @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaFloat?) -> Int32 + open func compareTo(_ arg0: JavaFloat?) -> Int32 @JavaMethod - public func byteValue() -> Int8 + open override func byteValue() -> Int8 @JavaMethod - public func shortValue() -> Int16 + open override func shortValue() -> Int16 @JavaMethod - public func intValue() -> Int32 + open override func intValue() -> Int32 @JavaMethod - public func longValue() -> Int64 + open override func longValue() -> Int64 @JavaMethod - public func floatValue() -> Float + open override func floatValue() -> Float @JavaMethod - public func doubleValue() -> Double + open override func doubleValue() -> Double @JavaMethod - public func isNaN() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func isNaN() -> Bool } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/JavaInteger.swift b/Sources/JavaKit/generated/JavaInteger.swift index 6e6a64fa..7aadd187 100644 --- a/Sources/JavaKit/generated/JavaInteger.swift +++ b/Sources/JavaKit/generated/JavaInteger.swift @@ -1,64 +1,46 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Integer", extends: JavaNumber.self) -public struct JavaInteger { +@JavaClass("java.lang.Integer") +open class JavaInteger: JavaNumber { @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaInteger?) -> Int32 + open func compareTo(_ arg0: JavaInteger?) -> Int32 @JavaMethod - public func byteValue() -> Int8 + open override func byteValue() -> Int8 @JavaMethod - public func shortValue() -> Int16 + open override func shortValue() -> Int16 @JavaMethod - public func intValue() -> Int32 + open override func intValue() -> Int32 @JavaMethod - public func longValue() -> Int64 + open override func longValue() -> Int64 @JavaMethod - public func floatValue() -> Float + open override func floatValue() -> Float @JavaMethod - public func doubleValue() -> Double - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open override func doubleValue() -> Double } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/JavaLong.swift b/Sources/JavaKit/generated/JavaLong.swift index fa02f070..4cbe97ba 100644 --- a/Sources/JavaKit/generated/JavaLong.swift +++ b/Sources/JavaKit/generated/JavaLong.swift @@ -1,64 +1,46 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Long", extends: JavaNumber.self) -public struct JavaLong { +@JavaClass("java.lang.Long") +open class JavaLong: JavaNumber { @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: Int64, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int64, environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaLong?) -> Int32 + open func compareTo(_ arg0: JavaLong?) -> Int32 @JavaMethod - public func byteValue() -> Int8 + open override func byteValue() -> Int8 @JavaMethod - public func shortValue() -> Int16 + open override func shortValue() -> Int16 @JavaMethod - public func intValue() -> Int32 + open override func intValue() -> Int32 @JavaMethod - public func longValue() -> Int64 + open override func longValue() -> Int64 @JavaMethod - public func floatValue() -> Float + open override func floatValue() -> Float @JavaMethod - public func doubleValue() -> Double - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open override func doubleValue() -> Double } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/JavaNumber.swift b/Sources/JavaKit/generated/JavaNumber.swift index acd461fe..414cd89b 100644 --- a/Sources/JavaKit/generated/JavaNumber.swift +++ b/Sources/JavaKit/generated/JavaNumber.swift @@ -1,53 +1,26 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Number", extends: JavaObject.self) -public struct JavaNumber { +@JavaClass("java.lang.Number") +open class JavaNumber: JavaObject { @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func byteValue() -> Int8 + open func byteValue() -> Int8 @JavaMethod - public func shortValue() -> Int16 + open func shortValue() -> Int16 @JavaMethod - public func intValue() -> Int32 + open func intValue() -> Int32 @JavaMethod - public func longValue() -> Int64 + open func longValue() -> Int64 @JavaMethod - public func floatValue() -> Float + open func floatValue() -> Float @JavaMethod - public func doubleValue() -> Double - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func doubleValue() -> Double } diff --git a/Sources/JavaKit/generated/JavaObject.swift b/Sources/JavaKit/generated/JavaObject.swift index 8e7a20fc..07a6eaff 100644 --- a/Sources/JavaKit/generated/JavaObject.swift +++ b/Sources/JavaKit/generated/JavaObject.swift @@ -2,34 +2,40 @@ import JavaRuntime @JavaClass("java.lang.Object") -public struct JavaObject { +open class JavaObject { @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open func finalize() throws @JavaMethod - public func toString() -> String + open func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func hashCode() -> Int32 + open func toString() -> String @JavaMethod - public func getClass() -> JavaClass! + open func hashCode() -> Int32 @JavaMethod - public func notify() + open func getClass() -> JavaClass! @JavaMethod - public func notifyAll() + open func clone() throws -> JavaObject! @JavaMethod - public func wait(_ arg0: Int64) throws + open func notify() @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws + open func notifyAll() @JavaMethod - public func wait() throws + open func wait(_ arg0: Int64) throws + + @JavaMethod + open func wait(_ arg0: Int64, _ arg1: Int32) throws + + @JavaMethod + open func wait() throws } diff --git a/Sources/JavaKit/generated/JavaShort.swift b/Sources/JavaKit/generated/JavaShort.swift index 58cb4e26..f425ae18 100644 --- a/Sources/JavaKit/generated/JavaShort.swift +++ b/Sources/JavaKit/generated/JavaShort.swift @@ -1,64 +1,46 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Short", extends: JavaNumber.self) -public struct JavaShort { +@JavaClass("java.lang.Short") +open class JavaShort: JavaNumber { @JavaMethod - public init(_ arg0: Int16, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int16, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaShort?) -> Int32 + open func compareTo(_ arg0: JavaShort?) -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func byteValue() -> Int8 + open override func byteValue() -> Int8 @JavaMethod - public func shortValue() -> Int16 + open override func shortValue() -> Int16 @JavaMethod - public func intValue() -> Int32 + open override func intValue() -> Int32 @JavaMethod - public func longValue() -> Int64 + open override func longValue() -> Int64 @JavaMethod - public func floatValue() -> Float + open override func floatValue() -> Float @JavaMethod - public func doubleValue() -> Double - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open override func doubleValue() -> Double } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/JavaString.swift b/Sources/JavaKit/generated/JavaString.swift index c062dc0d..adf1993d 100644 --- a/Sources/JavaKit/generated/JavaString.swift +++ b/Sources/JavaKit/generated/JavaString.swift @@ -1,229 +1,211 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.String", extends: JavaObject.self) -public struct JavaString { +@JavaClass("java.lang.String") +open class JavaString: JavaObject { @JavaMethod - public init(_ arg0: [Int8], _ arg1: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: [Int8], _ arg1: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: [Int8], environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [Int8], environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: [UInt16], environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [UInt16], environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32, _ arg3: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32, _ arg3: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: [Int8], _ arg1: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [Int8], _ arg1: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: [Int32], _ arg1: Int32, _ arg2: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [Int32], _ arg1: Int32, _ arg2: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func length() -> Int32 + open func length() -> Int32 @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func getChars(_ arg0: Int32, _ arg1: Int32, _ arg2: [UInt16], _ arg3: Int32) + open func getChars(_ arg0: Int32, _ arg1: Int32, _ arg2: [UInt16], _ arg3: Int32) @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func compareTo(_ arg0: String) -> Int32 + open func compareTo(_ arg0: String) -> Int32 @JavaMethod - public func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32 + open func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32 @JavaMethod - public func indexOf(_ arg0: String) -> Int32 + open func indexOf(_ arg0: String) -> Int32 @JavaMethod - public func indexOf(_ arg0: Int32) -> Int32 + open func indexOf(_ arg0: Int32) -> Int32 @JavaMethod - public func indexOf(_ arg0: Int32, _ arg1: Int32) -> Int32 + open func indexOf(_ arg0: Int32, _ arg1: Int32) -> Int32 @JavaMethod - public func indexOf(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32) -> Int32 + open func indexOf(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32) -> Int32 @JavaMethod - public func indexOf(_ arg0: String, _ arg1: Int32) -> Int32 + open func indexOf(_ arg0: String, _ arg1: Int32) -> Int32 @JavaMethod - public func charAt(_ arg0: Int32) -> UInt16 + open func charAt(_ arg0: Int32) -> UInt16 @JavaMethod - public func codePointAt(_ arg0: Int32) -> Int32 + open func codePointAt(_ arg0: Int32) -> Int32 @JavaMethod - public func codePointBefore(_ arg0: Int32) -> Int32 + open func codePointBefore(_ arg0: Int32) -> Int32 @JavaMethod - public func codePointCount(_ arg0: Int32, _ arg1: Int32) -> Int32 + open func codePointCount(_ arg0: Int32, _ arg1: Int32) -> Int32 @JavaMethod - public func offsetByCodePoints(_ arg0: Int32, _ arg1: Int32) -> Int32 + open func offsetByCodePoints(_ arg0: Int32, _ arg1: Int32) -> Int32 @JavaMethod - public func getBytes() -> [Int8] + open func getBytes() -> [Int8] @JavaMethod - public func getBytes(_ arg0: String) throws -> [Int8] + open func getBytes(_ arg0: String) throws -> [Int8] @JavaMethod - public func getBytes(_ arg0: Int32, _ arg1: Int32, _ arg2: [Int8], _ arg3: Int32) + open func getBytes(_ arg0: Int32, _ arg1: Int32, _ arg2: [Int8], _ arg3: Int32) @JavaMethod - public func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool + open func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool @JavaMethod - public func regionMatches(_ arg0: Int32, _ arg1: String, _ arg2: Int32, _ arg3: Int32) -> Bool + open func regionMatches(_ arg0: Int32, _ arg1: String, _ arg2: Int32, _ arg3: Int32) -> Bool @JavaMethod - public func startsWith(_ arg0: String) -> Bool + open func startsWith(_ arg0: String) -> Bool @JavaMethod - public func startsWith(_ arg0: String, _ arg1: Int32) -> Bool + open func startsWith(_ arg0: String, _ arg1: Int32) -> Bool @JavaMethod - public func lastIndexOf(_ arg0: String) -> Int32 + open func lastIndexOf(_ arg0: String) -> Int32 @JavaMethod - public func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32 + open func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32 @JavaMethod - public func lastIndexOf(_ arg0: String, _ arg1: Int32) -> Int32 + open func lastIndexOf(_ arg0: String, _ arg1: Int32) -> Int32 @JavaMethod - public func lastIndexOf(_ arg0: Int32) -> Int32 + open func lastIndexOf(_ arg0: Int32) -> Int32 @JavaMethod - public func substring(_ arg0: Int32) -> String + open func substring(_ arg0: Int32) -> String @JavaMethod - public func substring(_ arg0: Int32, _ arg1: Int32) -> String + open func substring(_ arg0: Int32, _ arg1: Int32) -> String @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func replace(_ arg0: UInt16, _ arg1: UInt16) -> String + open func replace(_ arg0: UInt16, _ arg1: UInt16) -> String @JavaMethod - public func matches(_ arg0: String) -> Bool + open func matches(_ arg0: String) -> Bool @JavaMethod - public func replaceFirst(_ arg0: String, _ arg1: String) -> String + open func replaceFirst(_ arg0: String, _ arg1: String) -> String @JavaMethod - public func replaceAll(_ arg0: String, _ arg1: String) -> String + open func replaceAll(_ arg0: String, _ arg1: String) -> String @JavaMethod - public func split(_ arg0: String) -> [String] + open func split(_ arg0: String) -> [String] @JavaMethod - public func split(_ arg0: String, _ arg1: Int32) -> [String] + open func split(_ arg0: String, _ arg1: Int32) -> [String] @JavaMethod - public func splitWithDelimiters(_ arg0: String, _ arg1: Int32) -> [String] + open func splitWithDelimiters(_ arg0: String, _ arg1: Int32) -> [String] @JavaMethod - public func toLowerCase() -> String + open func toLowerCase() -> String @JavaMethod - public func toUpperCase() -> String + open func toUpperCase() -> String @JavaMethod - public func trim() -> String + open func trim() -> String @JavaMethod - public func strip() -> String + open func strip() -> String @JavaMethod - public func stripLeading() -> String + open func stripLeading() -> String @JavaMethod - public func stripTrailing() -> String + open func stripTrailing() -> String @JavaMethod - public func `repeat`(_ arg0: Int32) -> String + open func `repeat`(_ arg0: Int32) -> String @JavaMethod - public func isBlank() -> Bool + open func isBlank() -> Bool @JavaMethod - public func toCharArray() -> [UInt16] + open func toCharArray() -> [UInt16] @JavaMethod - public func equalsIgnoreCase(_ arg0: String) -> Bool + open func equalsIgnoreCase(_ arg0: String) -> Bool @JavaMethod - public func compareToIgnoreCase(_ arg0: String) -> Int32 + open func compareToIgnoreCase(_ arg0: String) -> Int32 @JavaMethod - public func endsWith(_ arg0: String) -> Bool + open func endsWith(_ arg0: String) -> Bool @JavaMethod - public func concat(_ arg0: String) -> String + open func concat(_ arg0: String) -> String @JavaMethod - public func indent(_ arg0: Int32) -> String + open func indent(_ arg0: Int32) -> String @JavaMethod - public func stripIndent() -> String + open func stripIndent() -> String @JavaMethod - public func translateEscapes() -> String + open func translateEscapes() -> String @JavaMethod - public func formatted(_ arg0: [JavaObject?]) -> String + open func formatted(_ arg0: [JavaObject?]) -> String @JavaMethod - public func intern() -> String - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func intern() -> String } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKit/generated/JavaVoid.swift b/Sources/JavaKit/generated/JavaVoid.swift index f9a21828..76a7334a 100644 --- a/Sources/JavaKit/generated/JavaVoid.swift +++ b/Sources/JavaKit/generated/JavaVoid.swift @@ -1,34 +1,9 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Void", extends: JavaObject.self) -public struct JavaVoid { - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool +@JavaClass("java.lang.Void") +open class JavaVoid: JavaObject { - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKit/generated/RuntimeException.swift b/Sources/JavaKit/generated/RuntimeException.swift index 6ef0988f..c3e32506 100644 --- a/Sources/JavaKit/generated/RuntimeException.swift +++ b/Sources/JavaKit/generated/RuntimeException.swift @@ -1,68 +1,17 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.RuntimeException", extends: Exception.self) -public struct RuntimeException { +@JavaClass("java.lang.RuntimeException") +open class RuntimeException: Exception { @JavaMethod - public init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) - - @JavaMethod - public func printStackTrace() - - @JavaMethod - public func fillInStackTrace() -> Throwable! - - @JavaMethod - public func getCause() -> Throwable! - - @JavaMethod - public func initCause(_ arg0: Throwable?) -> Throwable! - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func getMessage() -> String - - @JavaMethod - public func getSuppressed() -> [Throwable?] - - @JavaMethod - public func getLocalizedMessage() -> String - - @JavaMethod - public func addSuppressed(_ arg0: Throwable?) - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) } diff --git a/Sources/JavaKit/generated/Throwable.swift b/Sources/JavaKit/generated/Throwable.swift index 171835d8..574fedf5 100644 --- a/Sources/JavaKit/generated/Throwable.swift +++ b/Sources/JavaKit/generated/Throwable.swift @@ -1,68 +1,44 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaRuntime -@JavaClass("java.lang.Throwable", extends: JavaObject.self) -public struct Throwable { +@JavaClass("java.lang.Throwable") +open class Throwable: JavaObject { @JavaMethod - public init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, _ arg1: Throwable?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func printStackTrace() + open func printStackTrace() @JavaMethod - public func fillInStackTrace() -> Throwable! + open func fillInStackTrace() -> Throwable! @JavaMethod - public func getCause() -> Throwable! + open func getCause() -> Throwable! @JavaMethod - public func initCause(_ arg0: Throwable?) -> Throwable! + open func initCause(_ arg0: Throwable?) -> Throwable! @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func getMessage() -> String + open func getMessage() -> String @JavaMethod - public func getSuppressed() -> [Throwable?] + open func getSuppressed() -> [Throwable?] @JavaMethod - public func getLocalizedMessage() -> String + open func getLocalizedMessage() -> String @JavaMethod - public func addSuppressed(_ arg0: Throwable?) - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func addSuppressed(_ arg0: Throwable?) } diff --git a/Sources/JavaKitCollection/generated/ArrayDeque.swift b/Sources/JavaKitCollection/generated/ArrayDeque.swift index d0a1134a..79a1e20b 100644 --- a/Sources/JavaKitCollection/generated/ArrayDeque.swift +++ b/Sources/JavaKitCollection/generated/ArrayDeque.swift @@ -2,149 +2,119 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.ArrayDeque", extends: JavaObject.self) -public struct ArrayDeque { +@JavaClass("java.util.ArrayDeque") +open class ArrayDeque: JavaObject { @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) @JavaMethod - public func remove() -> JavaObject! + open func remove() -> JavaObject! @JavaMethod - public func remove(_ arg0: JavaObject?) -> Bool + open func remove(_ arg0: JavaObject?) -> Bool @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func clone() -> ArrayDeque! + open override func clone() -> ArrayDeque! @JavaMethod - public func clear() + open func clear() @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func add(_ arg0: JavaObject?) -> Bool + open func add(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] + open func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] @JavaMethod - public func toArray() -> [JavaObject?] + open func toArray() -> [JavaObject?] @JavaMethod - public func iterator() -> JavaIterator! + open func iterator() -> JavaIterator! @JavaMethod - public func contains(_ arg0: JavaObject?) -> Bool + open func contains(_ arg0: JavaObject?) -> Bool @JavaMethod - public func addAll(_ arg0: JavaCollection?) -> Bool + open func addAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func peek() -> JavaObject! + open func peek() -> JavaObject! @JavaMethod - public func getFirst() -> JavaObject! + open func getFirst() -> JavaObject! @JavaMethod - public func getLast() -> JavaObject! + open func getLast() -> JavaObject! @JavaMethod - public func element() -> JavaObject! + open func element() -> JavaObject! @JavaMethod - public func addFirst(_ arg0: JavaObject?) + open func addFirst(_ arg0: JavaObject?) @JavaMethod - public func addLast(_ arg0: JavaObject?) + open func addLast(_ arg0: JavaObject?) @JavaMethod - public func removeFirst() -> JavaObject! + open func removeFirst() -> JavaObject! @JavaMethod - public func removeLast() -> JavaObject! + open func removeLast() -> JavaObject! @JavaMethod - public func removeAll(_ arg0: JavaCollection?) -> Bool + open func removeAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func retainAll(_ arg0: JavaCollection?) -> Bool + open func retainAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func poll() -> JavaObject! + open func poll() -> JavaObject! @JavaMethod - public func push(_ arg0: JavaObject?) + open func push(_ arg0: JavaObject?) @JavaMethod - public func pop() -> JavaObject! + open func pop() -> JavaObject! @JavaMethod - public func pollFirst() -> JavaObject! + open func pollFirst() -> JavaObject! @JavaMethod - public func pollLast() -> JavaObject! + open func pollLast() -> JavaObject! @JavaMethod - public func offerLast(_ arg0: JavaObject?) -> Bool + open func offerLast(_ arg0: JavaObject?) -> Bool @JavaMethod - public func peekFirst() -> JavaObject! + open func peekFirst() -> JavaObject! @JavaMethod - public func removeFirstOccurrence(_ arg0: JavaObject?) -> Bool + open func removeFirstOccurrence(_ arg0: JavaObject?) -> Bool @JavaMethod - public func offerFirst(_ arg0: JavaObject?) -> Bool + open func offerFirst(_ arg0: JavaObject?) -> Bool @JavaMethod - public func peekLast() -> JavaObject! + open func peekLast() -> JavaObject! @JavaMethod - public func removeLastOccurrence(_ arg0: JavaObject?) -> Bool + open func removeLastOccurrence(_ arg0: JavaObject?) -> Bool @JavaMethod - public func offer(_ arg0: JavaObject?) -> Bool + open func offer(_ arg0: JavaObject?) -> Bool @JavaMethod - public func descendingIterator() -> JavaIterator! - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func containsAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func descendingIterator() -> JavaIterator! } diff --git a/Sources/JavaKitCollection/generated/ArrayList.swift b/Sources/JavaKitCollection/generated/ArrayList.swift index 7074b693..6748640b 100644 --- a/Sources/JavaKitCollection/generated/ArrayList.swift +++ b/Sources/JavaKitCollection/generated/ArrayList.swift @@ -2,140 +2,116 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.ArrayList", extends: JavaObject.self, implements: List.self, RandomAccess.self) -public struct ArrayList { +@JavaClass("java.util.ArrayList", implements: List.self, RandomAccess.self) +open class ArrayList: JavaObject { @JavaMethod - public init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> Bool + open func remove(_ arg0: JavaObject?) -> Bool @JavaMethod - public func remove(_ arg0: Int32) -> JavaObject! + open func remove(_ arg0: Int32) -> JavaObject! @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func get(_ arg0: Int32) -> JavaObject! + open func get(_ arg0: Int32) -> JavaObject! @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func indexOf(_ arg0: JavaObject?) -> Int32 + open func indexOf(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func clear() + open func clear() @JavaMethod - public func lastIndexOf(_ arg0: JavaObject?) -> Int32 + open func lastIndexOf(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func add(_ arg0: JavaObject?) -> Bool + open func add(_ arg0: JavaObject?) -> Bool @JavaMethod - public func add(_ arg0: Int32, _ arg1: JavaObject?) + open func add(_ arg0: Int32, _ arg1: JavaObject?) @JavaMethod - public func subList(_ arg0: Int32, _ arg1: Int32) -> List! + open func subList(_ arg0: Int32, _ arg1: Int32) -> List! @JavaMethod - public func toArray() -> [JavaObject?] + open func toArray() -> [JavaObject?] @JavaMethod - public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] + open func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] @JavaMethod - public func iterator() -> JavaIterator! + open func iterator() -> JavaIterator! @JavaMethod - public func contains(_ arg0: JavaObject?) -> Bool + open func contains(_ arg0: JavaObject?) -> Bool @JavaMethod - public func addAll(_ arg0: Int32, _ arg1: JavaCollection?) -> Bool + open func addAll(_ arg0: Int32, _ arg1: JavaCollection?) -> Bool @JavaMethod - public func addAll(_ arg0: JavaCollection?) -> Bool + open func addAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func set(_ arg0: Int32, _ arg1: JavaObject?) -> JavaObject! + open func set(_ arg0: Int32, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func ensureCapacity(_ arg0: Int32) + open func ensureCapacity(_ arg0: Int32) @JavaMethod - public func trimToSize() + open func trimToSize() @JavaMethod - public func getFirst() -> JavaObject! + open func getFirst() -> JavaObject! @JavaMethod - public func getLast() -> JavaObject! + open func getLast() -> JavaObject! @JavaMethod - public func addFirst(_ arg0: JavaObject?) + open func addFirst(_ arg0: JavaObject?) @JavaMethod - public func addLast(_ arg0: JavaObject?) + open func addLast(_ arg0: JavaObject?) @JavaMethod - public func removeFirst() -> JavaObject! + open func removeFirst() -> JavaObject! @JavaMethod - public func removeLast() -> JavaObject! + open func removeLast() -> JavaObject! @JavaMethod - public func removeAll(_ arg0: JavaCollection?) -> Bool + open func removeRange(_ arg0: Int32, _ arg1: Int32) @JavaMethod - public func retainAll(_ arg0: JavaCollection?) -> Bool + open func removeAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func listIterator(_ arg0: Int32) -> ListIterator! + open func retainAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func listIterator() -> ListIterator! + open func listIterator(_ arg0: Int32) -> ListIterator! @JavaMethod - public func toString() -> String - - @JavaMethod - public func containsAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws - - @JavaMethod - public func reversed() -> List! + open func listIterator() -> ListIterator! } diff --git a/Sources/JavaKitCollection/generated/BitSet.swift b/Sources/JavaKitCollection/generated/BitSet.swift index d00f539d..c7e54b95 100644 --- a/Sources/JavaKitCollection/generated/BitSet.swift +++ b/Sources/JavaKitCollection/generated/BitSet.swift @@ -2,121 +2,103 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.BitSet", extends: JavaObject.self) -public struct BitSet { +@JavaClass("java.util.BitSet") +open class BitSet: JavaObject { @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public func cardinality() -> Int32 + open func cardinality() -> Int32 @JavaMethod - public func nextSetBit(_ arg0: Int32) -> Int32 + open func nextSetBit(_ arg0: Int32) -> Int32 @JavaMethod - public func toLongArray() -> [Int64] + open func toLongArray() -> [Int64] @JavaMethod - public func previousSetBit(_ arg0: Int32) -> Int32 + open func previousSetBit(_ arg0: Int32) -> Int32 @JavaMethod - public func previousClearBit(_ arg0: Int32) -> Int32 + open func previousClearBit(_ arg0: Int32) -> Int32 @JavaMethod - public func intersects(_ arg0: BitSet?) -> Bool + open func intersects(_ arg0: BitSet?) -> Bool @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func get(_ arg0: Int32, _ arg1: Int32) -> BitSet! + open func get(_ arg0: Int32, _ arg1: Int32) -> BitSet! @JavaMethod - public func get(_ arg0: Int32) -> Bool + open func get(_ arg0: Int32) -> Bool @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func length() -> Int32 + open func length() -> Int32 @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func clear(_ arg0: Int32) + open func clear(_ arg0: Int32) @JavaMethod - public func clear(_ arg0: Int32, _ arg1: Int32) + open func clear(_ arg0: Int32, _ arg1: Int32) @JavaMethod - public func clear() + open func clear() @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func set(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool) + open func set(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool) @JavaMethod - public func set(_ arg0: Int32, _ arg1: Int32) + open func set(_ arg0: Int32, _ arg1: Int32) @JavaMethod - public func set(_ arg0: Int32) + open func set(_ arg0: Int32) @JavaMethod - public func set(_ arg0: Int32, _ arg1: Bool) + open func set(_ arg0: Int32, _ arg1: Bool) @JavaMethod - public func flip(_ arg0: Int32, _ arg1: Int32) + open func flip(_ arg0: Int32, _ arg1: Int32) @JavaMethod - public func flip(_ arg0: Int32) + open func flip(_ arg0: Int32) @JavaMethod - public func nextClearBit(_ arg0: Int32) -> Int32 + open func nextClearBit(_ arg0: Int32) -> Int32 @JavaMethod - public func or(_ arg0: BitSet?) + open func or(_ arg0: BitSet?) @JavaMethod - public func toByteArray() -> [Int8] + open func toByteArray() -> [Int8] @JavaMethod - public func and(_ arg0: BitSet?) + open func and(_ arg0: BitSet?) @JavaMethod - public func xor(_ arg0: BitSet?) + open func xor(_ arg0: BitSet?) @JavaMethod - public func andNot(_ arg0: BitSet?) - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func andNot(_ arg0: BitSet?) } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKitCollection/generated/HashMap.swift b/Sources/JavaKitCollection/generated/HashMap.swift index 9f800c63..424dfbb9 100644 --- a/Sources/JavaKitCollection/generated/HashMap.swift +++ b/Sources/JavaKitCollection/generated/HashMap.swift @@ -2,91 +2,64 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.HashMap", extends: JavaObject.self) -public struct HashMap { +@JavaClass("java.util.HashMap") +open class HashMap: JavaObject { @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: Int32, _ arg1: Float, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, _ arg1: Float, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> JavaObject! + open func remove(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func remove(_ arg0: JavaObject?, _ arg1: JavaObject?) -> Bool + open func remove(_ arg0: JavaObject?, _ arg1: JavaObject?) -> Bool @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func get(_ arg0: JavaObject?) -> JavaObject! + open func get(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func values() -> JavaCollection! + open func values() -> JavaCollection! @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func clear() + open func clear() @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func replace(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func replace(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func replace(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> Bool + open func replace(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> Bool @JavaMethod - public func putIfAbsent(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func putIfAbsent(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func containsKey(_ arg0: JavaObject?) -> Bool + open func containsKey(_ arg0: JavaObject?) -> Bool @JavaMethod - public func keySet() -> JavaSet! + open func keySet() -> JavaSet! @JavaMethod - public func containsValue(_ arg0: JavaObject?) -> Bool + open func containsValue(_ arg0: JavaObject?) -> Bool @JavaMethod - public func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKitCollection/generated/HashSet.swift b/Sources/JavaKitCollection/generated/HashSet.swift index ab2da187..97b15dff 100644 --- a/Sources/JavaKitCollection/generated/HashSet.swift +++ b/Sources/JavaKitCollection/generated/HashSet.swift @@ -2,88 +2,49 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.HashSet", extends: JavaObject.self, implements: JavaSet.self) -public struct HashSet { +@JavaClass("java.util.HashSet", implements: JavaSet.self) +open class HashSet: JavaObject { @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: Int32, _ arg1: Float, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, _ arg1: Float, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> Bool + open func remove(_ arg0: JavaObject?) -> Bool @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func clear() + open func clear() @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func add(_ arg0: JavaObject?) -> Bool + open func add(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] + open func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] @JavaMethod - public func toArray() -> [JavaObject?] + open func toArray() -> [JavaObject?] @JavaMethod - public func iterator() -> JavaIterator! + open func iterator() -> JavaIterator! @JavaMethod - public func contains(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func removeAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func addAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func retainAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func containsAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func contains(_ arg0: JavaObject?) -> Bool } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKitCollection/generated/JavaDictionary.swift b/Sources/JavaKitCollection/generated/JavaDictionary.swift index df1bdc87..43ded915 100644 --- a/Sources/JavaKitCollection/generated/JavaDictionary.swift +++ b/Sources/JavaKitCollection/generated/JavaDictionary.swift @@ -2,56 +2,29 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.Dictionary", extends: JavaObject.self) -public struct JavaDictionary { +@JavaClass("java.util.Dictionary") +open class JavaDictionary: JavaObject { @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> JavaObject! + open func remove(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func get(_ arg0: JavaObject?) -> JavaObject! + open func get(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func elements() -> Enumeration! + open func elements() -> Enumeration! @JavaMethod - public func keys() -> Enumeration! - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func keys() -> Enumeration! } diff --git a/Sources/JavaKitCollection/generated/PriorityQueue.swift b/Sources/JavaKitCollection/generated/PriorityQueue.swift index 5704db8a..14e50f31 100644 --- a/Sources/JavaKitCollection/generated/PriorityQueue.swift +++ b/Sources/JavaKitCollection/generated/PriorityQueue.swift @@ -2,98 +2,56 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.PriorityQueue", extends: JavaObject.self) -public struct PriorityQueue { +@JavaClass("java.util.PriorityQueue") +open class PriorityQueue: JavaObject { @JavaMethod - public init(_ arg0: PriorityQueue?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: PriorityQueue?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> Bool + open func remove(_ arg0: JavaObject?) -> Bool @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func clear() + open func clear() @JavaMethod - public func add(_ arg0: JavaObject?) -> Bool + open func add(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] + open func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] @JavaMethod - public func toArray() -> [JavaObject?] + open func toArray() -> [JavaObject?] @JavaMethod - public func iterator() -> JavaIterator! + open func iterator() -> JavaIterator! @JavaMethod - public func contains(_ arg0: JavaObject?) -> Bool + open func contains(_ arg0: JavaObject?) -> Bool @JavaMethod - public func peek() -> JavaObject! + open func peek() -> JavaObject! @JavaMethod - public func removeAll(_ arg0: JavaCollection?) -> Bool + open func removeAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func retainAll(_ arg0: JavaCollection?) -> Bool + open func retainAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func poll() -> JavaObject! + open func poll() -> JavaObject! @JavaMethod - public func offer(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func remove() -> JavaObject! - - @JavaMethod - public func addAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func element() -> JavaObject! - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func isEmpty() -> Bool - - @JavaMethod - public func containsAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func offer(_ arg0: JavaObject?) -> Bool } diff --git a/Sources/JavaKitCollection/generated/Stack.swift b/Sources/JavaKitCollection/generated/Stack.swift index e79e7e07..867e9d44 100644 --- a/Sources/JavaKitCollection/generated/Stack.swift +++ b/Sources/JavaKitCollection/generated/Stack.swift @@ -2,194 +2,23 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.Stack", extends: JavaObject.self) -public struct Stack { +@JavaClass("java.util.Stack") +open class Stack: JavaObject { @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func empty() -> Bool + open func empty() -> Bool @JavaMethod - public func peek() -> JavaObject! + open func peek() -> JavaObject! @JavaMethod - public func search(_ arg0: JavaObject?) -> Int32 + open func search(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func push(_ arg0: JavaObject?) -> JavaObject! + open func push(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func pop() -> JavaObject! - - @JavaMethod - public func addElement(_ arg0: JavaObject?) - - @JavaMethod - public func removeElementAt(_ arg0: Int32) - - @JavaMethod - public func removeElement(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func insertElementAt(_ arg0: JavaObject?, _ arg1: Int32) - - @JavaMethod - public func removeAllElements() - - @JavaMethod - public func firstElement() -> JavaObject! - - @JavaMethod - public func lastElement() -> JavaObject! - - @JavaMethod - public func setElementAt(_ arg0: JavaObject?, _ arg1: Int32) - - @JavaMethod - public func remove(_ arg0: Int32) -> JavaObject! - - @JavaMethod - public func remove(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func size() -> Int32 - - @JavaMethod - public func get(_ arg0: Int32) -> JavaObject! - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func clone() -> JavaObject! - - @JavaMethod - public func indexOf(_ arg0: JavaObject?, _ arg1: Int32) -> Int32 - - @JavaMethod - public func indexOf(_ arg0: JavaObject?) -> Int32 - - @JavaMethod - public func clear() - - @JavaMethod - public func lastIndexOf(_ arg0: JavaObject?, _ arg1: Int32) -> Int32 - - @JavaMethod - public func lastIndexOf(_ arg0: JavaObject?) -> Int32 - - @JavaMethod - public func isEmpty() -> Bool - - @JavaMethod - public func add(_ arg0: Int32, _ arg1: JavaObject?) - - @JavaMethod - public func add(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func subList(_ arg0: Int32, _ arg1: Int32) -> List! - - @JavaMethod - public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] - - @JavaMethod - public func toArray() -> [JavaObject?] - - @JavaMethod - public func iterator() -> JavaIterator! - - @JavaMethod - public func contains(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func elements() -> Enumeration! - - @JavaMethod - public func addAll(_ arg0: Int32, _ arg1: JavaCollection?) -> Bool - - @JavaMethod - public func addAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func set(_ arg0: Int32, _ arg1: JavaObject?) -> JavaObject! - - @JavaMethod - public func capacity() -> Int32 - - @JavaMethod - public func ensureCapacity(_ arg0: Int32) - - @JavaMethod - public func trimToSize() - - @JavaMethod - public func elementAt(_ arg0: Int32) -> JavaObject! - - @JavaMethod - public func removeAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func retainAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func listIterator() -> ListIterator! - - @JavaMethod - public func listIterator(_ arg0: Int32) -> ListIterator! - - @JavaMethod - public func containsAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func setSize(_ arg0: Int32) - - @JavaMethod - public func copyInto(_ arg0: [JavaObject?]) - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws - - @JavaMethod - public func getFirst() -> JavaObject! - - @JavaMethod - public func getLast() -> JavaObject! - - @JavaMethod - public func addFirst(_ arg0: JavaObject?) - - @JavaMethod - public func addLast(_ arg0: JavaObject?) - - @JavaMethod - public func removeFirst() -> JavaObject! - - @JavaMethod - public func removeLast() -> JavaObject! - - @JavaMethod - public func reversed() -> List! + open func pop() -> JavaObject! } diff --git a/Sources/JavaKitCollection/generated/TreeMap.swift b/Sources/JavaKitCollection/generated/TreeMap.swift index 3d7d858a..7796d555 100644 --- a/Sources/JavaKitCollection/generated/TreeMap.swift +++ b/Sources/JavaKitCollection/generated/TreeMap.swift @@ -2,193 +2,121 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.TreeMap", extends: JavaObject.self) -public struct TreeMap { +@JavaClass("java.util.TreeMap") +open class TreeMap: JavaObject { @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> JavaObject! + open func remove(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func get(_ arg0: JavaObject?) -> JavaObject! + open func get(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func values() -> JavaCollection! + open func values() -> JavaCollection! @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func clear() + open func clear() @JavaMethod - public func replace(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> Bool + open func replace(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> Bool @JavaMethod - public func replace(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func replace(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func putIfAbsent(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func putIfAbsent(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func containsKey(_ arg0: JavaObject?) -> Bool + open func containsKey(_ arg0: JavaObject?) -> Bool @JavaMethod - public func keySet() -> JavaSet! + open func keySet() -> JavaSet! @JavaMethod - public func containsValue(_ arg0: JavaObject?) -> Bool + open func containsValue(_ arg0: JavaObject?) -> Bool @JavaMethod - public func firstKey() -> JavaObject! + open func firstKey() -> JavaObject! @JavaMethod - public func putFirst(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func putFirst(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func putLast(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func putLast(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func lowerKey(_ arg0: JavaObject?) -> JavaObject! + open func lowerKey(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func floorKey(_ arg0: JavaObject?) -> JavaObject! + open func floorKey(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func ceilingKey(_ arg0: JavaObject?) -> JavaObject! + open func ceilingKey(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func higherKey(_ arg0: JavaObject?) -> JavaObject! + open func higherKey(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func lastKey() -> JavaObject! - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func isEmpty() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws - - @JavaMethod - public func remove(_ arg0: JavaObject?, _ arg1: JavaObject?) -> Bool - - @JavaMethod - public func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func lastKey() -> JavaObject! } extension TreeMap { - @JavaClass("java.util.AbstractMap$SimpleEntry", extends: JavaObject.self) - public struct SimpleEntry { + @JavaClass("java.util.AbstractMap$SimpleEntry") + open class SimpleEntry: JavaObject { @JavaMethod - public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func getValue() -> JavaObject! + open func getValue() -> JavaObject! @JavaMethod - public func getKey() -> JavaObject! + open func getKey() -> JavaObject! @JavaMethod - public func setValue(_ arg0: JavaObject?) -> JavaObject! - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func setValue(_ arg0: JavaObject?) -> JavaObject! } } extension TreeMap { - @JavaClass("java.util.AbstractMap$SimpleImmutableEntry", extends: JavaObject.self) - public struct SimpleImmutableEntry { - @JavaMethod - public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getValue() -> JavaObject! - - @JavaMethod - public func getKey() -> JavaObject! - + @JavaClass("java.util.AbstractMap$SimpleImmutableEntry") + open class SimpleImmutableEntry: JavaObject { @JavaMethod - public func setValue(_ arg0: JavaObject?) -> JavaObject! + @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) @JavaMethod - public func getClass() -> JavaClass! + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func notify() + open override func toString() -> String @JavaMethod - public func notifyAll() + open override func hashCode() -> Int32 @JavaMethod - public func wait(_ arg0: Int64) throws + open func getValue() -> JavaObject! @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws + open func getKey() -> JavaObject! @JavaMethod - public func wait() throws + open func setValue(_ arg0: JavaObject?) -> JavaObject! } } diff --git a/Sources/JavaKitCollection/generated/TreeSet.swift b/Sources/JavaKitCollection/generated/TreeSet.swift index e78d6ada..7e1807ab 100644 --- a/Sources/JavaKitCollection/generated/TreeSet.swift +++ b/Sources/JavaKitCollection/generated/TreeSet.swift @@ -2,125 +2,71 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.TreeSet", extends: JavaObject.self) -public struct TreeSet { +@JavaClass("java.util.TreeSet") +open class TreeSet: JavaObject { @JavaMethod - public init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: JavaCollection?, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> Bool + open func remove(_ arg0: JavaObject?) -> Bool @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func floor(_ arg0: JavaObject?) -> JavaObject! + open func floor(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func clear() + open func clear() @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func add(_ arg0: JavaObject?) -> Bool + open func add(_ arg0: JavaObject?) -> Bool @JavaMethod - public func iterator() -> JavaIterator! + open func iterator() -> JavaIterator! @JavaMethod - public func contains(_ arg0: JavaObject?) -> Bool + open func contains(_ arg0: JavaObject?) -> Bool @JavaMethod - public func last() -> JavaObject! + open func last() -> JavaObject! @JavaMethod - public func addAll(_ arg0: JavaCollection?) -> Bool + open func addAll(_ arg0: JavaCollection?) -> Bool @JavaMethod - public func first() -> JavaObject! + open func first() -> JavaObject! @JavaMethod - public func addFirst(_ arg0: JavaObject?) + open func addFirst(_ arg0: JavaObject?) @JavaMethod - public func addLast(_ arg0: JavaObject?) + open func addLast(_ arg0: JavaObject?) @JavaMethod - public func lower(_ arg0: JavaObject?) -> JavaObject! + open func lower(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func pollFirst() -> JavaObject! + open func pollFirst() -> JavaObject! @JavaMethod - public func pollLast() -> JavaObject! + open func pollLast() -> JavaObject! @JavaMethod - public func descendingIterator() -> JavaIterator! + open func descendingIterator() -> JavaIterator! @JavaMethod - public func ceiling(_ arg0: JavaObject?) -> JavaObject! + open func ceiling(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func higher(_ arg0: JavaObject?) -> JavaObject! - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func removeAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?] - - @JavaMethod - public func toArray() -> [JavaObject?] - - @JavaMethod - public func retainAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func containsAll(_ arg0: JavaCollection?) -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws - - @JavaMethod - public func removeFirst() -> JavaObject! - - @JavaMethod - public func removeLast() -> JavaObject! - - @JavaMethod - public func getFirst() -> JavaObject! - - @JavaMethod - public func getLast() -> JavaObject! + open func higher(_ arg0: JavaObject?) -> JavaObject! } diff --git a/Sources/JavaKitJar/generated/Attributes.swift b/Sources/JavaKitJar/generated/Attributes.swift index 1ecde6f7..f173c98d 100644 --- a/Sources/JavaKitJar/generated/Attributes.swift +++ b/Sources/JavaKitJar/generated/Attributes.swift @@ -3,133 +3,79 @@ import JavaKit import JavaKitCollection import JavaRuntime -@JavaClass("java.util.jar.Attributes", extends: JavaObject.self) -public struct Attributes { +@JavaClass("java.util.jar.Attributes") +open class Attributes: JavaObject { @JavaMethod - public init(_ arg0: Attributes?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Attributes?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: Int32, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func remove(_ arg0: JavaObject?) -> JavaObject! + open func remove(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func size() -> Int32 + open func size() -> Int32 @JavaMethod - public func get(_ arg0: JavaObject?) -> JavaObject! + open func get(_ arg0: JavaObject?) -> JavaObject! @JavaMethod - public func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func put(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func values() -> JavaCollection! + open func values() -> JavaCollection! @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func clear() + open func clear() @JavaMethod - public func getValue(_ arg0: String) -> String + open func getValue(_ arg0: String) -> String @JavaMethod - public func getValue(_ arg0: Attributes.Name?) -> String + open func getValue(_ arg0: Attributes.Name?) -> String @JavaMethod - public func isEmpty() -> Bool + open func isEmpty() -> Bool @JavaMethod - public func containsKey(_ arg0: JavaObject?) -> Bool + open func containsKey(_ arg0: JavaObject?) -> Bool @JavaMethod - public func keySet() -> JavaSet! + open func keySet() -> JavaSet! @JavaMethod - public func containsValue(_ arg0: JavaObject?) -> Bool + open func containsValue(_ arg0: JavaObject?) -> Bool @JavaMethod - public func putValue(_ arg0: String, _ arg1: String) -> String - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws - - @JavaMethod - public func remove(_ arg0: JavaObject?, _ arg1: JavaObject?) -> Bool - - @JavaMethod - public func replace(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> Bool - - @JavaMethod - public func replace(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! - - @JavaMethod - public func putIfAbsent(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! - - @JavaMethod - public func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! + open func putValue(_ arg0: String, _ arg1: String) -> String } extension Attributes { - @JavaClass("java.util.jar.Attributes$Name", extends: JavaObject.self) - public struct Name { - @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - + @JavaClass("java.util.jar.Attributes$Name") + open class Name: JavaObject { @JavaMethod - public func notifyAll() + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public func wait(_ arg0: Int64) throws + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws + open override func toString() -> String @JavaMethod - public func wait() throws + open override func hashCode() -> Int32 } } extension JavaClass { diff --git a/Sources/JavaKitJar/generated/JarEntry.swift b/Sources/JavaKitJar/generated/JarEntry.swift index 85f5afe7..3a90d6a8 100644 --- a/Sources/JavaKitJar/generated/JarEntry.swift +++ b/Sources/JavaKitJar/generated/JarEntry.swift @@ -2,100 +2,22 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.jar.JarEntry", extends: ZipEntry.self) -public struct JarEntry { +@JavaClass("java.util.jar.JarEntry") +open class JarEntry: ZipEntry { @JavaMethod - public init(_ arg0: JarEntry?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: JarEntry?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: ZipEntry?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: ZipEntry?, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public func getRealName() -> String + open func getRealName() -> String @JavaMethod - public func getAttributes() throws -> Attributes! - - @JavaMethod - public func getName() -> String - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func clone() -> JavaObject! - - @JavaMethod - public func getMethod() -> Int32 - - @JavaMethod - public func getSize() -> Int64 - - @JavaMethod - public func isDirectory() -> Bool - - @JavaMethod - public func getTime() -> Int64 - - @JavaMethod - public func setTime(_ arg0: Int64) - - @JavaMethod - public func setSize(_ arg0: Int64) - - @JavaMethod - public func getCompressedSize() -> Int64 - - @JavaMethod - public func setCompressedSize(_ arg0: Int64) - - @JavaMethod - public func setCrc(_ arg0: Int64) - - @JavaMethod - public func getCrc() -> Int64 - - @JavaMethod - public func setMethod(_ arg0: Int32) - - @JavaMethod - public func setExtra(_ arg0: [Int8]) - - @JavaMethod - public func getExtra() -> [Int8] - - @JavaMethod - public func setComment(_ arg0: String) - - @JavaMethod - public func getComment() -> String - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getAttributes() throws -> Attributes! } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKitJar/generated/JarFile.swift b/Sources/JavaKitJar/generated/JarFile.swift index a76d645e..d5ea9969 100644 --- a/Sources/JavaKitJar/generated/JarFile.swift +++ b/Sources/JavaKitJar/generated/JarFile.swift @@ -3,67 +3,28 @@ import JavaKit import JavaKitCollection import JavaRuntime -@JavaClass("java.util.jar.JarFile", extends: JavaObject.self) -public struct JarFile { +@JavaClass("java.util.jar.JarFile") +open class JarFile: JavaObject { @JavaMethod - public init(_ arg0: String, _ arg1: Bool, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, _ arg1: Bool, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func entries() -> Enumeration! + open func entries() -> Enumeration! @JavaMethod - public func getManifest() throws -> Manifest! + open func getManifest() throws -> Manifest! @JavaMethod - public func getEntry(_ arg0: String) -> ZipEntry! + open func getEntry(_ arg0: String) -> ZipEntry! @JavaMethod - public func getJarEntry(_ arg0: String) -> JarEntry! + open func getJarEntry(_ arg0: String) -> JarEntry! @JavaMethod - public func isMultiRelease() -> Bool - - @JavaMethod - public func getName() -> String - - @JavaMethod - public func size() -> Int32 - - @JavaMethod - public func close() throws - - @JavaMethod - public func getComment() -> String - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func isMultiRelease() -> Bool } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKitJar/generated/JarInputStream.swift b/Sources/JavaKitJar/generated/JarInputStream.swift index ac6ade3b..f6d121d9 100644 --- a/Sources/JavaKitJar/generated/JarInputStream.swift +++ b/Sources/JavaKitJar/generated/JarInputStream.swift @@ -2,85 +2,22 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.jar.JarInputStream", extends: JavaObject.self) -public struct JarInputStream { +@JavaClass("java.util.jar.JarInputStream") +open class JarInputStream: JavaObject { @JavaMethod - public func getNextEntry() throws -> ZipEntry! + open func getNextEntry() throws -> ZipEntry! @JavaMethod - public func getNextJarEntry() throws -> JarEntry! + open func getNextJarEntry() throws -> JarEntry! @JavaMethod - public func read(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> Int32 + open func createZipEntry(_ arg0: String) -> ZipEntry! @JavaMethod - public func getManifest() -> Manifest! + open func read(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> Int32 @JavaMethod - public func closeEntry() throws - - @JavaMethod - public func read() throws -> Int32 - - @JavaMethod - public func close() throws - - @JavaMethod - public func readAllBytes() throws -> [Int8] - - @JavaMethod - public func readNBytes(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws -> Int32 - - @JavaMethod - public func readNBytes(_ arg0: Int32) throws -> [Int8] - - @JavaMethod - public func skip(_ arg0: Int64) throws -> Int64 - - @JavaMethod - public func available() throws -> Int32 - - @JavaMethod - public func skipNBytes(_ arg0: Int64) throws - - @JavaMethod - public func reset() throws - - @JavaMethod - public func mark(_ arg0: Int32) - - @JavaMethod - public func markSupported() -> Bool - - @JavaMethod - public func read(_ arg0: [Int8]) throws -> Int32 - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getManifest() -> Manifest! } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKitJar/generated/JarOutputStream.swift b/Sources/JavaKitJar/generated/JarOutputStream.swift index 04b544c8..e13dc973 100644 --- a/Sources/JavaKitJar/generated/JarOutputStream.swift +++ b/Sources/JavaKitJar/generated/JarOutputStream.swift @@ -2,67 +2,10 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.jar.JarOutputStream", extends: JavaObject.self) -public struct JarOutputStream { +@JavaClass("java.util.jar.JarOutputStream") +open class JarOutputStream: JavaObject { @JavaMethod - public func putNextEntry(_ arg0: ZipEntry?) throws - - @JavaMethod - public func closeEntry() throws - - @JavaMethod - public func write(_ arg0: [Int8], _ arg1: Int32, _ arg2: Int32) throws - - @JavaMethod - public func close() throws - - @JavaMethod - public func finish() throws - - @JavaMethod - public func setMethod(_ arg0: Int32) - - @JavaMethod - public func setComment(_ arg0: String) - - @JavaMethod - public func setLevel(_ arg0: Int32) - - @JavaMethod - public func flush() throws - - @JavaMethod - public func write(_ arg0: Int32) throws - - @JavaMethod - public func write(_ arg0: [Int8]) throws - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func putNextEntry(_ arg0: ZipEntry?) throws } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKitJar/generated/Manifest.swift b/Sources/JavaKitJar/generated/Manifest.swift index 6400f33c..101af57c 100644 --- a/Sources/JavaKitJar/generated/Manifest.swift +++ b/Sources/JavaKitJar/generated/Manifest.swift @@ -2,50 +2,29 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.jar.Manifest", extends: JavaObject.self) -public struct Manifest { +@JavaClass("java.util.jar.Manifest") +open class Manifest: JavaObject { @JavaMethod - public init(_ arg0: Manifest?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: Manifest?, environment: JNIEnvironment? = nil) @JavaMethod - public init(environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func clear() + open func clear() @JavaMethod - public func getMainAttributes() -> Attributes! + open func getMainAttributes() -> Attributes! @JavaMethod - public func getAttributes(_ arg0: String) -> Attributes! - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getAttributes(_ arg0: String) -> Attributes! } diff --git a/Sources/JavaKitJar/generated/ZipEntry.swift b/Sources/JavaKitJar/generated/ZipEntry.swift index 2f2e16a5..6a0fbd20 100644 --- a/Sources/JavaKitJar/generated/ZipEntry.swift +++ b/Sources/JavaKitJar/generated/ZipEntry.swift @@ -2,91 +2,70 @@ import JavaKit import JavaRuntime -@JavaClass("java.util.zip.ZipEntry", extends: JavaObject.self) -public struct ZipEntry { +@JavaClass("java.util.zip.ZipEntry") +open class ZipEntry: JavaObject { @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public init(_ arg0: ZipEntry?, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: ZipEntry?, environment: JNIEnvironment? = nil) @JavaMethod - public func getName() -> String + open func getName() -> String @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func clone() -> JavaObject! + open override func clone() -> JavaObject! @JavaMethod - public func getMethod() -> Int32 + open func getMethod() -> Int32 @JavaMethod - public func getSize() -> Int64 + open func getSize() -> Int64 @JavaMethod - public func isDirectory() -> Bool + open func isDirectory() -> Bool @JavaMethod - public func getTime() -> Int64 + open func getTime() -> Int64 @JavaMethod - public func setTime(_ arg0: Int64) + open func setTime(_ arg0: Int64) @JavaMethod - public func setSize(_ arg0: Int64) + open func setSize(_ arg0: Int64) @JavaMethod - public func getCompressedSize() -> Int64 + open func getCompressedSize() -> Int64 @JavaMethod - public func setCompressedSize(_ arg0: Int64) + open func setCompressedSize(_ arg0: Int64) @JavaMethod - public func setCrc(_ arg0: Int64) + open func setCrc(_ arg0: Int64) @JavaMethod - public func getCrc() -> Int64 + open func getCrc() -> Int64 @JavaMethod - public func setMethod(_ arg0: Int32) + open func setMethod(_ arg0: Int32) @JavaMethod - public func setExtra(_ arg0: [Int8]) + open func setExtra(_ arg0: [Int8]) @JavaMethod - public func getExtra() -> [Int8] + open func getExtra() -> [Int8] @JavaMethod - public func setComment(_ arg0: String) + open func setComment(_ arg0: String) @JavaMethod - public func getComment() -> String - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getComment() -> String } extension JavaClass { @JavaStaticField(isFinal: true) diff --git a/Sources/JavaKitNetwork/generated/URI.swift b/Sources/JavaKitNetwork/generated/URI.swift index a8b35bcb..000e29ca 100644 --- a/Sources/JavaKitNetwork/generated/URI.swift +++ b/Sources/JavaKitNetwork/generated/URI.swift @@ -2,127 +2,109 @@ import JavaKit import JavaRuntime -@JavaClass("java.net.URI", extends: JavaObject.self) -public struct URI { +@JavaClass("java.net.URI") +open class URI: JavaObject { @JavaMethod - public init(_ arg0: String, _ arg1: String, _ arg2: String, _ arg3: String, _ arg4: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, _ arg1: String, _ arg2: String, _ arg3: String, _ arg4: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, _ arg1: String, _ arg2: String, _ arg3: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, _ arg1: String, _ arg2: String, _ arg3: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, _ arg1: String, _ arg2: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, _ arg1: String, _ arg2: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, _ arg1: String, _ arg2: String, _ arg3: Int32, _ arg4: String, _ arg5: String, _ arg6: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, _ arg1: String, _ arg2: String, _ arg3: Int32, _ arg4: String, _ arg5: String, _ arg6: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - public func compareTo(_ arg0: URI?) -> Int32 + open func compareTo(_ arg0: URI?) -> Int32 @JavaMethod - public func isAbsolute() -> Bool + open func isAbsolute() -> Bool @JavaMethod - public func resolve(_ arg0: String) -> URI! + open func resolve(_ arg0: String) -> URI! @JavaMethod - public func resolve(_ arg0: URI?) -> URI! + open func resolve(_ arg0: URI?) -> URI! @JavaMethod - public func getScheme() -> String + open func getScheme() -> String @JavaMethod - public func isOpaque() -> Bool + open func isOpaque() -> Bool @JavaMethod - public func getRawAuthority() -> String + open func getRawAuthority() -> String @JavaMethod - public func getRawFragment() -> String + open func getRawFragment() -> String @JavaMethod - public func getRawQuery() -> String + open func getRawQuery() -> String @JavaMethod - public func getRawPath() -> String + open func getRawPath() -> String @JavaMethod - public func getHost() -> String + open func getHost() -> String @JavaMethod - public func getPort() -> Int32 + open func getPort() -> Int32 @JavaMethod - public func getAuthority() -> String + open func getAuthority() -> String @JavaMethod - public func getQuery() -> String + open func getQuery() -> String @JavaMethod - public func getPath() -> String + open func getPath() -> String @JavaMethod - public func getUserInfo() -> String + open func getUserInfo() -> String @JavaMethod - public func toURL() throws -> URL! + open func toURL() throws -> URL! @JavaMethod - public func normalize() -> URI! + open func normalize() -> URI! @JavaMethod - public func relativize(_ arg0: URI?) -> URI! + open func relativize(_ arg0: URI?) -> URI! @JavaMethod - public func getRawSchemeSpecificPart() -> String + open func getRawSchemeSpecificPart() -> String @JavaMethod - public func parseServerAuthority() throws -> URI! + open func parseServerAuthority() throws -> URI! @JavaMethod - public func getSchemeSpecificPart() -> String + open func getSchemeSpecificPart() -> String @JavaMethod - public func getRawUserInfo() -> String + open func getRawUserInfo() -> String @JavaMethod - public func getFragment() -> String + open func getFragment() -> String @JavaMethod - public func toASCIIString() -> String - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func toASCIIString() -> String } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKitNetwork/generated/URL.swift b/Sources/JavaKitNetwork/generated/URL.swift index c9fb0832..ed0dee38 100644 --- a/Sources/JavaKitNetwork/generated/URL.swift +++ b/Sources/JavaKitNetwork/generated/URL.swift @@ -2,89 +2,71 @@ import JavaKit import JavaRuntime -@JavaClass("java.net.URL", extends: JavaObject.self) -public struct URL { +@JavaClass("java.net.URL") +open class URL: JavaObject { @JavaMethod - public init(_ arg0: URL?, _ arg1: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: URL?, _ arg1: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, _ arg1: String, _ arg2: Int32, _ arg3: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, _ arg1: String, _ arg2: Int32, _ arg3: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public init(_ arg0: String, _ arg1: String, _ arg2: String, environment: JNIEnvironment? = nil) throws + @_nonoverride public convenience init(_ arg0: String, _ arg1: String, _ arg2: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func getHost() -> String + open func getHost() -> String @JavaMethod - public func getPort() -> Int32 + open func getPort() -> Int32 @JavaMethod - public func getDefaultPort() -> Int32 + open func getDefaultPort() -> Int32 @JavaMethod - public func sameFile(_ arg0: URL?) -> Bool + open func sameFile(_ arg0: URL?) -> Bool @JavaMethod - public func toExternalForm() -> String + open func toExternalForm() -> String @JavaMethod - public func getContent() throws -> JavaObject! + open func getContent() throws -> JavaObject! @JavaMethod - public func getContent(_ arg0: [JavaClass?]) throws -> JavaObject! + open func getContent(_ arg0: [JavaClass?]) throws -> JavaObject! @JavaMethod - public func getProtocol() -> String + open func getProtocol() -> String @JavaMethod - public func getAuthority() -> String + open func getAuthority() -> String @JavaMethod - public func getFile() -> String + open func getFile() -> String @JavaMethod - public func getRef() -> String + open func getRef() -> String @JavaMethod - public func getQuery() -> String + open func getQuery() -> String @JavaMethod - public func getPath() -> String + open func getPath() -> String @JavaMethod - public func getUserInfo() -> String + open func getUserInfo() -> String @JavaMethod - public func toURI() throws -> URI! - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func toURI() throws -> URI! } diff --git a/Sources/JavaKitNetwork/generated/URLClassLoader.swift b/Sources/JavaKitNetwork/generated/URLClassLoader.swift index b8e1f54f..ba977e07 100644 --- a/Sources/JavaKitNetwork/generated/URLClassLoader.swift +++ b/Sources/JavaKitNetwork/generated/URLClassLoader.swift @@ -3,84 +3,30 @@ import JavaKit import JavaKitCollection import JavaRuntime -@JavaClass("java.net.URLClassLoader", extends: JavaObject.self) -public struct URLClassLoader { +@JavaClass("java.net.URLClassLoader") +open class URLClassLoader: JavaObject { @JavaMethod - public init(_ arg0: [URL?], environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: [URL?], environment: JNIEnvironment? = nil) @JavaMethod - public func findResource(_ arg0: String) -> URL! + open func findResource(_ arg0: String) -> URL! @JavaMethod - public func findResources(_ arg0: String) throws -> Enumeration! + open func findClass(_ arg0: String) throws -> JavaClass! @JavaMethod - public func close() throws + open func findResources(_ arg0: String) throws -> Enumeration! @JavaMethod - public func getURLs() -> [URL?] + open func close() throws @JavaMethod - public func getName() -> String + open func addURL(_ arg0: URL?) @JavaMethod - public func loadClass(_ arg0: String) throws -> JavaClass! - - @JavaMethod - public func getResource(_ arg0: String) -> URL! - - @JavaMethod - public func getResources(_ arg0: String) throws -> Enumeration! - - @JavaMethod - public func isRegisteredAsParallelCapable() -> Bool - - @JavaMethod - public func setDefaultAssertionStatus(_ arg0: Bool) - - @JavaMethod - public func setPackageAssertionStatus(_ arg0: String, _ arg1: Bool) - - @JavaMethod - public func setClassAssertionStatus(_ arg0: String, _ arg1: Bool) - - @JavaMethod - public func clearAssertionStatus() - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getURLs() -> [URL?] } extension JavaClass { @JavaStaticMethod public func newInstance(_ arg0: [URL?]) -> URLClassLoader! - - @JavaStaticMethod - public func getSystemResource(_ arg0: String) -> URL! - - @JavaStaticMethod - public func getSystemResources(_ arg0: String) throws -> Enumeration! } diff --git a/Sources/JavaKitReflection/Constructor+Utilities.swift b/Sources/JavaKitReflection/Constructor+Utilities.swift index 676a6283..8f57ffa5 100644 --- a/Sources/JavaKitReflection/Constructor+Utilities.swift +++ b/Sources/JavaKitReflection/Constructor+Utilities.swift @@ -22,9 +22,4 @@ extension Constructor { public var isNative: Bool { return (getModifiers() & 256) != 0 } - - /// Whether this executable throws any checked exception. - public var throwsCheckedException: Bool { - return self.as(Executable.self)!.throwsCheckedException - } } diff --git a/Sources/JavaKitReflection/Method+Utilities.swift b/Sources/JavaKitReflection/Method+Utilities.swift index 6c8e4a66..71ee864c 100644 --- a/Sources/JavaKitReflection/Method+Utilities.swift +++ b/Sources/JavaKitReflection/Method+Utilities.swift @@ -32,9 +32,4 @@ extension Method { public var isNative: Bool { return (getModifiers() & 256) != 0 } - - /// Whether this executable throws any checked exception. - public var throwsCheckedException: Bool { - return self.as(Executable.self)!.throwsCheckedException - } } diff --git a/Sources/JavaKitReflection/generated/AccessibleObject.swift b/Sources/JavaKitReflection/generated/AccessibleObject.swift index 1c474fb4..84dcc4c2 100644 --- a/Sources/JavaKitReflection/generated/AccessibleObject.swift +++ b/Sources/JavaKitReflection/generated/AccessibleObject.swift @@ -2,67 +2,40 @@ import JavaKit import JavaRuntime -@JavaClass("java.lang.reflect.AccessibleObject", extends: JavaObject.self) -public struct AccessibleObject { +@JavaClass("java.lang.reflect.AccessibleObject") +open class AccessibleObject: JavaObject { @JavaMethod - public func isAnnotationPresent(_ arg0: JavaClass?) -> Bool + open func isAnnotationPresent(_ arg0: JavaClass?) -> Bool @JavaMethod - public func getAnnotation(_ arg0: JavaClass?) -> Annotation! + open func getAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] + open func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] @JavaMethod - public func getAnnotations() -> [Annotation?] + open func getAnnotations() -> [Annotation?] @JavaMethod - public func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! + open func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] + open func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] @JavaMethod - public func getDeclaredAnnotations() -> [Annotation?] + open func getDeclaredAnnotations() -> [Annotation?] @JavaMethod - public func setAccessible(_ arg0: Bool) + open func setAccessible(_ arg0: Bool) @JavaMethod - public func trySetAccessible() -> Bool + open func trySetAccessible() -> Bool @JavaMethod - public func canAccess(_ arg0: JavaObject?) -> Bool + open func canAccess(_ arg0: JavaObject?) -> Bool @JavaMethod - public func isAccessible() -> Bool - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func isAccessible() -> Bool } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKitReflection/generated/Constructor.swift b/Sources/JavaKitReflection/generated/Constructor.swift index c3e48a15..263d767d 100644 --- a/Sources/JavaKitReflection/generated/Constructor.swift +++ b/Sources/JavaKitReflection/generated/Constructor.swift @@ -1,126 +1,74 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaKit -import JavaKitCollection import JavaRuntime -@JavaClass("java.lang.reflect.Constructor", extends: Executable.self) -public struct Constructor { +@JavaClass("java.lang.reflect.Constructor") +open class Constructor: Executable { @JavaMethod - public func getName() -> String + open override func getName() -> String @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func getModifiers() -> Int32 + open override func getModifiers() -> Int32 @JavaMethod - public func getTypeParameters() -> [TypeVariable>?] + open func getTypeParameters() -> [TypeVariable>?] @JavaMethod - public func newInstance(_ arg0: [JavaObject?]) throws -> JavaObject! + open func newInstance(_ arg0: [JavaObject?]) throws -> JavaObject! @JavaMethod - public func getParameterTypes() -> [JavaClass?] + open override func getParameterTypes() -> [JavaClass?] @JavaMethod - public func toGenericString() -> String + open override func toGenericString() -> String @JavaMethod - public func isSynthetic() -> Bool + open override func isSynthetic() -> Bool @JavaMethod - public func getDeclaringClass() -> JavaClass! + open override func getDeclaringClass() -> JavaClass! @JavaMethod - public func getAnnotation(_ arg0: JavaClass?) -> Annotation! + open override func getAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getDeclaredAnnotations() -> [Annotation?] + open override func getDeclaredAnnotations() -> [Annotation?] @JavaMethod - public func setAccessible(_ arg0: Bool) + open override func setAccessible(_ arg0: Bool) @JavaMethod - public func isVarArgs() -> Bool + open override func isVarArgs() -> Bool @JavaMethod - public func getParameterCount() -> Int32 + open override func getParameterCount() -> Int32 @JavaMethod - public func getParameterAnnotations() -> [[Annotation?]] + open override func getParameterAnnotations() -> [[Annotation?]] @JavaMethod - public func getGenericParameterTypes() -> [Type?] + open override func getGenericParameterTypes() -> [Type?] @JavaMethod - public func getGenericExceptionTypes() -> [Type?] + open override func getGenericExceptionTypes() -> [Type?] @JavaMethod - public func getExceptionTypes() -> [JavaClass?] + open override func getExceptionTypes() -> [JavaClass?] @JavaMethod - public func getAnnotatedReturnType() -> AnnotatedType! + open override func getAnnotatedReturnType() -> AnnotatedType! @JavaMethod - public func getAnnotatedReceiverType() -> AnnotatedType! - - @JavaMethod - public func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] - - @JavaMethod - public func getAnnotatedParameterTypes() -> [AnnotatedType?] - - @JavaMethod - public func getParameters() -> [Parameter?] - - @JavaMethod - public func getAnnotatedExceptionTypes() -> [AnnotatedType?] - - @JavaMethod - public func isAnnotationPresent(_ arg0: JavaClass?) -> Bool - - @JavaMethod - public func getAnnotations() -> [Annotation?] - - @JavaMethod - public func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! - - @JavaMethod - public func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] - - @JavaMethod - public func trySetAccessible() -> Bool - - @JavaMethod - public func canAccess(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func isAccessible() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open override func getAnnotatedReceiverType() -> AnnotatedType! } extension JavaClass { @JavaStaticField(isFinal: true) @@ -128,7 +76,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var DECLARED: Int32 - - @JavaStaticMethod - public func setAccessible(_ arg0: [AccessibleObject?], _ arg1: Bool) where ObjectType == Constructor } diff --git a/Sources/JavaKitReflection/generated/Executable.swift b/Sources/JavaKitReflection/generated/Executable.swift index da1635f6..6a1f5b75 100644 --- a/Sources/JavaKitReflection/generated/Executable.swift +++ b/Sources/JavaKitReflection/generated/Executable.swift @@ -3,121 +3,70 @@ import JavaKit import JavaKitCollection import JavaRuntime -@JavaClass("java.lang.reflect.Executable", extends: AccessibleObject.self, implements: GenericDeclaration.self) -public struct Executable { +@JavaClass("java.lang.reflect.Executable", implements: GenericDeclaration.self) +open class Executable: AccessibleObject { @JavaMethod - public func getName() -> String + open func getName() -> String @JavaMethod - public func getModifiers() -> Int32 + open func getModifiers() -> Int32 @JavaMethod - public func getTypeParameters() -> [TypeVariable?] + open func getTypeParameters() -> [TypeVariable?] @JavaMethod - public func getParameterTypes() -> [JavaClass?] + open func getParameterTypes() -> [JavaClass?] @JavaMethod - public func toGenericString() -> String + open func toGenericString() -> String @JavaMethod - public func isSynthetic() -> Bool + open func isSynthetic() -> Bool @JavaMethod - public func getDeclaringClass() -> JavaClass! + open func getDeclaringClass() -> JavaClass! @JavaMethod - public func getAnnotation(_ arg0: JavaClass?) -> Annotation! + open override func getAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] + open override func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] @JavaMethod - public func getDeclaredAnnotations() -> [Annotation?] + open override func getDeclaredAnnotations() -> [Annotation?] @JavaMethod - public func isVarArgs() -> Bool + open func isVarArgs() -> Bool @JavaMethod - public func getAnnotatedParameterTypes() -> [AnnotatedType?] + open func getAnnotatedParameterTypes() -> [AnnotatedType?] @JavaMethod - public func getParameterCount() -> Int32 + open func getParameterCount() -> Int32 @JavaMethod - public func getParameterAnnotations() -> [[Annotation?]] + open func getParameterAnnotations() -> [[Annotation?]] @JavaMethod - public func getGenericParameterTypes() -> [Type?] + open func getGenericParameterTypes() -> [Type?] @JavaMethod - public func getGenericExceptionTypes() -> [Type?] + open func getGenericExceptionTypes() -> [Type?] @JavaMethod - public func getExceptionTypes() -> [JavaClass?] + open func getExceptionTypes() -> [JavaClass?] @JavaMethod - public func getAnnotatedReturnType() -> AnnotatedType! + open func getAnnotatedReturnType() -> AnnotatedType! @JavaMethod - public func getParameters() -> [Parameter?] + open func getParameters() -> [Parameter?] @JavaMethod - public func getAnnotatedReceiverType() -> AnnotatedType! + open func getAnnotatedReceiverType() -> AnnotatedType! @JavaMethod - public func getAnnotatedExceptionTypes() -> [AnnotatedType?] - - @JavaMethod - public func isAnnotationPresent(_ arg0: JavaClass?) -> Bool - - @JavaMethod - public func getAnnotations() -> [Annotation?] - - @JavaMethod - public func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! - - @JavaMethod - public func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] - - @JavaMethod - public func setAccessible(_ arg0: Bool) - - @JavaMethod - public func trySetAccessible() -> Bool - - @JavaMethod - public func canAccess(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func isAccessible() -> Bool - - @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func toString() -> String - - @JavaMethod - public func hashCode() -> Int32 - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getAnnotatedExceptionTypes() -> [AnnotatedType?] } extension JavaClass { @JavaStaticField(isFinal: true) @@ -125,7 +74,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var DECLARED: Int32 - - @JavaStaticMethod - public func setAccessible(_ arg0: [AccessibleObject?], _ arg1: Bool) } diff --git a/Sources/JavaKitReflection/generated/Field.swift b/Sources/JavaKitReflection/generated/Field.swift index 41e71afb..c67e56ff 100644 --- a/Sources/JavaKitReflection/generated/Field.swift +++ b/Sources/JavaKitReflection/generated/Field.swift @@ -3,148 +3,109 @@ import JavaKit import JavaKitCollection import JavaRuntime -@JavaClass("java.lang.reflect.Field", extends: AccessibleObject.self) -public struct Field { +@JavaClass("java.lang.reflect.Field") +open class Field: AccessibleObject { @JavaMethod - public func getName() -> String + open func getName() -> String @JavaMethod - public func get(_ arg0: JavaObject?) throws -> JavaObject! + open func get(_ arg0: JavaObject?) throws -> JavaObject! @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func getModifiers() -> Int32 + open func getModifiers() -> Int32 @JavaMethod - public func getBoolean(_ arg0: JavaObject?) throws -> Bool + open func getBoolean(_ arg0: JavaObject?) throws -> Bool @JavaMethod - public func getByte(_ arg0: JavaObject?) throws -> Int8 + open func getByte(_ arg0: JavaObject?) throws -> Int8 @JavaMethod - public func getShort(_ arg0: JavaObject?) throws -> Int16 + open func getShort(_ arg0: JavaObject?) throws -> Int16 @JavaMethod - public func getChar(_ arg0: JavaObject?) throws -> UInt16 + open func getChar(_ arg0: JavaObject?) throws -> UInt16 @JavaMethod - public func getInt(_ arg0: JavaObject?) throws -> Int32 + open func getInt(_ arg0: JavaObject?) throws -> Int32 @JavaMethod - public func getLong(_ arg0: JavaObject?) throws -> Int64 + open func getLong(_ arg0: JavaObject?) throws -> Int64 @JavaMethod - public func getFloat(_ arg0: JavaObject?) throws -> Float + open func getFloat(_ arg0: JavaObject?) throws -> Float @JavaMethod - public func getDouble(_ arg0: JavaObject?) throws -> Double + open func getDouble(_ arg0: JavaObject?) throws -> Double @JavaMethod - public func toGenericString() -> String + open func toGenericString() -> String @JavaMethod - public func isSynthetic() -> Bool + open func isSynthetic() -> Bool @JavaMethod - public func getDeclaringClass() -> JavaClass! + open func getDeclaringClass() -> JavaClass! @JavaMethod - public func getAnnotation(_ arg0: JavaClass?) -> Annotation! + open override func getAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] + open override func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] @JavaMethod - public func getDeclaredAnnotations() -> [Annotation?] + open override func getDeclaredAnnotations() -> [Annotation?] @JavaMethod - public func set(_ arg0: JavaObject?, _ arg1: JavaObject?) throws + open func set(_ arg0: JavaObject?, _ arg1: JavaObject?) throws @JavaMethod - public func setAccessible(_ arg0: Bool) + open override func setAccessible(_ arg0: Bool) @JavaMethod - public func getGenericType() -> Type! + open func getGenericType() -> Type! @JavaMethod - public func getType() -> JavaClass! + open func getType() -> JavaClass! @JavaMethod - public func setBoolean(_ arg0: JavaObject?, _ arg1: Bool) throws + open func setBoolean(_ arg0: JavaObject?, _ arg1: Bool) throws @JavaMethod - public func setByte(_ arg0: JavaObject?, _ arg1: Int8) throws + open func setByte(_ arg0: JavaObject?, _ arg1: Int8) throws @JavaMethod - public func setChar(_ arg0: JavaObject?, _ arg1: UInt16) throws + open func setChar(_ arg0: JavaObject?, _ arg1: UInt16) throws @JavaMethod - public func setShort(_ arg0: JavaObject?, _ arg1: Int16) throws + open func setShort(_ arg0: JavaObject?, _ arg1: Int16) throws @JavaMethod - public func setInt(_ arg0: JavaObject?, _ arg1: Int32) throws + open func setInt(_ arg0: JavaObject?, _ arg1: Int32) throws @JavaMethod - public func setLong(_ arg0: JavaObject?, _ arg1: Int64) throws + open func setLong(_ arg0: JavaObject?, _ arg1: Int64) throws @JavaMethod - public func setFloat(_ arg0: JavaObject?, _ arg1: Float) throws + open func setFloat(_ arg0: JavaObject?, _ arg1: Float) throws @JavaMethod - public func setDouble(_ arg0: JavaObject?, _ arg1: Double) throws + open func setDouble(_ arg0: JavaObject?, _ arg1: Double) throws @JavaMethod - public func isEnumConstant() -> Bool + open func isEnumConstant() -> Bool @JavaMethod - public func getAnnotatedType() -> AnnotatedType! - - @JavaMethod - public func isAnnotationPresent(_ arg0: JavaClass?) -> Bool - - @JavaMethod - public func getAnnotations() -> [Annotation?] - - @JavaMethod - public func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! - - @JavaMethod - public func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] - - @JavaMethod - public func trySetAccessible() -> Bool - - @JavaMethod - public func canAccess(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func isAccessible() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open func getAnnotatedType() -> AnnotatedType! } extension JavaClass { @JavaStaticField(isFinal: true) @@ -152,7 +113,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var DECLARED: Int32 - - @JavaStaticMethod - public func setAccessible(_ arg0: [AccessibleObject?], _ arg1: Bool) } diff --git a/Sources/JavaKitReflection/generated/Method.swift b/Sources/JavaKitReflection/generated/Method.swift index 3a67073c..46183f4f 100644 --- a/Sources/JavaKitReflection/generated/Method.swift +++ b/Sources/JavaKitReflection/generated/Method.swift @@ -1,141 +1,86 @@ // Auto-generated by Java-to-Swift wrapper generator. import JavaKit -import JavaKitCollection import JavaRuntime -@JavaClass("java.lang.reflect.Method", extends: Executable.self) -public struct Method { +@JavaClass("java.lang.reflect.Method") +open class Method: Executable { @JavaMethod - public func invoke(_ arg0: JavaObject?, _ arg1: [JavaObject?]) throws -> JavaObject! + open func invoke(_ arg0: JavaObject?, _ arg1: [JavaObject?]) throws -> JavaObject! @JavaMethod - public func getName() -> String + open override func getName() -> String @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func getModifiers() -> Int32 + open override func getModifiers() -> Int32 @JavaMethod - public func getTypeParameters() -> [TypeVariable?] + open func getTypeParameters() -> [TypeVariable?] @JavaMethod - public func getReturnType() -> JavaClass! + open func getReturnType() -> JavaClass! @JavaMethod - public func getParameterTypes() -> [JavaClass?] + open override func getParameterTypes() -> [JavaClass?] @JavaMethod - public func toGenericString() -> String + open override func toGenericString() -> String @JavaMethod - public func isSynthetic() -> Bool + open override func isSynthetic() -> Bool @JavaMethod - public func getDeclaringClass() -> JavaClass! + open override func getDeclaringClass() -> JavaClass! @JavaMethod - public func getAnnotation(_ arg0: JavaClass?) -> Annotation! + open override func getAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getDeclaredAnnotations() -> [Annotation?] + open override func getDeclaredAnnotations() -> [Annotation?] @JavaMethod - public func setAccessible(_ arg0: Bool) + open override func setAccessible(_ arg0: Bool) @JavaMethod - public func isVarArgs() -> Bool + open override func isVarArgs() -> Bool @JavaMethod - public func getParameterCount() -> Int32 + open override func getParameterCount() -> Int32 @JavaMethod - public func getParameterAnnotations() -> [[Annotation?]] + open override func getParameterAnnotations() -> [[Annotation?]] @JavaMethod - public func getGenericParameterTypes() -> [Type?] + open override func getGenericParameterTypes() -> [Type?] @JavaMethod - public func getGenericExceptionTypes() -> [Type?] + open override func getGenericExceptionTypes() -> [Type?] @JavaMethod - public func isDefault() -> Bool + open func isDefault() -> Bool @JavaMethod - public func getGenericReturnType() -> Type! + open func getGenericReturnType() -> Type! @JavaMethod - public func getExceptionTypes() -> [JavaClass?] + open override func getExceptionTypes() -> [JavaClass?] @JavaMethod - public func isBridge() -> Bool + open func isBridge() -> Bool @JavaMethod - public func getDefaultValue() -> JavaObject! + open func getDefaultValue() -> JavaObject! @JavaMethod - public func getAnnotatedReturnType() -> AnnotatedType! - - @JavaMethod - public func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] - - @JavaMethod - public func getAnnotatedParameterTypes() -> [AnnotatedType?] - - @JavaMethod - public func getParameters() -> [Parameter?] - - @JavaMethod - public func getAnnotatedReceiverType() -> AnnotatedType! - - @JavaMethod - public func getAnnotatedExceptionTypes() -> [AnnotatedType?] - - @JavaMethod - public func isAnnotationPresent(_ arg0: JavaClass?) -> Bool - - @JavaMethod - public func getAnnotations() -> [Annotation?] - - @JavaMethod - public func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! - - @JavaMethod - public func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] - - @JavaMethod - public func trySetAccessible() -> Bool - - @JavaMethod - public func canAccess(_ arg0: JavaObject?) -> Bool - - @JavaMethod - public func isAccessible() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws + open override func getAnnotatedReturnType() -> AnnotatedType! } extension JavaClass { @JavaStaticField(isFinal: true) @@ -143,7 +88,4 @@ extension JavaClass { @JavaStaticField(isFinal: true) public var DECLARED: Int32 - - @JavaStaticMethod - public func setAccessible(_ arg0: [AccessibleObject?], _ arg1: Bool) } diff --git a/Sources/JavaKitReflection/generated/Parameter.swift b/Sources/JavaKitReflection/generated/Parameter.swift index 5788f089..30f2d628 100644 --- a/Sources/JavaKitReflection/generated/Parameter.swift +++ b/Sources/JavaKitReflection/generated/Parameter.swift @@ -3,83 +3,62 @@ import JavaKit import JavaKitCollection import JavaRuntime -@JavaClass("java.lang.reflect.Parameter", extends: JavaObject.self) -public struct Parameter { +@JavaClass("java.lang.reflect.Parameter") +open class Parameter: JavaObject { @JavaMethod - public func getName() -> String + open func getName() -> String @JavaMethod - public func equals(_ arg0: JavaObject?) -> Bool + open override func equals(_ arg0: JavaObject?) -> Bool @JavaMethod - public func toString() -> String + open override func toString() -> String @JavaMethod - public func hashCode() -> Int32 + open override func hashCode() -> Int32 @JavaMethod - public func getModifiers() -> Int32 + open func getModifiers() -> Int32 @JavaMethod - public func isSynthetic() -> Bool + open func isSynthetic() -> Bool @JavaMethod - public func getAnnotation(_ arg0: JavaClass?) -> Annotation! + open func getAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] + open func getAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] @JavaMethod - public func getAnnotations() -> [Annotation?] + open func getAnnotations() -> [Annotation?] @JavaMethod - public func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! + open func getDeclaredAnnotation(_ arg0: JavaClass?) -> Annotation! @JavaMethod - public func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] + open func getDeclaredAnnotationsByType(_ arg0: JavaClass?) -> [Annotation?] @JavaMethod - public func getDeclaredAnnotations() -> [Annotation?] + open func getDeclaredAnnotations() -> [Annotation?] @JavaMethod - public func getType() -> JavaClass! + open func getType() -> JavaClass! @JavaMethod - public func getAnnotatedType() -> AnnotatedType! + open func getAnnotatedType() -> AnnotatedType! @JavaMethod - public func getParameterizedType() -> Type! + open func getParameterizedType() -> Type! @JavaMethod - public func isVarArgs() -> Bool + open func isVarArgs() -> Bool @JavaMethod - public func isNamePresent() -> Bool + open func isNamePresent() -> Bool @JavaMethod - public func getDeclaringExecutable() -> Executable! + open func getDeclaringExecutable() -> Executable! @JavaMethod - public func isImplicit() -> Bool - - @JavaMethod - public func getClass() -> JavaClass! - - @JavaMethod - public func notify() - - @JavaMethod - public func notifyAll() - - @JavaMethod - public func wait(_ arg0: Int64) throws - - @JavaMethod - public func wait(_ arg0: Int64, _ arg1: Int32) throws - - @JavaMethod - public func wait() throws - - @JavaMethod - public func isAnnotationPresent(_ arg0: JavaClass?) -> Bool + open func isImplicit() -> Bool } diff --git a/Tests/JavaKitTests/BasicRuntimeTests.swift b/Tests/JavaKitTests/BasicRuntimeTests.swift index 5185294e..e417cd6d 100644 --- a/Tests/JavaKitTests/BasicRuntimeTests.swift +++ b/Tests/JavaKitTests/BasicRuntimeTests.swift @@ -44,7 +44,7 @@ class BasicRuntimeTests: XCTestCase { // 'super' and 'as' don't require allocating a new holder. let url = try URL("http://swift.org", environment: environment) - let superURL = url.super + let superURL: JavaObject = url XCTAssert(url.javaHolder === superURL.javaHolder) let urlAgain = superURL.as(URL.self)! XCTAssert(url.javaHolder === urlAgain.javaHolder) From d1b71c33fb6f76672c9ad5c8a4842b1093046b5d Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Thu, 31 Oct 2024 09:38:19 -0700 Subject: [PATCH 2/2] JavaKit: Update user guide for the move to Swift classes --- USER_GUIDE.md | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/USER_GUIDE.md b/USER_GUIDE.md index a85fa94e..e352670e 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -45,15 +45,15 @@ If you build the project, there will be a generated file `BigInteger.swift` that ```swift @JavaClass("java.math.BigInteger") -public struct BigInteger { +open class BigInteger: JavaNumber { @JavaMethod public init(_ arg0: String, environment: JNIEnvironment? = nil) @JavaMethod - public func toString() -> String + open func toString() -> String @JavaMethod - public func isProbablePrime(_ arg0: Int32) -> Bool + open func isProbablePrime(_ arg0: Int32) -> Bool // many more methods } @@ -219,7 +219,7 @@ do { Note that we are passing the Jar file in the `classPath` argument when initializing the `JavaVirtualMachine` instance. Otherwise, the program will fail with an error because it cannot find the Java class `com.gazman.quadratic_sieve.primes.SieveOfEratosthenes`. -### Up and downcasting +### Downcasting All Java classes available in Swift provide `is` and `as` methods to check whether an object dynamically matches another type. The `is` operation is the equivalent of Java's `instanceof` and Swift's `is` operator, and will checkin whether a given object is of the specified type, e.g., @@ -288,31 +288,31 @@ This section describes how Java libraries and mapped into Swift and their use fr ### Translation from Java classes into Swift -Each Java class that can be used from Swift is translated to a Swift `struct` that provides information about the Java class itself and is populated with the Swift projection of each of its constructors, methods, and fields. For example, here is an excerpt of the Swift projection of [`java.util.jar.JarFile`](https://docs.oracle.com/javase/8/docs/api/java/util/jar/JarFile.html): +Each Java class that can be used from Swift is translated to a Swift `class` that provides information about the Java class itself and is populated with the Swift projection of each of its constructors, methods, and fields. For example, here is an excerpt of the Swift projection of [`java.util.jar.JarFile`](https://docs.oracle.com/javase/8/docs/api/java/util/jar/JarFile.html): ```swift -@JavaClass("java.util.jar.JarFile", extends: ZipFile.self, implements: AutoCloseable.self) -public struct JarFile { +@JavaClass("java.util.jar.JarFile", extends: AutoCloseable.self) +open class JarFile: ZipFile { @JavaMethod - public init(_ arg0: String, _ arg1: Bool, environment: JNIEnvironment? = nil) + @_nonoverride public convenience init(_ arg0: String, _ arg1: Bool, environment: JNIEnvironment? = nil) throws @JavaMethod - public func entries() -> Enumeration? + @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil) throws @JavaMethod - public func getManifest() -> Manifest? + open func entries() -> Enumeration! @JavaMethod - public func getJarEntry(_ arg0: String) -> JarEntry? + open func getManifest() throws -> Manifest! @JavaMethod - public func isMultiRelease() -> Bool + open func getEntry(_ arg0: String) -> ZipEntry! @JavaMethod - public func getName() -> String + open func getJarEntry(_ arg0: String) -> JarEntry! @JavaMethod - public func size() -> Int32 + open func isMultiRelease() -> Bool } ``` @@ -328,7 +328,7 @@ Each of the public Java constructors, methods, and fields in the Java class will ```swift @JavaMethod - public init(_ arg0: String, _ arg1: Bool, environment: JNIEnvironment? = nil) + public convenience init(_ arg0: String, _ arg1: Bool, environment: JNIEnvironment? = nil) ``` corresponds to the Java constructor: @@ -424,6 +424,20 @@ extension JavaClass { Java interfaces are similar to classes, and are projected into Swift in much the same way, but with the macro `JavaInterface`. The `JavaInterface` macro takes the Java interface name as well as any Java interfaces that this interface extends. As an example, here is the Swift projection of the [`java.util.Enumeration`](https://docs.oracle.com/javase/8/docs/api/java/util/Enumeration.html) generic interface: +```swift +@JavaInterface("java.util.Enumeration") +public struct Enumeration { + @JavaMethod + public func asIterator() -> JavaIterator! + + @JavaMethod + public func hasMoreElements() -> Bool + + @JavaMethod + public func nextElement() -> JavaObject! +} +``` + ## Translating Java classes with `Java2Swift` The `Java2Swift` is a Swift program that uses Java's runtime reflection facilities to translate the requested Java classes into their Swift projections. The output is a number of Swift source files, each of which corresponds to a