diff --git a/Sources/Java2SwiftLib/JavaClassTranslator.swift b/Sources/Java2SwiftLib/JavaClassTranslator.swift index bfd1657f..1a6e7fdd 100644 --- a/Sources/Java2SwiftLib/JavaClassTranslator.swift +++ b/Sources/Java2SwiftLib/JavaClassTranslator.swift @@ -104,12 +104,25 @@ struct JavaClassTranslator { } let genericParameters = javaTypeParameters.map { param in - "\(param.getName()): AnyJavaObject" + let name = generateGenericParameterName(param.getName()) + translator.usedGenericParameterNames.insert(param.getName()) + return "\(name): AnyJavaObject" } return "<\(genericParameters.joined(separator: ", "))>" } + /// If the name already exists, append a 1 to it. + /// For example, if name = "T" and it already exists, the result will be "T1". + private func generateGenericParameterName(_ baseName: String) -> String { + var name = baseName + let index = 1 + if translator.usedGenericParameterNames.contains(name) { + name = "\(baseName)\(index)" + } + return name + } + /// Prepare translation for the given Java class (or interface). init(javaClass: JavaClass, translator: JavaTranslator) throws { let fullName = javaClass.getName() @@ -392,7 +405,9 @@ extension JavaClassTranslator { let staticMemberWhereClause: String if !javaTypeParameters.isEmpty { let genericParameterNames = javaTypeParameters.compactMap { typeVar in - typeVar.getName() + let name = generateGenericParameterName(typeVar.getName()) + translator.usedGenericParameterNames.insert(typeVar.getName()) + return name } let genericArgumentClause = "<\(genericParameterNames.joined(separator: ", "))>" diff --git a/Sources/Java2SwiftLib/JavaTranslator.swift b/Sources/Java2SwiftLib/JavaTranslator.swift index 225d3868..48c2e8b0 100644 --- a/Sources/Java2SwiftLib/JavaTranslator.swift +++ b/Sources/Java2SwiftLib/JavaTranslator.swift @@ -63,6 +63,9 @@ package class JavaTranslator { /// TODO: Make JavaClass Hashable so we can index by the object? package var nestedClasses: [String: [JavaClass]] = [:] + /// The set of generic parameter names that have been used. + package var usedGenericParameterNames: Set = [] + package init( swiftModuleName: String, environment: JNIEnvironment, @@ -78,6 +81,7 @@ package class JavaTranslator { /// Clear out any per-file state when we want to start a new file. package func startNewFile() { importedSwiftModules = Self.defaultImportedSwiftModules + usedGenericParameterNames = [] } /// Simplistic logging for all entities that couldn't be translated. diff --git a/Sources/JavaKit/generated/JavaClass.swift b/Sources/JavaKit/generated/JavaClass.swift index 03d7f5e6..950cfa78 100644 --- a/Sources/JavaKit/generated/JavaClass.swift +++ b/Sources/JavaKit/generated/JavaClass.swift @@ -52,13 +52,16 @@ open class JavaClass: JavaObject { open func isRecord() -> Bool @JavaMethod - open func getClassLoader() -> JavaClassLoader! + open func isSealed() -> Bool @JavaMethod - open func newInstance() throws -> JavaObject! + open func getInterfaces() -> [JavaClass?] @JavaMethod - open func getInterfaces() -> [JavaClass?] + open func getClassLoader() -> JavaClassLoader! + + @JavaMethod + open func newInstance() throws -> JavaObject! @JavaMethod open func isMemberClass() -> Bool @@ -128,17 +131,14 @@ open class JavaClass: JavaObject { @JavaMethod open func getNestMembers() -> [JavaClass?] - - @JavaMethod - open func isSealed() -> Bool } extension JavaClass { @JavaStaticMethod - public func forName(_ arg0: String, _ arg1: Bool, _ arg2: JavaClassLoader?) throws -> JavaClass! where ObjectType == JavaClass + public func forName(_ arg0: String, _ arg1: Bool, _ arg2: JavaClassLoader?) throws -> JavaClass! where ObjectType == JavaClass @JavaStaticMethod - public func forName(_ arg0: String) throws -> JavaClass! where ObjectType == JavaClass + public func forName(_ arg0: String) throws -> JavaClass! where ObjectType == JavaClass @JavaStaticMethod - public func forPrimitiveName(_ arg0: String) -> JavaClass! where ObjectType == JavaClass + public func forPrimitiveName(_ arg0: String) -> JavaClass! where ObjectType == JavaClass } diff --git a/Sources/JavaKit/generated/JavaOptional.swift b/Sources/JavaKit/generated/JavaOptional.swift index bd77cfed..b82035bc 100644 --- a/Sources/JavaKit/generated/JavaOptional.swift +++ b/Sources/JavaKit/generated/JavaOptional.swift @@ -29,23 +29,23 @@ open class JavaOptional: JavaObject { } extension JavaClass { @JavaStaticMethod - public func of(_ arg0: JavaObject?) -> JavaOptional! where ObjectType == JavaOptional + public func of(_ arg0: JavaObject?) -> JavaOptional! where ObjectType == JavaOptional - public func ofOptional(_ arg0: JavaObject?) -> JavaObject? where ObjectType == JavaOptional { + public func ofOptional(_ arg0: JavaObject?) -> JavaObject? where ObjectType == JavaOptional { Optional(javaOptional: of(arg0)) } @JavaStaticMethod - public func empty() -> JavaOptional! where ObjectType == JavaOptional + public func empty() -> JavaOptional! where ObjectType == JavaOptional - public func emptyOptional() -> JavaObject? where ObjectType == JavaOptional { + public func emptyOptional() -> JavaObject? where ObjectType == JavaOptional { Optional(javaOptional: empty()) } @JavaStaticMethod - public func ofNullable(_ arg0: JavaObject?) -> JavaOptional! where ObjectType == JavaOptional + public func ofNullable(_ arg0: JavaObject?) -> JavaOptional! where ObjectType == JavaOptional - public func ofNullableOptional(_ arg0: JavaObject?) -> JavaObject? where ObjectType == JavaOptional { + public func ofNullableOptional(_ arg0: JavaObject?) -> JavaObject? where ObjectType == JavaOptional { Optional(javaOptional: ofNullable(arg0)) } } diff --git a/Sources/JavaKit/generated/JavaString.swift b/Sources/JavaKit/generated/JavaString.swift index 34d0080c..7a862cf5 100644 --- a/Sources/JavaKit/generated/JavaString.swift +++ b/Sources/JavaKit/generated/JavaString.swift @@ -52,16 +52,16 @@ open class JavaString: JavaObject { open func getChars(_ arg0: Int32, _ arg1: Int32, _ arg2: [UInt16], _ arg3: Int32) @JavaMethod - open func compareTo(_ arg0: JavaObject?) -> Int32 + open func compareTo(_ arg0: String) -> Int32 @JavaMethod - open func compareTo(_ arg0: String) -> Int32 + open func compareTo(_ arg0: JavaObject?) -> Int32 @JavaMethod - open func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32 + open func indexOf(_ arg0: String, _ arg1: Int32) -> Int32 @JavaMethod - open func indexOf(_ arg0: String) -> Int32 + open func indexOf(_ arg0: String, _ arg1: Int32, _ arg2: Int32) -> Int32 @JavaMethod open func indexOf(_ arg0: Int32) -> Int32 @@ -73,7 +73,7 @@ open class JavaString: JavaObject { open func indexOf(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32) -> Int32 @JavaMethod - open func indexOf(_ arg0: String, _ arg1: Int32) -> Int32 + open func indexOf(_ arg0: String) -> Int32 @JavaMethod open func charAt(_ arg0: Int32) -> UInt16 @@ -90,9 +90,6 @@ open class JavaString: JavaObject { @JavaMethod open func offsetByCodePoints(_ arg0: Int32, _ arg1: Int32) -> Int32 - @JavaMethod - open func getBytes() -> [Int8] - @JavaMethod open func getBytes(_ arg0: String) throws -> [Int8] @@ -100,11 +97,14 @@ open class JavaString: JavaObject { open func getBytes(_ arg0: Int32, _ arg1: Int32, _ arg2: [Int8], _ arg3: Int32) @JavaMethod - open func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool + open func getBytes() -> [Int8] @JavaMethod open func regionMatches(_ arg0: Int32, _ arg1: String, _ arg2: Int32, _ arg3: Int32) -> Bool + @JavaMethod + open func regionMatches(_ arg0: Bool, _ arg1: Int32, _ arg2: String, _ arg3: Int32, _ arg4: Int32) -> Bool + @JavaMethod open func startsWith(_ arg0: String) -> Bool @@ -112,22 +112,22 @@ open class JavaString: JavaObject { open func startsWith(_ arg0: String, _ arg1: Int32) -> Bool @JavaMethod - open func lastIndexOf(_ arg0: String) -> Int32 + open func lastIndexOf(_ arg0: Int32) -> Int32 @JavaMethod - open func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32 + open func lastIndexOf(_ arg0: String) -> Int32 @JavaMethod open func lastIndexOf(_ arg0: String, _ arg1: Int32) -> Int32 @JavaMethod - open func lastIndexOf(_ arg0: Int32) -> Int32 + open func lastIndexOf(_ arg0: Int32, _ arg1: Int32) -> Int32 @JavaMethod - open func substring(_ arg0: Int32) -> String + open func substring(_ arg0: Int32, _ arg1: Int32) -> String @JavaMethod - open func substring(_ arg0: Int32, _ arg1: Int32) -> String + open func substring(_ arg0: Int32) -> String @JavaMethod open func isEmpty() -> Bool @@ -215,39 +215,39 @@ open class JavaString: JavaObject { } } extension JavaClass { + @JavaStaticMethod + public func valueOf(_ arg0: JavaObject?) -> String + @JavaStaticMethod public func valueOf(_ arg0: Int64) -> String @JavaStaticMethod - public func valueOf(_ arg0: [UInt16]) -> String + public func valueOf(_ arg0: Int32) -> String @JavaStaticMethod - public func valueOf(_ arg0: JavaObject?) -> String + public func valueOf(_ arg0: UInt16) -> String @JavaStaticMethod public func valueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String @JavaStaticMethod - public func valueOf(_ arg0: Float) -> String + public func valueOf(_ arg0: Bool) -> String @JavaStaticMethod public func valueOf(_ arg0: Double) -> String @JavaStaticMethod - public func valueOf(_ arg0: UInt16) -> String - - @JavaStaticMethod - public func valueOf(_ arg0: Bool) -> String + public func valueOf(_ arg0: [UInt16]) -> String @JavaStaticMethod - public func valueOf(_ arg0: Int32) -> String + public func valueOf(_ arg0: Float) -> String @JavaStaticMethod public func format(_ arg0: String, _ arg1: [JavaObject?]) -> String @JavaStaticMethod - public func copyValueOf(_ arg0: [UInt16]) -> String + public func copyValueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String @JavaStaticMethod - public func copyValueOf(_ arg0: [UInt16], _ arg1: Int32, _ arg2: Int32) -> String + public func copyValueOf(_ arg0: [UInt16]) -> String } diff --git a/Sources/JavaKitCollection/generated/BitSet.swift b/Sources/JavaKitCollection/generated/BitSet.swift index c7e54b95..d5211c28 100644 --- a/Sources/JavaKitCollection/generated/BitSet.swift +++ b/Sources/JavaKitCollection/generated/BitSet.swift @@ -4,38 +4,20 @@ import JavaRuntime @JavaClass("java.util.BitSet") open class BitSet: JavaObject { - @JavaMethod - @_nonoverride public convenience init(environment: JNIEnvironment? = nil) - @JavaMethod @_nonoverride public convenience init(_ arg0: Int32, environment: JNIEnvironment? = nil) @JavaMethod - open func cardinality() -> Int32 - - @JavaMethod - open func nextSetBit(_ arg0: Int32) -> Int32 - - @JavaMethod - open func toLongArray() -> [Int64] - - @JavaMethod - open func previousSetBit(_ arg0: Int32) -> Int32 - - @JavaMethod - open func previousClearBit(_ arg0: Int32) -> Int32 - - @JavaMethod - open func intersects(_ arg0: BitSet?) -> Bool + @_nonoverride public convenience init(environment: JNIEnvironment? = nil) @JavaMethod open func size() -> Int32 @JavaMethod - open func get(_ arg0: Int32, _ arg1: Int32) -> BitSet! + open func get(_ arg0: Int32) -> Bool @JavaMethod - open func get(_ arg0: Int32) -> Bool + open func get(_ arg0: Int32, _ arg1: Int32) -> BitSet! @JavaMethod open override func equals(_ arg0: JavaObject?) -> Bool @@ -52,9 +34,6 @@ open class BitSet: JavaObject { @JavaMethod open override func clone() -> JavaObject! - @JavaMethod - open func clear(_ arg0: Int32) - @JavaMethod open func clear(_ arg0: Int32, _ arg1: Int32) @@ -62,19 +41,22 @@ open class BitSet: JavaObject { open func clear() @JavaMethod - open func isEmpty() -> Bool + open func clear(_ arg0: Int32) @JavaMethod - open func set(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool) + open func isEmpty() -> Bool @JavaMethod - open func set(_ arg0: Int32, _ arg1: Int32) + open func set(_ arg0: Int32, _ arg1: Bool) @JavaMethod open func set(_ arg0: Int32) @JavaMethod - open func set(_ arg0: Int32, _ arg1: Bool) + open func set(_ arg0: Int32, _ arg1: Int32) + + @JavaMethod + open func set(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool) @JavaMethod open func flip(_ arg0: Int32, _ arg1: Int32) @@ -99,6 +81,24 @@ open class BitSet: JavaObject { @JavaMethod open func andNot(_ arg0: BitSet?) + + @JavaMethod + open func cardinality() -> Int32 + + @JavaMethod + open func nextSetBit(_ arg0: Int32) -> Int32 + + @JavaMethod + open func toLongArray() -> [Int64] + + @JavaMethod + open func previousSetBit(_ arg0: Int32) -> Int32 + + @JavaMethod + open func previousClearBit(_ arg0: Int32) -> Int32 + + @JavaMethod + open func intersects(_ arg0: BitSet?) -> Bool } extension JavaClass { @JavaStaticMethod diff --git a/Sources/JavaKitCollection/generated/HashMap.swift b/Sources/JavaKitCollection/generated/HashMap.swift index e8cfa118..f781ccfc 100644 --- a/Sources/JavaKitCollection/generated/HashMap.swift +++ b/Sources/JavaKitCollection/generated/HashMap.swift @@ -61,57 +61,7 @@ open class HashMap: JavaObject { @JavaMethod open func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject! } -extension HashMap { - @JavaClass("java.util.AbstractMap$SimpleEntry") - open class SimpleEntry: JavaObject { - @JavaMethod - @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) - - @JavaMethod - open override func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - open override func toString() -> String - - @JavaMethod - open override func hashCode() -> Int32 - - @JavaMethod - open func getValue() -> JavaObject! - - @JavaMethod - open func getKey() -> JavaObject! - - @JavaMethod - open func setValue(_ arg0: JavaObject?) -> JavaObject! - } -} -extension HashMap { - @JavaClass("java.util.AbstractMap$SimpleImmutableEntry") - open class SimpleImmutableEntry: JavaObject { - @JavaMethod - @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) - - @JavaMethod - open override func equals(_ arg0: JavaObject?) -> Bool - - @JavaMethod - open override func toString() -> String - - @JavaMethod - open override func hashCode() -> Int32 - - @JavaMethod - open func getValue() -> JavaObject! - - @JavaMethod - open func getKey() -> JavaObject! - - @JavaMethod - open func setValue(_ arg0: JavaObject?) -> JavaObject! - } -} extension JavaClass { @JavaStaticMethod - public func newHashMap(_ arg0: Int32) -> HashMap! where ObjectType == HashMap + public func newHashMap(_ arg0: Int32) -> HashMap! where ObjectType == HashMap } diff --git a/Sources/JavaKitCollection/generated/HashSet.swift b/Sources/JavaKitCollection/generated/HashSet.swift index 97b15dff..86395ed0 100644 --- a/Sources/JavaKitCollection/generated/HashSet.swift +++ b/Sources/JavaKitCollection/generated/HashSet.swift @@ -48,5 +48,5 @@ open class HashSet: JavaObject { } extension JavaClass { @JavaStaticMethod - public func newHashSet(_ arg0: Int32) -> HashSet! where ObjectType == HashSet + public func newHashSet(_ arg0: Int32) -> HashSet! where ObjectType == HashSet } diff --git a/Sources/JavaKitCollection/generated/JavaSet.swift b/Sources/JavaKitCollection/generated/JavaSet.swift index d924d2d1..8e39237a 100644 --- a/Sources/JavaKitCollection/generated/JavaSet.swift +++ b/Sources/JavaKitCollection/generated/JavaSet.swift @@ -51,41 +51,41 @@ public struct JavaSet { } extension JavaClass { @JavaStaticMethod - public func copyOf(_ arg0: JavaCollection?) -> JavaSet! where ObjectType == JavaSet + public func copyOf(_ arg0: JavaCollection?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of() -> JavaSet! where ObjectType == JavaSet + public func of() -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?, _ arg9: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?, _ arg9: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: [JavaObject?]) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: [JavaObject?]) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?) -> JavaSet! where ObjectType == JavaSet @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaSet! where ObjectType == JavaSet + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaSet! where ObjectType == JavaSet } diff --git a/Sources/JavaKitCollection/generated/List.swift b/Sources/JavaKitCollection/generated/List.swift index b264f88e..156f774a 100644 --- a/Sources/JavaKitCollection/generated/List.swift +++ b/Sources/JavaKitCollection/generated/List.swift @@ -102,41 +102,41 @@ public struct List { } extension JavaClass { @JavaStaticMethod - public func copyOf(_ arg0: JavaCollection?) -> List! where ObjectType == List + public func copyOf(_ arg0: JavaCollection?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of() -> List! where ObjectType == List + public func of() -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: [JavaObject?]) -> List! where ObjectType == List + public func of(_ arg0: [JavaObject?]) -> List! where ObjectType == List @JavaStaticMethod - public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?, _ arg9: JavaObject?) -> List! where ObjectType == List + public func of(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?, _ arg9: JavaObject?) -> List! where ObjectType == List } diff --git a/Sources/JavaKitCollection/generated/TreeMap.swift b/Sources/JavaKitCollection/generated/TreeMap.swift index 79560905..ab9656b2 100644 --- a/Sources/JavaKitCollection/generated/TreeMap.swift +++ b/Sources/JavaKitCollection/generated/TreeMap.swift @@ -70,3 +70,53 @@ open class TreeMap: JavaObject { @JavaMethod open func lastKey() -> JavaObject! } +extension TreeMap { + @JavaClass("java.util.AbstractMap$SimpleEntry") + open class SimpleEntry: JavaObject { + @JavaMethod + @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) + + @JavaMethod + open override func equals(_ arg0: JavaObject?) -> Bool + + @JavaMethod + open override func toString() -> String + + @JavaMethod + open override func hashCode() -> Int32 + + @JavaMethod + open func getValue() -> JavaObject! + + @JavaMethod + open func getKey() -> JavaObject! + + @JavaMethod + open func setValue(_ arg0: JavaObject?) -> JavaObject! + } +} +extension TreeMap { + @JavaClass("java.util.AbstractMap$SimpleImmutableEntry") + open class SimpleImmutableEntry: JavaObject { + @JavaMethod + @_nonoverride public convenience init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil) + + @JavaMethod + open override func equals(_ arg0: JavaObject?) -> Bool + + @JavaMethod + open override func toString() -> String + + @JavaMethod + open override func hashCode() -> Int32 + + @JavaMethod + open func getValue() -> JavaObject! + + @JavaMethod + open func getKey() -> JavaObject! + + @JavaMethod + open func setValue(_ arg0: JavaObject?) -> JavaObject! + } +} diff --git a/Sources/JavaKitNetwork/generated/URLClassLoader.swift b/Sources/JavaKitNetwork/generated/URLClassLoader.swift index eac9c14c..de58c540 100644 --- a/Sources/JavaKitNetwork/generated/URLClassLoader.swift +++ b/Sources/JavaKitNetwork/generated/URLClassLoader.swift @@ -4,18 +4,24 @@ import JavaKitCollection import JavaRuntime @JavaClass("java.net.URLClassLoader") -open class URLClassLoader: JavaObject { +open class URLClassLoader: JavaClassLoader { + @JavaMethod + @_nonoverride public convenience init(_ arg0: String, _ arg1: [URL?], _ arg2: JavaClassLoader?, environment: JNIEnvironment? = nil) + + @JavaMethod + @_nonoverride public convenience init(_ arg0: [URL?], _ arg1: JavaClassLoader?, environment: JNIEnvironment? = nil) + @JavaMethod @_nonoverride public convenience init(_ arg0: [URL?], environment: JNIEnvironment? = nil) @JavaMethod - open func findResource(_ arg0: String) -> URL! + open override func findResource(_ arg0: String) -> URL! @JavaMethod - open func findClass(_ arg0: String) throws -> JavaClass! + open override func findClass(_ arg0: String) throws -> JavaClass! @JavaMethod - open func findResources(_ arg0: String) throws -> Enumeration! + open override func findResources(_ arg0: String) throws -> Enumeration! @JavaMethod open func close() throws