Address some Lint warnings.

WorldWindEarth · Dec 3, 2023 · 5af264e · 5af264e
1 parent 607b962
commit 5af264e
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 18 deletions.
diff --git a/worldwind-tutorials/src/androidMain/kotlin/earth/worldwind/tutorials/MainActivity.kt b/worldwind-tutorials/src/androidMain/kotlin/earth/worldwind/tutorials/MainActivity.kt
@@ -321,7 +321,7 @@ class MainActivity: AppCompatActivity(), NavigationView.OnNavigationItemSelected
     private fun loadTutorial(globeFragment: Class<out Fragment>, url: String, titleId: Int) {
         try {
             setTitle(titleId)
-            val globe = globeFragment.newInstance()
+            val globe = globeFragment.getDeclaredConstructor().newInstance()
             supportFragmentManager
                 .beginTransaction()
                 .replace(R.id.globe_container, globe) // replace (destroy) existing fragment (if any)

diff --git a/worldwind-tutorials/src/jsMain/kotlin/earth/worldwind/tutorials/Main.kt b/worldwind-tutorials/src/jsMain/kotlin/earth/worldwind/tutorials/Main.kt
@@ -1,4 +1,5 @@
 @file:JsExport
+@file:Suppress("OPT_IN_USAGE", "NON_EXPORTABLE_TYPE")
 
 package earth.worldwind.tutorials
 

diff --git a/worldwind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525Placemark.kt b/worldwind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525Placemark.kt
@@ -84,6 +84,7 @@ actual open class MilStd2525Placemark actual constructor(
          *
          * @return A new [PlacemarkAttributes] bundle representing the MIL-STD-2525 symbol.
          */
+        @JvmStatic
         actual fun getPlacemarkAttributes(
             symbolCode: String, symbolModifiers: Map<String, String>?, symbolAttributes: Map<String, String>?
         ): PlacemarkAttributes {

diff --git a/...wind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt b/...wind/src/androidMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt
@@ -18,7 +18,7 @@ import earth.worldwind.shape.*
 import earth.worldwind.util.Logger
 import kotlin.math.roundToInt
 
-actual open class MilStd2525TacticalGraphic actual constructor(
+actual open class MilStd2525TacticalGraphic @JvmOverloads actual constructor(
     sidc: String, locations: List<Location>,
     boundingSector: Sector, modifiers: Map<String, String>?, attributes: Map<String, String>?
 ) : AbstractMilStd2525TacticalGraphic(sidc, locations, boundingSector, modifiers, attributes) {

diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/geom/Matrix3.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/geom/Matrix3.kt
@@ -541,7 +541,8 @@ open class Matrix3 private constructor(
      *
      * @return this matrix set to the inverse of the specified matrix
      */
-    fun invertMatrix(matrix: Matrix3): Matrix3 { 
+    @Suppress("UNUSED_PARAMETER")
+    fun invertMatrix(matrix: Matrix3): Matrix3 {
         TODO("Matrix3.invertMatrix is not implemented")
     }
 

diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/layer/graticule/AbstractGraticuleLayer.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/layer/graticule/AbstractGraticuleLayer.kt
@@ -312,6 +312,7 @@ abstract class AbstractGraticuleLayer(name: String): AbstractLayer(name) {
         altitudeMode = AltitudeMode.CLAMP_TO_GROUND
     }
 
+    @Suppress("UNUSED_PARAMETER")
     fun createTextRenderable(position: Position, label: String, resolution: Double) = Label(position, label).apply {
         altitudeMode = AltitudeMode.CLAMP_TO_GROUND
         // priority = resolution * 1e6 // TODO Implement priority

diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525Placemark.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525Placemark.kt
@@ -2,7 +2,6 @@ package earth.worldwind.shape.milstd2525
 
 import earth.worldwind.geom.Position
 import earth.worldwind.shape.PlacemarkAttributes
-import kotlin.jvm.JvmStatic
 
 expect open class MilStd2525Placemark(
     symbolCode: String,
@@ -11,10 +10,8 @@ expect open class MilStd2525Placemark(
     symbolAttributes: Map<String, String>? = null
 ) : AbstractMilStd2525Placemark {
     companion object {
-        @JvmStatic
         fun clearSymbolCache()
 
-        @JvmStatic
         fun getPlacemarkAttributes(
             symbolCode: String,
             symbolModifiers: Map<String, String>? = null,

diff --git a/...dwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt b/...dwind/src/commonMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt
@@ -2,9 +2,8 @@ package earth.worldwind.shape.milstd2525
 
 import earth.worldwind.geom.Location
 import earth.worldwind.geom.Sector
-import kotlin.jvm.JvmOverloads
 
-expect open class MilStd2525TacticalGraphic @JvmOverloads constructor(
+expect open class MilStd2525TacticalGraphic(
     sidc: String, locations: List<Location>, boundingSector: Sector = defaultBoundingSector(locations),
     modifiers: Map<String, String>? = null, attributes: Map<String, String>? = null
 ) : AbstractMilStd2525TacticalGraphic
diff --git a/worldwind/src/commonMain/kotlin/earth/worldwind/util/Logger.kt b/worldwind/src/commonMain/kotlin/earth/worldwind/util/Logger.kt
@@ -1,15 +1,11 @@
 package earth.worldwind.util
 
-import kotlin.jvm.JvmOverloads
-import kotlin.jvm.JvmStatic
-
 expect object Logger {
     val ERROR: Int
     val WARN: Int
     val INFO: Int
     val DEBUG: Int
 
-    @JvmStatic
     fun isLoggable(priority: Int): Boolean
 
     /**
@@ -20,14 +16,9 @@ expect object Logger {
      * @param message The message to log. Nothing is logged if the message is null or undefined.
      * @param tr Optional exception
      */
-    @JvmStatic
-    @JvmOverloads
     fun log(priority: Int, message: String, tr: Throwable? = null)
 
-    @JvmStatic
-    @JvmOverloads
     fun logMessage(level: Int, className: String, methodName: String, message: String, tr: Throwable? = null): String
 
-    @JvmStatic
     fun makeMessage(className: String, methodName: String, message: String): String
 }
diff --git a/worldwind/src/jvmMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt b/worldwind/src/jvmMain/kotlin/earth/worldwind/shape/milstd2525/MilStd2525TacticalGraphic.kt
@@ -13,7 +13,7 @@ import earth.worldwind.shape.*
 import earth.worldwind.util.Logger
 import java.awt.geom.Point2D
 
-actual open class MilStd2525TacticalGraphic actual constructor(
+actual open class MilStd2525TacticalGraphic @JvmOverloads actual constructor(
     sidc: String, locations: List<Location>,
     boundingSector: Sector, modifiers: Map<String, String>?, attributes: Map<String, String>?
 ) : AbstractMilStd2525TacticalGraphic(sidc, locations, boundingSector, modifiers, attributes) {