Skip to content

Commit 9ef273f

Browse files
DougGregorDougGregor
committed
Import java.util.List since it's used a lot
1 parent 26acffb commit 9ef273f

File tree

5 files changed

+177
-2
lines changed

5 files changed

+177
-2
lines changed

‎Sources/JavaKitCollection/Java2Swift.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"java.util.Collection" : "JavaCollection",
44
"java.util.Enumeration" : "Enumeration",
55
"java.util.Iterator" : "JavaIterator",
6+
"java.util.List" : "List",
67
"java.util.ListIterator" : "ListIterator",
78
"java.util.Queue" : "Queue",
89
"java.util.RandomAccess" : "RandomAccess",
@@ -13,7 +14,6 @@
1314
"java.util.Dictionary" : "JavaDictionary",
1415
"java.util.HashMap" : "HashMap",
1516
"java.util.HashSet" : "HashSet",
16-
"java.util.LinkedList" : "LinkedList",
1717
"java.util.PriorityQueue" : "PriorityQueue",
1818
"java.util.Stack" : "Stack",
1919
"java.util.TreeMap" : "TreeMap",

‎Sources/JavaKitCollection/generated/ArrayList.swift

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

5-
@JavaClass("java.util.ArrayList", implements: RandomAccess.self)
5+
@JavaClass("java.util.ArrayList", implements: List<JavaObject>.self, RandomAccess.self)
66
public struct ArrayList<E: AnyJavaObject> {
77
@JavaMethod
88
public init(_ arg0: JavaCollection<JavaObject>?, environment: JNIEnvironment)
@@ -52,6 +52,9 @@ public struct ArrayList<E: AnyJavaObject> {
5252
@JavaMethod
5353
public func add(_ arg0: Int32, _ arg1: JavaObject?)
5454

55+
@JavaMethod
56+
public func subList(_ arg0: Int32, _ arg1: Int32) -> List<JavaObject>?
57+
5558
@JavaMethod
5659
public func toArray() -> [JavaObject?]
5760

@@ -132,4 +135,7 @@ public struct ArrayList<E: AnyJavaObject> {
132135

133136
@JavaMethod
134137
public func wait() throws
138+
139+
@JavaMethod
140+
public func reversed() -> List<JavaObject>?
135141
}

‎Sources/JavaKitCollection/generated/List.swift

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
// Auto-generated by Java-to-Swift wrapper generator.
2+
import JavaKit
3+
import JavaRuntime
4+
5+
@JavaInterface("java.util.List")
6+
public struct List<E: AnyJavaObject> {
7+
@JavaMethod
8+
public func remove(_ arg0: Int32) -> JavaObject?
9+
10+
@JavaMethod
11+
public func remove(_ arg0: JavaObject?) -> Bool
12+
13+
@JavaMethod
14+
public func size() -> Int32
15+
16+
@JavaMethod
17+
public func get(_ arg0: Int32) -> JavaObject?
18+
19+
@JavaMethod
20+
public func equals(_ arg0: JavaObject?) -> Bool
21+
22+
@JavaMethod
23+
public func hashCode() -> Int32
24+
25+
@JavaMethod
26+
public func indexOf(_ arg0: JavaObject?) -> Int32
27+
28+
@JavaMethod
29+
public func clear()
30+
31+
@JavaMethod
32+
public func lastIndexOf(_ arg0: JavaObject?) -> Int32
33+
34+
@JavaMethod
35+
public func isEmpty() -> Bool
36+
37+
@JavaMethod
38+
public func add(_ arg0: JavaObject?) -> Bool
39+
40+
@JavaMethod
41+
public func add(_ arg0: Int32, _ arg1: JavaObject?)
42+
43+
@JavaMethod
44+
public func subList(_ arg0: Int32, _ arg1: Int32) -> List<JavaObject>?
45+
46+
@JavaMethod
47+
public func toArray() -> [JavaObject?]
48+
49+
@JavaMethod
50+
public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?]
51+
52+
@JavaMethod
53+
public func iterator() -> JavaIterator<JavaObject>?
54+
55+
@JavaMethod
56+
public func contains(_ arg0: JavaObject?) -> Bool
57+
58+
@JavaMethod
59+
public func addAll(_ arg0: Int32, _ arg1: JavaCollection<JavaObject>?) -> Bool
60+
61+
@JavaMethod
62+
public func addAll(_ arg0: JavaCollection<JavaObject>?) -> Bool
63+
64+
@JavaMethod
65+
public func set(_ arg0: Int32, _ arg1: JavaObject?) -> JavaObject?
66+
67+
@JavaMethod
68+
public func getFirst() -> JavaObject?
69+
70+
@JavaMethod
71+
public func getLast() -> JavaObject?
72+
73+
@JavaMethod
74+
public func addFirst(_ arg0: JavaObject?)
75+
76+
@JavaMethod
77+
public func addLast(_ arg0: JavaObject?)
78+
79+
@JavaMethod
80+
public func removeFirst() -> JavaObject?
81+
82+
@JavaMethod
83+
public func removeLast() -> JavaObject?
84+
85+
@JavaMethod
86+
public func removeAll(_ arg0: JavaCollection<JavaObject>?) -> Bool
87+
88+
@JavaMethod
89+
public func retainAll(_ arg0: JavaCollection<JavaObject>?) -> Bool
90+
91+
@JavaMethod
92+
public func listIterator() -> ListIterator<JavaObject>?
93+
94+
@JavaMethod
95+
public func listIterator(_ arg0: Int32) -> ListIterator<JavaObject>?
96+
97+
@JavaMethod
98+
public func reversed() -> List<JavaObject>?
99+
100+
@JavaMethod
101+
public func containsAll(_ arg0: JavaCollection<JavaObject>?) -> Bool
102+
}
103+
extension JavaClass {
104+
@JavaStaticMethod
105+
public func copyOf<E: AnyJavaObject>(_ arg0: JavaCollection<JavaObject>?) -> List<JavaObject>? where ObjectType == List<E>
106+
107+
@JavaStaticMethod
108+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
109+
110+
@JavaStaticMethod
111+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
112+
113+
@JavaStaticMethod
114+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
115+
116+
@JavaStaticMethod
117+
public func of<E: AnyJavaObject>() -> List<JavaObject>? where ObjectType == List<E>
118+
119+
@JavaStaticMethod
120+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
121+
122+
@JavaStaticMethod
123+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
124+
125+
@JavaStaticMethod
126+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
127+
128+
@JavaStaticMethod
129+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
130+
131+
@JavaStaticMethod
132+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
133+
134+
@JavaStaticMethod
135+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
136+
137+
@JavaStaticMethod
138+
public func of<E: AnyJavaObject>(_ arg0: [JavaObject?]) -> List<JavaObject>? where ObjectType == List<E>
139+
140+
@JavaStaticMethod
141+
public func of<E: AnyJavaObject>(_ arg0: JavaObject?, _ arg1: JavaObject?, _ arg2: JavaObject?, _ arg3: JavaObject?, _ arg4: JavaObject?, _ arg5: JavaObject?, _ arg6: JavaObject?, _ arg7: JavaObject?, _ arg8: JavaObject?, _ arg9: JavaObject?) -> List<JavaObject>? where ObjectType == List<E>
142+
}

‎Sources/JavaKitCollection/generated/Stack.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ public struct Stack<E: AnyJavaObject> {
9494
@JavaMethod
9595
public func add(_ arg0: JavaObject?) -> Bool
9696

97+
@JavaMethod
98+
public func subList(_ arg0: Int32, _ arg1: Int32) -> List<JavaObject>?
99+
97100
@JavaMethod
98101
public func toArray(_ arg0: [JavaObject?]) -> [JavaObject?]
99102

@@ -186,4 +189,7 @@ public struct Stack<E: AnyJavaObject> {
186189

187190
@JavaMethod
188191
public func removeLast() -> JavaObject?
192+
193+
@JavaMethod
194+
public func reversed() -> List<JavaObject>?
189195
}

‎Tests/Java2SwiftTests/Java2SwiftTests.swift

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,33 @@ class Java2SwiftTests: XCTestCase {
6363
]
6464
)
6565
}
66+
67+
func testLinkedList() throws {
68+
try assertTranslatedClass(
69+
MyLinkedList<JavaObject>.self,
70+
swiftTypeName: "JavaLinkedList",
71+
translatedClasses: [
72+
"java.lang.Object": ("JavaObject", nil, true),
73+
"java.util.List": ("JavaList", nil, true),
74+
],
75+
expectedChunks: [
76+
"""
77+
@JavaMethod
78+
public func subList(_ arg0: Int32, _ arg1: Int32) -> JavaList<JavaObject>?
79+
"""
80+
]
81+
)
82+
}
6683
}
6784

6885
@JavaClass("java.util.ArrayList")
6986
public struct MyArrayList<E: AnyJavaObject> {
7087
}
7188

89+
@JavaClass("java.util.LinkedList")
90+
public struct MyLinkedList<E: AnyJavaObject> {
91+
}
92+
7293
/// Translate a Java class and assert that the translated output contains
7394
/// each of the expected "chunks" of text.
7495
func assertTranslatedClass<JavaClassType: AnyJavaObject>(

0 commit comments

Comments
 (0)