Skip to content

Commit 0851e2d

Browse files
johnno1962johnno1962
committed
Rework for use with toolchain beta 2
1 parent e603844 commit 0851e2d

File tree

189 files changed

+25506
-18987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+25506
-18987
lines changed

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import PackageDescription
1111
let package = Package(
1212
name: "java_lang",
1313
dependencies: [
14-
.Package(url: "https://github.com/SwiftJava/java_swift.git", versions: Version(2,0,0)..<Version(3,0,0)),
14+
.Package(url: "https://github.com/SwiftJava/java_swift.git", versions: Version(2,1,0)..<Version(3,0,0)),
1515
// Package(url: "https://github.com/SwiftJava/java_util.git", versions: Version(1,0,0)..<Version(2,0,0)),
1616
// Package(url: "https://github.com/SwiftJava/java_io.git", versions: Version(1,0,0)..<Version(2,0,0)),
1717
// Package(url: "https://github.com/SwiftJava/java_net.git", versions: Version(1,0,0)..<Version(2,0,0)),

‎Sources/AbstractMethodError.swift

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,43 @@ open class AbstractMethodError: IncompatibleClassChangeError {
2424

2525
/// static final long java.lang.Error.serialVersionUID
2626

27-
/// private static final long java.lang.Throwable.serialVersionUID
28-
29-
/// private java.lang.String java.lang.Throwable.detailMessage
30-
31-
/// private static final java.lang.StackTraceElement[] java.lang.Throwable.UNASSIGNED_STACK
27+
// Skipping field: true true false false false false
3228

33-
/// private java.lang.Throwable java.lang.Throwable.cause
29+
/// static final boolean java.lang.Throwable.$assertionsDisabled
3430

35-
/// private java.lang.StackTraceElement[] java.lang.Throwable.stackTrace
31+
// Skipping field: true false false false false false
3632

37-
/// private static final java.util.List java.lang.Throwable.SUPPRESSED_SENTINEL
33+
/// private static final java.lang.String java.lang.Throwable.CAUSE_CAPTION
3834

39-
/// private java.util.List java.lang.Throwable.suppressedExceptions
35+
/// private static final java.lang.Throwable[] java.lang.Throwable.EMPTY_THROWABLE_ARRAY
4036

4137
/// private static final java.lang.String java.lang.Throwable.NULL_CAUSE_MESSAGE
4238

4339
/// private static final java.lang.String java.lang.Throwable.SELF_SUPPRESSION_MESSAGE
4440

45-
/// private static final java.lang.String java.lang.Throwable.CAUSE_CAPTION
46-
4741
/// private static final java.lang.String java.lang.Throwable.SUPPRESSED_CAPTION
4842

49-
/// private static final java.lang.Throwable[] java.lang.Throwable.EMPTY_THROWABLE_ARRAY
43+
/// private static final java.util.List java.lang.Throwable.SUPPRESSED_SENTINEL
5044

51-
/// static final boolean java.lang.Throwable.$assertionsDisabled
45+
/// private static final java.lang.StackTraceElement[] java.lang.Throwable.UNASSIGNED_STACK
46+
47+
/// private static final long java.lang.Throwable.serialVersionUID
48+
49+
/// private java.lang.Throwable java.lang.Throwable.cause
50+
51+
/// private java.lang.String java.lang.Throwable.detailMessage
52+
53+
/// private java.lang.StackTraceElement[] java.lang.Throwable.stackTrace
54+
55+
/// private java.util.List java.lang.Throwable.suppressedExceptions
5256

5357
/// public java.lang.AbstractMethodError()
5458

5559
private static var new_MethodID_1: jmethodID?
5660

5761
public convenience init() {
58-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5962
var __locals = [jobject]()
63+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
6064
let __object = JNIMethod.NewObject( className: "java/lang/AbstractMethodError", classCache: &AbstractMethodError.AbstractMethodErrorJNIClass, methodSig: "()V", methodCache: &AbstractMethodError.new_MethodID_1, args: &__args, locals: &__locals )
6165
self.init( javaObject: __object )
6266
JNI.DeleteLocalRef( __object )
@@ -67,8 +71,8 @@ open class AbstractMethodError: IncompatibleClassChangeError {
6771
private static var new_MethodID_2: jmethodID?
6872

6973
public convenience init( s: String? ) {
70-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
7174
var __locals = [jobject]()
75+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
7276
__args[0] = JNIType.toJava( value: s, locals: &__locals )
7377
let __object = JNIMethod.NewObject( className: "java/lang/AbstractMethodError", classCache: &AbstractMethodError.AbstractMethodErrorJNIClass, methodSig: "(Ljava/lang/String;)V", methodCache: &AbstractMethodError.new_MethodID_2, args: &__args, locals: &__locals )
7478
self.init( javaObject: __object )

‎Sources/AccessibleObject.swift

Lines changed: 85 additions & 73 deletions
Large diffs are not rendered by default.

‎Sources/AnnotatedArrayType.swift

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,23 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
2323
private static var getAnnotatedGenericComponentType_MethodID_2: jmethodID?
2424

2525
open func getAnnotatedGenericComponentType() -> AnnotatedType! {
26-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
2726
var __locals = [jobject]()
27+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
2828
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotatedGenericComponentType", methodSig: "()Ljava/lang/reflect/AnnotatedType;", methodCache: &AnnotatedArrayTypeForward.getAnnotatedGenericComponentType_MethodID_2, args: &__args, locals: &__locals )
2929
defer { JNI.DeleteLocalRef( __return ) }
3030
return __return != nil ? AnnotatedTypeForward( javaObject: __return ) : nil
3131
}
3232

3333

34-
/// public abstract java.lang.reflect.Type java.lang.reflect.AnnotatedType.getType()
35-
36-
private static var getType_MethodID_3: jmethodID?
37-
38-
override open func getType() -> Type! {
39-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
40-
var __locals = [jobject]()
41-
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getType", methodSig: "()Ljava/lang/reflect/Type;", methodCache: &AnnotatedArrayTypeForward.getType_MethodID_3, args: &__args, locals: &__locals )
42-
defer { JNI.DeleteLocalRef( __return ) }
43-
return __return != nil ? TypeForward( javaObject: __return ) : nil
44-
}
45-
46-
4734
/// public abstract java.lang.annotation.Annotation java.lang.reflect.AnnotatedElement.getAnnotation(java.lang.Class)
4835

49-
private static var getAnnotation_MethodID_4: jmethodID?
36+
private static var getAnnotation_MethodID_3: jmethodID?
5037

5138
override open func getAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
52-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5339
var __locals = [jobject]()
40+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
5441
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
55-
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotation_MethodID_4, args: &__args, locals: &__locals )
42+
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotation_MethodID_3, args: &__args, locals: &__locals )
5643
defer { JNI.DeleteLocalRef( __return ) }
5744
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
5845
}
@@ -61,59 +48,43 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
6148
return getAnnotation( arg0: _arg0 )
6249
}
6350

64-
/// public default boolean java.lang.reflect.AnnotatedElement.isAnnotationPresent(java.lang.Class)
51+
/// public abstract java.lang.annotation.Annotation[] java.lang.reflect.AnnotatedElement.getAnnotations()
6552

66-
private static var isAnnotationPresent_MethodID_5: jmethodID?
53+
private static var getAnnotations_MethodID_4: jmethodID?
6754

68-
override open func isAnnotationPresent( arg0: java_swift.JavaClass? ) -> Bool {
69-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
55+
override open func getAnnotations() -> [Annotation]! {
7056
var __locals = [jobject]()
71-
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
72-
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "isAnnotationPresent", methodSig: "(Ljava/lang/Class;)Z", methodCache: &AnnotatedArrayTypeForward.isAnnotationPresent_MethodID_5, args: &__args, locals: &__locals )
73-
return JNIType.toSwift( type: Bool(), from: __return )
57+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
58+
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotations", methodSig: "()[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotations_MethodID_4, args: &__args, locals: &__locals )
59+
return JNIType.toSwift( type: [AnnotationForward].self, from: __return )
7460
}
7561

76-
override open func isAnnotationPresent( _ _arg0: java_swift.JavaClass? ) -> Bool {
77-
return isAnnotationPresent( arg0: _arg0 )
78-
}
7962

8063
/// public default java.lang.annotation.Annotation[] java.lang.reflect.AnnotatedElement.getAnnotationsByType(java.lang.Class)
8164

82-
private static var getAnnotationsByType_MethodID_6: jmethodID?
65+
private static var getAnnotationsByType_MethodID_5: jmethodID?
8366

8467
override open func getAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
85-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
8668
var __locals = [jobject]()
69+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
8770
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
88-
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotationsByType_MethodID_6, args: &__args, locals: &__locals )
89-
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
71+
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotationsByType_MethodID_5, args: &__args, locals: &__locals )
72+
return JNIType.toSwift( type: [AnnotationForward].self, from: __return )
9073
}
9174

