Skip to content

Commit c3337b6

Browse files
DougGregorDougGregor
committed
Import java.util.zip.ZipEntry and regenerate JavaKit sources
1 parent ea6cfaa commit c3337b6

File tree

9 files changed

+319
-89
lines changed

9 files changed

+319
-89
lines changed

‎Sources/JavaKit/generated/JavaCharacter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,7 @@ extension JavaCharacter {
16121612
} else {
16131613
try! JavaVirtualMachine.shared().environment()
16141614
}
1615-
let classObj = try! JavaClass<Self>(environment: _environment)
1615+
let classObj = try! JavaClass<UnicodeScript>(environment: _environment)
16161616
switch enumValue {
16171617
case .COMMON:
16181618
if let COMMON = classObj.COMMON {

‎Sources/JavaKitCollection/generated/HashMap.swift

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,92 @@ public struct HashMap<K: AnyJavaObject, V: AnyJavaObject> {
8888
@JavaMethod
8989
public func wait() throws
9090
}
91+
extension HashMap {
92+
@JavaClass("java.util.AbstractMap$SimpleEntry", extends: JavaObject.self)
93+
public struct SimpleEntry<K: AnyJavaObject, V: AnyJavaObject> {
94+
@JavaMethod
95+
public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
96+
97+
@JavaMethod
98+
public func equals(_ arg0: JavaObject?) -> Bool
99+
100+
@JavaMethod
101+
public func toString() -> String
102+
103+
@JavaMethod
104+
public func hashCode() -> Int32
105+
106+
@JavaMethod
107+
public func getValue() -> JavaObject!
108+
109+
@JavaMethod
110+
public func getKey() -> JavaObject!
111+
112+
@JavaMethod
113+
public func setValue(_ arg0: JavaObject?) -> JavaObject!
114+
115+
@JavaMethod
116+
public func getClass() -> JavaClass<JavaObject>!
117+
118+
@JavaMethod
119+
public func notify()
120+
121+
@JavaMethod
122+
public func notifyAll()
123+
124+
@JavaMethod
125+
public func wait(_ arg0: Int64) throws
126+
127+
@JavaMethod
128+
public func wait(_ arg0: Int64, _ arg1: Int32) throws
129+
130+
@JavaMethod
131+
public func wait() throws
132+
}
133+
}
134+
extension HashMap {
135+
@JavaClass("java.util.AbstractMap$SimpleImmutableEntry", extends: JavaObject.self)
136+
public struct SimpleImmutableEntry<K: AnyJavaObject, V: AnyJavaObject> {
137+
@JavaMethod
138+
public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
139+
140+
@JavaMethod
141+
public func equals(_ arg0: JavaObject?) -> Bool
142+
143+
@JavaMethod
144+
public func toString() -> String
145+
146+
@JavaMethod
147+
public func hashCode() -> Int32
148+
149+
@JavaMethod
150+
public func getValue() -> JavaObject!
151+
152+
@JavaMethod
153+
public func getKey() -> JavaObject!
154+
155+
@JavaMethod
156+
public func setValue(_ arg0: JavaObject?) -> JavaObject!
157+
158+
@JavaMethod
159+
public func getClass() -> JavaClass<JavaObject>!
160+
161+
@JavaMethod
162+
public func notify()
163+
164+
@JavaMethod
165+
public func notifyAll()
166+
167+
@JavaMethod
168+
public func wait(_ arg0: Int64) throws
169+
170+
@JavaMethod
171+
public func wait(_ arg0: Int64, _ arg1: Int32) throws
172+
173+
@JavaMethod
174+
public func wait() throws
175+
}
176+
}
91177
extension JavaClass {
92178
@JavaStaticMethod
93179
public func newHashMap<K: AnyJavaObject, V: AnyJavaObject>(_ arg0: Int32) -> HashMap<JavaObject, JavaObject>! where ObjectType == HashMap<K, V>

‎Sources/JavaKitCollection/generated/TreeMap.swift

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -106,89 +106,3 @@ public struct TreeMap<K: AnyJavaObject, V: AnyJavaObject> {
106106
@JavaMethod
107107
public func getOrDefault(_ arg0: JavaObject?, _ arg1: JavaObject?) -> JavaObject!
108108
}
109-
extension TreeMap {
110-
@JavaClass("java.util.AbstractMap$SimpleEntry", extends: JavaObject.self)
111-
public struct SimpleEntry<K: AnyJavaObject, V: AnyJavaObject> {
112-
@JavaMethod
113-
public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
114-
115-
@JavaMethod
116-
public func equals(_ arg0: JavaObject?) -> Bool
117-
118-
@JavaMethod
119-
public func toString() -> String
120-
121-
@JavaMethod
122-
public func hashCode() -> Int32
123-
124-
@JavaMethod
125-
public func getValue() -> JavaObject!
126-
127-
@JavaMethod
128-
public func getKey() -> JavaObject!
129-
130-
@JavaMethod
131-
public func setValue(_ arg0: JavaObject?) -> JavaObject!
132-
133-
@JavaMethod
134-
public func getClass() -> JavaClass<JavaObject>!
135-
136-
@JavaMethod
137-
public func notify()
138-
139-
@JavaMethod
140-
public func notifyAll()
141-
142-
@JavaMethod
143-
public func wait(_ arg0: Int64) throws
144-
145-
@JavaMethod
146-
public func wait(_ arg0: Int64, _ arg1: Int32) throws
147-
148-
@JavaMethod
149-
public func wait() throws
150-
}
151-
}
152-
extension TreeMap {
153-
@JavaClass("java.util.AbstractMap$SimpleImmutableEntry", extends: JavaObject.self)
154-
public struct SimpleImmutableEntry<K: AnyJavaObject, V: AnyJavaObject> {
155-
@JavaMethod
156-
public init(_ arg0: JavaObject?, _ arg1: JavaObject?, environment: JNIEnvironment? = nil)
157-
158-
@JavaMethod
159-
public func equals(_ arg0: JavaObject?) -> Bool
160-
161-
@JavaMethod
162-
public func toString() -> String
163-
164-
@JavaMethod
165-
public func hashCode() -> Int32
166-
167-
@JavaMethod
168-
public func getValue() -> JavaObject!
169-
170-
@JavaMethod
171-
public func getKey() -> JavaObject!
172-
173-
@JavaMethod
174-
public func setValue(_ arg0: JavaObject?) -> JavaObject!
175-
176-
@JavaMethod
177-
public func getClass() -> JavaClass<JavaObject>!
178-
179-
@JavaMethod
180-
public func notify()
181-
182-
@JavaMethod
183-
public func notifyAll()
184-
185-
@JavaMethod
186-
public func wait(_ arg0: Int64) throws
187-
188-
@JavaMethod
189-
public func wait(_ arg0: Int64, _ arg1: Int32) throws
190-
191-
@JavaMethod
192-
public func wait() throws
193-
}
194-
}

‎Sources/JavaKitJar/Java2Swift.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"java.util.jar.JarFile" : "JarFile",
66
"java.util.jar.JarInputStream" : "JarInputStream",
77
"java.util.jar.JarOutputStream" : "JarOutputStream",
8-
"java.util.jar.Manifest" : "Manifest"
8+
"java.util.jar.Manifest" : "Manifest",
9+
"java.util.zip.ZipEntry" : "ZipEntry"
910
}
1011
}

‎Sources/JavaKitJar/generated/JarEntry.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
import JavaKit
33
import JavaRuntime
44

5-
@JavaClass("java.util.jar.JarEntry", extends: JavaObject.self)
5+
@JavaClass("java.util.jar.JarEntry", extends: ZipEntry.self)
66
public struct JarEntry {
77
@JavaMethod
88
public init(_ arg0: JarEntry?, environment: JNIEnvironment? = nil)
99

10+
@JavaMethod
11+
public init(_ arg0: ZipEntry?, environment: JNIEnvironment? = nil)
12+
1013
@JavaMethod
1114
public init(_ arg0: String, environment: JNIEnvironment? = nil)
1215

‎Sources/JavaKitJar/generated/JarFile.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ public struct JarFile {
1717
@JavaMethod
1818
public func getManifest() throws -> Manifest!
1919

20+
@JavaMethod
21+
public func getEntry(_ arg0: String) -> ZipEntry!
22+
2023
@JavaMethod
2124
public func getJarEntry(_ arg0: String) -> JarEntry!
2225

‎Sources/JavaKitJar/generated/JarInputStream.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import JavaRuntime
44

55
@JavaClass("java.util.jar.JarInputStream", extends: JavaObject.self)
66
public struct JarInputStream {
7+
@JavaMethod
8+
public func getNextEntry() throws -> ZipEntry!
9+
710
@JavaMethod
811
public func getNextJarEntry() throws -> JarEntry!
912

‎Sources/JavaKitJar/generated/JarOutputStream.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import JavaRuntime
44

55
@JavaClass("java.util.jar.JarOutputStream", extends: JavaObject.self)
66
public struct JarOutputStream {
7+
@JavaMethod
8+
public func putNextEntry(_ arg0: ZipEntry?) throws
9+
710
@JavaMethod
811
public func closeEntry() throws
912

0 commit comments

Comments
 (0)