Skip to content

Commit 118e178

Browse files
authored
Merge pull request #203 from MaxKellermann/no_JvmOverloads
android, lib: remove obsolete `@JvmOverloads`
2 parents e75be02 + feb31bd commit 118e178

File tree

12 files changed

+6
-14
lines changed

12 files changed

+6
-14
lines changed

aat-android/src/main/kotlin/ch/bailu/aat/menus/MenuArray.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class MenuArray(private val context: Context) : Menu {
108108
}
109109

110110
override fun setQwertyMode(b: Boolean) {}
111-
private class Item @JvmOverloads constructor(
111+
private class Item constructor(
112112
private val context: Context,
113113
private var title: CharSequence?,
114114
private val id: Int = 0

aat-android/src/main/kotlin/ch/bailu/aat/util/AppHtml.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import ch.bailu.aat.util.ui.theme.UiThemeLight
1212
import org.xml.sax.XMLReader
1313

1414
object AppHtml {
15-
@JvmOverloads
1615
@JvmStatic
1716
@Suppress("DEPRECATION")
1817
fun fromHtml(source: String, imageGetter: ImageGetter? = null): Spanned {

aat-android/src/main/kotlin/ch/bailu/aat/util/ui/theme/AppTheme.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ object AppTheme {
3030
val filter: UiTheme = UiThemeLightHeader(UiThemeLight.HL_BLUE)
3131

3232
@JvmStatic
33-
@JvmOverloads
3433
fun padding(view: View, p: Int = 15) {
3534
val padding = AndroidAppDensity(view.context).toPixelInt(p.toFloat())
3635
view.setPadding(padding, padding, padding, padding)

aat-android/src/main/kotlin/ch/bailu/aat/views/bar/ControlBar.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ open class ControlBar(context: Context, private val _orientation: Int, val theme
5454
}
5555
}
5656

57-
@JvmOverloads
5857
fun addImageButton(res: Int, size: Int = controlSize): ImageButtonViewGroup {
5958
val button = ImageButtonViewGroup(context, res)
6059
button.setOnClickListener(onClickListener)

aat-android/src/main/kotlin/ch/bailu/aat/views/bar/MainControlBar.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class MainControlBar(acontext: AbsDispatcher, orientation: Int = HORIZONTAL, but
5353
addMvNext(mv, controlSize / 2)
5454
}
5555

56-
@JvmOverloads
5756
fun addMvNext(mv: MultiView, size: Int = controlSize) {
5857
add(MultiViewNextButton(mv, theme), size)
5958
}

aat-android/src/main/kotlin/ch/bailu/aat/views/busy/BusyViewControl.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ open class BusyViewControl(parent: ViewGroup) {
1818
busy.visibility = View.GONE
1919
}
2020

21-
@JvmOverloads
2221
fun startWaiting(id: Int = DEFAULT_ID) {
2322
changeWaiting(id, true)
2423
}
2524

26-
@JvmOverloads
2725
fun stopWaiting(id: Int = DEFAULT_ID) {
2826
changeWaiting(id, false)
2927
}

aat-lib/src/main/java/ch/bailu/aat_lib/file/xml/parser/gpx/WayParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.xmlpull.v1.XmlPullParser
1212
import org.xmlpull.v1.XmlPullParserException
1313
import java.io.IOException
1414

15-
open class WayParser @JvmOverloads constructor(tag: String = "way") : TagParser(tag) {
15+
open class WayParser constructor(tag: String = "way") : TagParser(tag) {
1616

1717
private val tag: TagParser = OsmTagParser()
1818
private val member: TagParser = MemberParser()

aat-lib/src/main/java/ch/bailu/aat_lib/file/xml/parser/osm/MemberParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ch.bailu.aat_lib.file.xml.parser.scanner.Scanner
66
import org.xmlpull.v1.XmlPullParser
77
import java.io.IOException
88

9-
open class MemberParser @JvmOverloads constructor(tag: String = "member") : TagParser(tag) {
9+
open class MemberParser constructor(tag: String = "member") : TagParser(tag) {
1010
@Throws(IOException::class)
1111
override fun parseText(parser: XmlPullParser, scanner: Scanner) {
1212
}

aat-lib/src/main/java/ch/bailu/aat_lib/gpx/attributes/MaxSpeed.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ abstract class MaxSpeed : GpxSubAttributes(KEYS) {
3131
}
3232
}
3333

34-
class Samples @JvmOverloads constructor(samples: Int = 5) : MaxSpeed() {
34+
class Samples constructor(samples: Int = 5) : MaxSpeed() {
3535
private val speeds: FloatArray = FloatArray(Math.max(samples, 1))
3636
private var i = 0
3737
private var maximum = 0f

aat-lib/src/main/java/ch/bailu/aat_lib/html/MarkupBuilderGpx.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import ch.bailu.aat_lib.gpx.interfaces.GpxType
1212
import ch.bailu.aat_lib.preferences.StorageInterface
1313

1414

15-
class MarkupBuilderGpx @JvmOverloads constructor(
15+
class MarkupBuilderGpx constructor(
1616
storage: StorageInterface,
1717
config: MarkupConfig = MarkupConfig.HTML
1818
) : MarkupBuilder(

0 commit comments

Comments
 (0)