9275
override open func getAnnotationsByType( _ _arg0: java_swift.JavaClass? ) -> [Annotation]! {
9376
return getAnnotationsByType( arg0: _arg0 )
9477
}
9578

96-
/// public abstract java.lang.annotation.Annotation[] java.lang.reflect.AnnotatedElement.getAnnotations()
97-
98-
private static var getAnnotations_MethodID_7: jmethodID?
99-
100-
override open func getAnnotations() -> [Annotation]! {
101-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
102-
var __locals = [jobject]()
103-
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getAnnotations", methodSig: "()[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getAnnotations_MethodID_7, args: &__args, locals: &__locals )
104-
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
105-
}
106-
107-
10879
/// public default java.lang.annotation.Annotation java.lang.reflect.AnnotatedElement.getDeclaredAnnotation(java.lang.Class)
10980

110-
private static var getDeclaredAnnotation_MethodID_8: jmethodID?
81+
private static var getDeclaredAnnotation_MethodID_6: jmethodID?
11182

11283
override open func getDeclaredAnnotation( arg0: java_swift.JavaClass? ) -> Annotation! {
113-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
11484
var __locals = [jobject]()
85+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
11586
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
116-
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotation_MethodID_8, args: &__args, locals: &__locals )
87+
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotation", methodSig: "(Ljava/lang/Class;)Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotation_MethodID_6, args: &__args, locals: &__locals )
11788
defer { JNI.DeleteLocalRef( __return ) }
11889
return __return != nil ? AnnotationForward( javaObject: __return ) : nil
11990
}
@@ -122,34 +93,62 @@ open class AnnotatedArrayTypeForward: AnnotatedTypeForward, AnnotatedArrayType {
12293
return getDeclaredAnnotation( arg0: _arg0 )
12394
}
12495

