Skip to content

Commit e43113c

Browse files
colemancdacolemancda
committed
Fix AdapterView superclass
1 parent 56e6a2e commit e43113c

File tree

8 files changed

+61
-60
lines changed

8 files changed

+61
-60
lines changed

‎Sources/AndroidWidget/AbsListView.swift‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,58 +6,58 @@ import JavaRuntime
66
@JavaClass("android.widget.AbsListView", implements: Filter.FilterListener.self)
77
open class AbsListView: AdapterView {
88
@JavaMethod
9-
open func onWindowFocusChanged(_ arg0: Bool)
9+
open override func onWindowFocusChanged(_ arg0: Bool)
1010

1111
@JavaMethod
12-
open func getTopFadingEdgeStrength() -> Float
12+
open override func getTopFadingEdgeStrength() -> Float
1313

1414
@JavaMethod
15-
open func getBottomFadingEdgeStrength() -> Float
15+
open override func getBottomFadingEdgeStrength() -> Float
1616

1717
@JavaMethod
18-
open func computeVerticalScrollRange() -> Int32
18+
open override func computeVerticalScrollRange() -> Int32
1919

2020
@JavaMethod
21-
open func computeVerticalScrollOffset() -> Int32
21+
open override func computeVerticalScrollOffset() -> Int32
2222

2323
@JavaMethod
24-
open func computeVerticalScrollExtent() -> Int32
24+
open override func computeVerticalScrollExtent() -> Int32
2525

2626
@JavaMethod
27-
open func onRtlPropertiesChanged(_ arg0: Int32)
27+
open override func onRtlPropertiesChanged(_ arg0: Int32)
2828

2929
@JavaMethod
30-
open func onCancelPendingInputEvents()
30+
open override func onCancelPendingInputEvents()
3131

3232
@JavaMethod
33-
open func isPaddingOffsetRequired() -> Bool
33+
open override func isPaddingOffsetRequired() -> Bool
3434

3535
@JavaMethod
36-
open func getLeftPaddingOffset() -> Int32
36+
open override func getLeftPaddingOffset() -> Int32
3737

3838
@JavaMethod
39-
open func getRightPaddingOffset() -> Int32
39+
open override func getRightPaddingOffset() -> Int32
4040

4141
@JavaMethod
42-
open func getTopPaddingOffset() -> Int32
42+
open override func getTopPaddingOffset() -> Int32
4343

4444
@JavaMethod
45-
open func getBottomPaddingOffset() -> Int32
45+
open override func getBottomPaddingOffset() -> Int32
4646

4747
@JavaMethod
48-
open func requestDisallowInterceptTouchEvent(_ arg0: Bool)
48+
open override func requestDisallowInterceptTouchEvent(_ arg0: Bool)
4949

5050
@JavaMethod
51-
open func dispatchDrawableHotspotChanged(_ arg0: Float, _ arg1: Float)
51+
open override func dispatchDrawableHotspotChanged(_ arg0: Float, _ arg1: Float)
5252

5353
@JavaMethod
5454
open override func onDetachedFromWindow()
5555

5656
@JavaMethod
57-
open func drawableStateChanged()
57+
open override func drawableStateChanged()
5858

5959
@JavaMethod
60-
open func jumpDrawablesToCurrentState()
60+
open override func jumpDrawablesToCurrentState()
6161

6262
@JavaMethod
6363
open func deferNotifyDataSetChanged()
@@ -69,10 +69,10 @@ open class AbsListView: AdapterView {
6969
open func onRemoteAdapterDisconnected()
7070

7171
@JavaMethod
72-
open func getVerticalScrollbarWidth() -> Int32
72+
open override func getVerticalScrollbarWidth() -> Int32
7373

7474
@JavaMethod
75-
open func setVerticalScrollbarPosition(_ arg0: Int32)
75+
open override func setVerticalScrollbarPosition(_ arg0: Int32)
7676

7777
@JavaMethod
7878
open override func getAccessibilityClassName() -> CharSequence!
@@ -279,25 +279,25 @@ open class AbsListView: AdapterView {
279279
open func setEdgeEffectColor(_ arg0: Int32)
280280

281281
@JavaMethod
282-
open func requestLayout()
282+
open override func requestLayout()
283283

284284
@JavaMethod
285-
open func showContextMenu(_ arg0: Float, _ arg1: Float) -> Bool
285+
open override func showContextMenu(_ arg0: Float, _ arg1: Float) -> Bool
286286

287287
@JavaMethod
288-
open func showContextMenu() -> Bool
288+
open override func showContextMenu() -> Bool
289289

290290
@JavaMethod
291-
open func onDisplayHint(_ arg0: Int32)
291+
open override func onDisplayHint(_ arg0: Int32)
292292

293293
@JavaMethod
294-
open func onSizeChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
294+
open override func onSizeChanged(_ arg0: Int32, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
295295

296296
@JavaMethod
297-
open func dispatchSetPressed(_ arg0: Bool)
297+
open override func dispatchSetPressed(_ arg0: Bool)
298298

299299
@JavaMethod
300-
open func onAttachedToWindow()
300+
open override func onAttachedToWindow()
301301

302302
@JavaMethod
303303
open func onFilterComplete(_ arg0: Int32)
@@ -315,16 +315,16 @@ open class AbsListView: AdapterView {
315315
open func onTextChanged(_ arg0: CharSequence?, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32)
316316

317317
@JavaMethod
318-
open func setScrollBarStyle(_ arg0: Int32)
318+
open override func setScrollBarStyle(_ arg0: Int32)
319319

320320
@JavaMethod
321-
open func getSolidColor() -> Int32
321+
open override func getSolidColor() -> Int32
322322

323323
@JavaMethod
324-
open func onOverScrolled(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool, _ arg3: Bool)
324+
open override func onOverScrolled(_ arg0: Int32, _ arg1: Int32, _ arg2: Bool, _ arg3: Bool)
325325

326326
@JavaMethod
327-
open func onMeasure(_ arg0: Int32, _ arg1: Int32)
327+
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)
328328

329329
@JavaMethod
330330
open override func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)

‎Sources/AndroidWidget/AbsSpinner.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ open class AbsSpinner: AdapterView {
2323
open func pointToPosition(_ arg0: Int32, _ arg1: Int32) -> Int32
2424

2525
@JavaMethod
26-
open func requestLayout()
26+
open override func requestLayout()
2727

2828
@JavaMethod
29-
open func getAutofillType() -> Int32
29+
open override func getAutofillType() -> Int32
3030

3131
@JavaMethod
3232
open override func setSelection(_ arg0: Int32)
@@ -41,7 +41,7 @@ open class AbsSpinner: AdapterView {
4141
open func setAdapter(_ arg0: SpinnerAdapter?)
4242

4343
@JavaMethod
44-
open func onMeasure(_ arg0: Int32, _ arg1: Int32)
44+
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)
4545
}
4646

4747
extension JavaClass<AbsSpinner> {

‎Sources/AndroidWidget/AdapterView.swift‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
// Auto-generated by Java-to-Swift wrapper generator.
22
import JavaKit
33
import JavaRuntime
4+
import AndroidView
45

56
@JavaClass("android.widget.AdapterView")
6-
open class AdapterView: JavaObject {
7+
open class AdapterView: ViewGroup {
78
@JavaMethod
89
open func getCount() -> Int32
910

1011
@JavaMethod
1112
open func getAdapter() -> Adapter!
1213

1314
@JavaMethod
14-
open func setFocusableInTouchMode(_ arg0: Bool)
15+
open override func setFocusableInTouchMode(_ arg0: Bool)
1516

1617
@JavaMethod
17-
open func onDetachedFromWindow()
18+
open override func onDetachedFromWindow()
1819

1920
@JavaMethod
2021
open func setOnItemClickListener(_ arg0: AdapterView.OnItemClickListener?)
@@ -47,16 +48,16 @@ open class AdapterView: JavaObject {
4748
open func getItemIdAtPosition(_ arg0: Int32) -> Int64
4849

4950
@JavaMethod
50-
open func getAccessibilityClassName() -> CharSequence!
51+
open override func getAccessibilityClassName() -> CharSequence!
5152

5253
@JavaMethod
53-
open func setFocusable(_ arg0: Int32)
54+
open override func setFocusable(_ arg0: Int32)
5455

5556
@JavaMethod
5657
open func setOnClickListener(_ arg0: ViewSwitcher.OnClickListener?)
5758

5859
@JavaMethod
59-
open func canAnimate() -> Bool
60+
open override func canAnimate() -> Bool
6061

6162
@JavaMethod
6263
open func setSelection(_ arg0: Int32)
@@ -74,13 +75,13 @@ open class AdapterView: JavaObject {
7475
open func getItemAtPosition(_ arg0: Int32) -> JavaObject!
7576

7677
@JavaMethod
77-
open func removeAllViews()
78+
open override func removeAllViews()
7879

7980
@JavaMethod
80-
open func removeViewAt(_ arg0: Int32)
81+
open override func removeViewAt(_ arg0: Int32)
8182

8283
@JavaMethod
83-
open func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)
84+
open override func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)
8485
}
8586

8687
extension JavaClass<AdapterView> {

‎Sources/AndroidWidget/AdapterViewAnimator.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ open class AdapterViewAnimator: AdapterView {
4747
open func showPrevious()
4848

4949
@JavaMethod
50-
open func getBaseline() -> Int32
50+
open override func getBaseline() -> Int32
5151

5252
@JavaMethod
53-
open func onMeasure(_ arg0: Int32, _ arg1: Int32)
53+
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)
5454

5555
@JavaMethod
5656
open override func onLayout(_ arg0: Bool, _ arg1: Int32, _ arg2: Int32, _ arg3: Int32, _ arg4: Int32)

‎Sources/AndroidWidget/AdapterViewFlipper.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import JavaRuntime
55
@JavaClass("android.widget.AdapterViewFlipper")
66
open class AdapterViewFlipper: AdapterViewAnimator {
77
@JavaMethod
8-
open func onWindowVisibilityChanged(_ arg0: Int32)
8+
open override func onWindowVisibilityChanged(_ arg0: Int32)
99

1010
@JavaMethod
1111
open override func onDetachedFromWindow()
@@ -38,7 +38,7 @@ open class AdapterViewFlipper: AdapterViewAnimator {
3838
open func isAutoStart() -> Bool
3939

4040
@JavaMethod
41-
open func onAttachedToWindow()
41+
open override func onAttachedToWindow()
4242

4343
@JavaMethod
4444
open override func setAdapter(_ arg0: Adapter?)

‎Sources/AndroidWidget/Gallery.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ open class Gallery: AbsSpinner {
1111
open func setAnimationDuration(_ arg0: Int32)
1212

1313
@JavaMethod
14-
open func computeHorizontalScrollRange() -> Int32
14+
open override func computeHorizontalScrollRange() -> Int32
1515

1616
@JavaMethod
17-
open func computeHorizontalScrollOffset() -> Int32
17+
open override func computeHorizontalScrollOffset() -> Int32
1818

1919
@JavaMethod
20-
open func computeHorizontalScrollExtent() -> Int32
20+
open override func computeHorizontalScrollExtent() -> Int32
2121

2222
@JavaMethod
23-
open func getChildDrawingOrder(_ arg0: Int32, _ arg1: Int32) -> Int32
23+
open override func getChildDrawingOrder(_ arg0: Int32, _ arg1: Int32) -> Int32
2424

2525
@JavaMethod
26-
open func dispatchSetSelected(_ arg0: Bool)
26+
open override func dispatchSetSelected(_ arg0: Bool)
2727

2828
@JavaMethod
2929
open override func getAccessibilityClassName() -> CharSequence!
@@ -35,16 +35,16 @@ open class Gallery: AbsSpinner {
3535
open func generateLayoutParams(_ arg0: ViewSwitcher.LayoutParams?) -> ViewSwitcher.LayoutParams!
3636

3737
@JavaMethod
38-
open func showContextMenu(_ arg0: Float, _ arg1: Float) -> Bool
38+
open override func showContextMenu(_ arg0: Float, _ arg1: Float) -> Bool
3939

4040
@JavaMethod
41-
open func showContextMenu() -> Bool
41+
open override func showContextMenu() -> Bool
4242

4343
@JavaMethod
44-
open func dispatchSetPressed(_ arg0: Bool)
44+
open override func dispatchSetPressed(_ arg0: Bool)
4545

4646
@JavaMethod
47-
open func onAttachedToWindow()
47+
open override func onAttachedToWindow()
4848

4949
@JavaMethod
5050
open func setGravity(_ arg0: Int32)

‎Sources/AndroidWidget/ListView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import JavaRuntime
55
@JavaClass("android.widget.ListView")
66
open class ListView: AbsListView {
77
@JavaMethod
8-
open func isOpaque() -> Bool
8+
open override func isOpaque() -> Bool
99

1010
@JavaMethod
1111
open override func getAdapter() -> Adapter!
@@ -86,7 +86,7 @@ open class ListView: AbsListView {
8686
open override func setAdapter(_ arg0: ListAdapter?)
8787

8888
@JavaMethod
89-
open func onFinishInflate()
89+
open override func onFinishInflate()
9090

9191
@JavaMethod
9292
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)

‎Sources/AndroidWidget/Spinner.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ open class Spinner: AbsSpinner {
4444
open func getPrompt() -> CharSequence!
4545

4646
@JavaMethod
47-
open func performClick() -> Bool
47+
open override func performClick() -> Bool
4848

4949
@JavaMethod
50-
open func setEnabled(_ arg0: Bool)
50+
open override func setEnabled(_ arg0: Bool)
5151

5252
@JavaMethod
5353
open override func setAdapter(_ arg0: SpinnerAdapter?)
@@ -62,7 +62,7 @@ open class Spinner: AbsSpinner {
6262
open func getGravity() -> Int32
6363

6464
@JavaMethod
65-
open func getBaseline() -> Int32
65+
open override func getBaseline() -> Int32
6666

6767
@JavaMethod
6868
open override func onMeasure(_ arg0: Int32, _ arg1: Int32)

0 commit comments

Comments
 (0)