Get rid of RawSpecFigure.kt

Author: alshan

demo/plot/compose-android-median/src/main/kotlin/demo/plot/ComposeMedianMainActivity.kt

@@ -18,6 +18,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import demo.plot.ui.DemoDropdownMenu
 import demo.plot.ui.DemoRadioGroup
+import org.jetbrains.letsPlot.Figure
 import org.jetbrains.letsPlot.skia.compose.PlotPanel
 import org.jetbrains.letsPlot.skia.compose.PlotPanelRaw
 import plotSpec.*
@@ -36,7 +37,7 @@ class ComposeMedianMainActivity : ComponentActivity() {
                 "Violin" to ViolinSpec().createFigure(),
                 "Markdown" to MarkdownSpec().mpg(),
                 "BackendError" to IllegalArgumentSpec().createFigure(),
-                "FrontendError" to FrontendExceptionSpec().createFigure(),
+                "FrontendError" to FrontendExceptionSpec().createRawSpec(),
             )
 
             val preserveAspectRatio = rememberSaveable { mutableStateOf(true) }
@@ -61,9 +62,9 @@ class ComposeMedianMainActivity : ComponentActivity() {
                     }
 
                     val fig = figures[figureIndex.value].second
-                    if (fig is RawSpecFigure) {
+                    if (fig is Map<*, *>) {
                         PlotPanelRaw(
-                            rawSpec = fig.rawSpec.toMutableMap(),
+                            rawSpec = fig as MutableMap<String, Any>,
                             preserveAspectRatio = preserveAspectRatio.value,
                             modifier = Modifier.fillMaxSize(),
                             errorModifier = Modifier.padding(16.dp),
@@ -72,7 +73,7 @@ class ComposeMedianMainActivity : ComponentActivity() {
                                 messages.forEach { println("[DEMO APP MESSAGE] $it") }
                             }
                         )
-                    } else {
+                    } else if (fig is Figure) {
                         PlotPanel(
                             figure = fig,
                             preserveAspectRatio = preserveAspectRatio.value,

demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/FrontendExceptionCompose.kt

@@ -26,7 +26,7 @@ fun main() = application {
             ) {
 
                 PlotPanelRaw(
-                    rawSpec = FrontendExceptionSpec().createFigure().rawSpec.toMutableMap(),
+                    rawSpec = FrontendExceptionSpec().createRawSpec(),
                     modifier = Modifier.fillMaxSize(),
                     errorModifier = Modifier.padding(16.dp),
                     errorTextStyle = TextStyle(color = Color(0xFF700000)),

demo/plot/compose-desktop/src/main/kotlin/demo/plot/minimal/MarkdownCompose.kt

@@ -24,7 +24,7 @@ fun main() = application {
             ) {
 
                 PlotPanelRaw(
-                    rawSpec = MarkdownSpec().mpg().rawSpec,
+                    rawSpec = MarkdownSpec().mpg(),
                     modifier = Modifier.fillMaxSize(),
                     preserveAspectRatio = true,
                 ) { computationMessages ->

demo/plot/compose-desktop/src/main/kotlin/demo/plot/various/MultiplePlotsWithToolbar.kt

@@ -34,7 +34,7 @@ fun main() = application {
                 }
 
                 PlotPanelRaw(
-                    rawSpec = MarkdownSpec().mpg().rawSpec.also { it["ggtoolbar"] = emptyMap<String, Any>() },
+                    rawSpec = MarkdownSpec().mpg().also { it["ggtoolbar"] = emptyMap<String, Any>() },
                     preserveAspectRatio = false,
                     modifier = Modifier.fillMaxHeight().weight(1f)
                 ) { computationMessages ->

demo/plot/shared/src/main/kotlin/plotSpec/AutoSpec.kt

@@ -12,7 +12,7 @@ import org.jetbrains.letsPlot.geom.geomPoint
 import org.jetbrains.letsPlot.intern.Plot
 import org.jetbrains.letsPlot.letsPlot
 
-class AutoSpec : PlotDemoSpec {
+class AutoSpec : PlotDemoFigure {
     override fun createFigureList(): List<Figure> {
         return listOf(
             scatter()

demo/plot/shared/src/main/kotlin/plotSpec/BarPlotSpec.kt

@@ -12,7 +12,7 @@ import org.jetbrains.letsPlot.letsPlot
 import org.jetbrains.letsPlot.scale.scaleFillDiscrete
 import org.jetbrains.letsPlot.scale.scaleFillHue
 
-class BarPlotSpec : PlotDemoSpec {
+class BarPlotSpec : PlotDemoFigure {
     val basic = letsPlot(DATA) +
             geomBar(alpha = 0.5) {
                 x = "time"

demo/plot/shared/src/main/kotlin/plotSpec/CurveSpec.kt

@@ -13,7 +13,7 @@ import org.jetbrains.letsPlot.label.ggtitle
 import org.jetbrains.letsPlot.letsPlot
 import org.jetbrains.letsPlot.scale.xlim
 
-class CurveSpec : PlotDemoSpec {
+class CurveSpec : PlotDemoFigure {
 
     override fun createFigureList(): List<Figure> {
 

demo/plot/shared/src/main/kotlin/plotSpec/DensitySpec.kt

@@ -12,7 +12,7 @@ import org.jetbrains.letsPlot.coord.coordFixed
 import org.jetbrains.letsPlot.geom.geomDensity
 import org.jetbrains.letsPlot.letsPlot
 
-class DensitySpec : PlotDemoSpec {
+class DensitySpec : PlotDemoFigure {
     override fun createFigure(): Figure {
         val rand = java.util.Random()
         val n = 200

demo/plot/shared/src/main/kotlin/plotSpec/FacetWrapSpec.kt

@@ -13,7 +13,7 @@ import org.jetbrains.letsPlot.intern.Plot
 import org.jetbrains.letsPlot.letsPlot
 import org.jetbrains.letsPlot.themes.themeGrey
 
-class FacetWrapSpec : PlotDemoSpec {
+class FacetWrapSpec : PlotDemoFigure {
 
     override fun createFigureList(): List<Figure> {
         val oneFacetDef = commonSpecs() + facetWrap(facets = "number of cylinders", format = "{d} cyl")

demo/plot/shared/src/main/kotlin/plotSpec/FrontendExceptionSpec.kt

@@ -1,28 +1,24 @@
 package plotSpec
 
-import org.jetbrains.letsPlot.Figure
-
 class FrontendExceptionSpec : PlotDemoSpec {
-    override fun createFigure(): RawSpecFigure {
-        return RawSpecFigure.fromMap(
-            mapOf(
-                "kind" to "plot",
-                "layers" to listOf(
-                    mapOf(
-                        "geom" to "line",
-                        "data" to mapOf(
-                            "x" to listOf("a", "b", "c", "d"),
-                            "y" to listOf(3, 1, 4, 2)
-                        ),
-                        "mapping" to mapOf("x" to "x", "y" to "y"),
-                        "stat" to "summary",
-                        "fun" to "mean",
-                        "data_meta" to mapOf(
-                            "series_annotations" to listOf(
-                                mapOf(
-                                    "type" to "datetime",
-                                    "column" to "x"
-                                )
+    override fun createRawSpec(): MutableMap<String, Any> {
+        return mutableMapOf(
+            "kind" to "plot",
+            "layers" to listOf(
+                mapOf(
+                    "geom" to "line",
+                    "data" to mapOf(
+                        "x" to listOf("a", "b", "c", "d"),
+                        "y" to listOf(3, 1, 4, 2)
+                    ),
+                    "mapping" to mapOf("x" to "x", "y" to "y"),
+                    "stat" to "summary",
+                    "fun" to "mean",
+                    "data_meta" to mapOf(
+                        "series_annotations" to listOf(
+                            mapOf(
+                                "type" to "datetime",
+                                "column" to "x"
                             )
                         )
                     )
@@ -31,10 +27,10 @@ class FrontendExceptionSpec : PlotDemoSpec {
         )
     }
 
-    override fun createFigureList(): List<Figure> {
+    override fun createRawSpecList(): List<MutableMap<String, Any>> {
 
         return listOf(
-            createFigure(),
+            createRawSpec(),
         )
     }