96+
/// public abstract java.lang.annotation.Annotation[] java.lang.reflect.AnnotatedElement.getDeclaredAnnotations()
97+
98+
private static var getDeclaredAnnotations_MethodID_7: jmethodID?
99+
100+
override open func getDeclaredAnnotations() -> [Annotation]! {
101+
var __locals = [jobject]()
102+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
103+
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotations", methodSig: "()[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotations_MethodID_7, args: &__args, locals: &__locals )
104+
return JNIType.toSwift( type: [AnnotationForward].self, from: __return )
105+
}
106+
107+
125108
/// public default java.lang.annotation.Annotation[] java.lang.reflect.AnnotatedElement.getDeclaredAnnotationsByType(java.lang.Class)
126109

127-
private static var getDeclaredAnnotationsByType_MethodID_9: jmethodID?
110+
private static var getDeclaredAnnotationsByType_MethodID_8: jmethodID?
128111

129112
override open func getDeclaredAnnotationsByType( arg0: java_swift.JavaClass? ) -> [Annotation]! {
130-
var __args = [jvalue]( repeating: jvalue(), count: 1 )
131113
var __locals = [jobject]()
114+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
132115
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
133-
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotationsByType_MethodID_9, args: &__args, locals: &__locals )
134-
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
116+
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotationsByType", methodSig: "(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotationsByType_MethodID_8, args: &__args, locals: &__locals )
117+
return JNIType.toSwift( type: [AnnotationForward].self, from: __return )
135118
}
136119

137120
override open func getDeclaredAnnotationsByType( _ _arg0: java_swift.JavaClass? ) -> [Annotation]! {
138121
return getDeclaredAnnotationsByType( arg0: _arg0 )
139122
}
140123

141-
/// public abstract java.lang.annotation.Annotation[] java.lang.reflect.AnnotatedElement.getDeclaredAnnotations()
124+
/// public abstract java.lang.reflect.Type java.lang.reflect.AnnotatedType.getType()
142125

143-
private static var getDeclaredAnnotations_MethodID_10: jmethodID?
126+
private static var getType_MethodID_9: jmethodID?
144127

145-
override open func getDeclaredAnnotations() -> [Annotation]! {
128+
override open func getType() -> Type! {
129+
var __locals = [jobject]()
146130
var __args = [jvalue]( repeating: jvalue(), count: 1 )
131+
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getType", methodSig: "()Ljava/lang/reflect/Type;", methodCache: &AnnotatedArrayTypeForward.getType_MethodID_9, args: &__args, locals: &__locals )
132+
defer { JNI.DeleteLocalRef( __return ) }
133+
return __return != nil ? TypeForward( javaObject: __return ) : nil
134+
}
135+
136+
137+
/// public default boolean java.lang.reflect.AnnotatedElement.isAnnotationPresent(java.lang.Class)
138+
139+
private static var isAnnotationPresent_MethodID_10: jmethodID?
140+
141+
override open func isAnnotationPresent( arg0: java_swift.JavaClass? ) -> Bool {
147142
var __locals = [jobject]()
148-
let __return = JNIMethod.CallObjectMethod( object: javaObject, methodName: "getDeclaredAnnotations", methodSig: "()[Ljava/lang/annotation/Annotation;", methodCache: &AnnotatedArrayTypeForward.getDeclaredAnnotations_MethodID_10, args: &__args, locals: &__locals )
149-
return JNIType.toSwift( type: [AnnotationForward](), from: __return )
143+
var __args = [jvalue]( repeating: jvalue(), count: 1 )
144+
__args[0] = JNIType.toJava( value: arg0, locals: &__locals )
145+
let __return = JNIMethod.CallBooleanMethod( object: javaObject, methodName: "isAnnotationPresent", methodSig: "(Ljava/lang/Class;)Z", methodCache: &AnnotatedArrayTypeForward.isAnnotationPresent_MethodID_10, args: &__args, locals: &__locals )
146+
return __return != jboolean(JNI_FALSE)
150147
}
151148

149+
override open func isAnnotationPresent( _ _arg0: java_swift.JavaClass? ) -> Bool {
150+
return isAnnotationPresent( arg0: _arg0 )
151+
}
152152

153153
}
154154

155-

0 commit comments

Comments
 (0)