From d457aaa463d24198b41204ac8bc6b46ba9cbe320 Mon Sep 17 00:00:00 2001 From: Joe Pallas Date: Tue, 22 Aug 2017 16:53:00 -0700 Subject: [PATCH 1/3] #5798 Use Any instead of AnyVal in Line constructor --- .../beakerx/scala/chart/xychart/plotitem/Line.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Line.scala b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Line.scala index 5302302205..bf3da3b049 100644 --- a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Line.scala +++ b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Line.scala @@ -19,19 +19,19 @@ package com.twosigma.beakerx.scala.chart.xychart.plotitem import scala.collection.JavaConverters._ -class Line(var xs: Seq[AnyVal], var ys: Seq[AnyVal]) extends com.twosigma.beakerx.chart.xychart.plotitem.Line(xs.map(x => x.asInstanceOf[AnyRef]).asJava, ys.map(x => x.asInstanceOf[Number]).asJava) { +class Line(xs: Seq[Any], ys: Seq[Any]) extends com.twosigma.beakerx.chart.xychart.plotitem.Line(xs.map(x => x.asInstanceOf[AnyRef]).asJava, ys.map(x => x.asInstanceOf[Number]).asJava) { - def this(ys: Seq[AnyVal]) { + def this(ys: Seq[Any]) { this(List(), ys) super.setY(ys.map(x => x.asInstanceOf[Number]).asJava) } - def this(ys: Seq[AnyVal], displayName: String) { + def this(ys: Seq[Any], displayName: String) { this(ys) super.setDisplayName(displayName) } - def this(displayName: String, xs: Seq[AnyVal], ys: Seq[AnyVal], width: Float) { + def this(displayName: String, xs: Seq[Any], ys: Seq[Any], width: Float) { this(xs, ys) super.setDisplayName(displayName) super.setWidth(width) From 2a623d89e95ce99ce1ea474286bd60a1dced9fbe Mon Sep 17 00:00:00 2001 From: Joe Pallas Date: Wed, 23 Aug 2017 11:25:51 -0700 Subject: [PATCH 2/3] #5798 Use Any instead of AnyRef in TableDisplay --- doc/contents/scala/tableApiScala.ipynb | 12 +--------- .../beakerx/scala/table/TableDisplay.scala | 22 +++++++++---------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/doc/contents/scala/tableApiScala.ipynb b/doc/contents/scala/tableApiScala.ipynb index 405c4a7ac6..d41f3422d8 100644 --- a/doc/contents/scala/tableApiScala.ipynb +++ b/doc/contents/scala/tableApiScala.ipynb @@ -138,8 +138,6 @@ "val map = Seq(Map(\"a\" -> 1, \"b\" -> 2, \"c\" -> 3),\n", " Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n", " Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 9))\n", - "// TODO: remove when TableDisplay interface is fixed\n", - " .map(_.mapValues(_.asInstanceOf[AnyRef]))\n", "\n", "val display5 = new TableDisplay(map)\n", "\n", @@ -214,8 +212,6 @@ " Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n", " Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 9)\n", ")\n", - "// TODO: remove when TableDisplay interface is fixed\n", - " .map(_.mapValues(_.asInstanceOf[AnyRef]))\n", "\n", "val display7 = new TableDisplay(mapList4)\n", "\n", @@ -247,8 +243,6 @@ " Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n", " Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 9)\n", ")\n", - "// TODO: remove when TableDisplay interface is fixed\n", - " .map(_.mapValues(_.asInstanceOf[AnyRef]))\n", "\n", "val display7 = new TableDisplay(mapList4)\n", "\n", @@ -281,8 +275,6 @@ " Map(\"firstCol\" -> 1, \"secondCol\" -> 2, \"thirdCol\" -> 3),\n", " Map(\"firstCol\" -> 4, \"secondCol\" -> 5, \"thirdCol\" -> 6),\n", " Map(\"firstCol\" -> 9, \"secondCol\" -> 8, \"thirdCol\" -> 7))\n", - "// TODO: remove when TableDisplay interface is fixed\n", - " .map(_.mapValues(_.asInstanceOf[AnyRef]))\n", "\n", "val td4 = new TableDisplay(mapList5)\n", "\n", @@ -331,9 +323,7 @@ " Map(\"a\" -> 1, \"b\" -> 2, \"c\" -> 3),\n", " Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n", " Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 8)\n", - ")\n", - "// TODO: remove when TableDisplay interface is fixed\n", - " .map(_.mapValues(_.asInstanceOf[AnyRef]))" + ")" ] }, { diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/table/TableDisplay.scala b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/table/TableDisplay.scala index bfe551bdec..68bb949fb1 100644 --- a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/table/TableDisplay.scala +++ b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/table/TableDisplay.scala @@ -39,22 +39,22 @@ object TableDisplay { new com.twosigma.beakerx.table.TableDisplay(javaListOfList, co.asJava, cl.asJava) } - private def create(v: Array[Map[String, AnyRef]]): com.twosigma.beakerx.table.TableDisplay = { - val javaStandardized: Array[java.util.Map[String, AnyRef]] = v.map(v => v.asJava).toArray + private def create(v: Array[Map[String, Any]]): com.twosigma.beakerx.table.TableDisplay = { + val javaStandardized: Array[java.util.Map[String, Object]] = v.map(v => v.mapValues(_.asInstanceOf[Object]).asJava) new com.twosigma.beakerx.table.TableDisplay(javaStandardized) } - private def create(v: Seq[Map[String, AnyRef]]): com.twosigma.beakerx.table.TableDisplay = { - val javaMaps: Seq[java.util.Map[String, AnyRef]] = v.map(entry => entry.asJava) - val javaCollection: java.util.Collection[java.util.Map[String, AnyRef]] = javaMaps.asJavaCollection + private def create(v: Seq[Map[String, Any]]): com.twosigma.beakerx.table.TableDisplay = { + val javaMaps: Seq[java.util.Map[String, Object]] = v.map(m => m.mapValues(_.asInstanceOf[Object]).asJava) + val javaCollection: java.util.Collection[java.util.Map[String, Object]] = javaMaps.asJava new com.twosigma.beakerx.table.TableDisplay(javaCollection) } - private def create(v: Seq[Map[String, AnyRef]], serializer: BeakerObjectConverter): com.twosigma.beakerx.table.TableDisplay = { - val javaMaps: Seq[java.util.Map[String, AnyRef]] = v.map(entry => entry.asJava) - val javaCollection: java.util.Collection[java.util.Map[String, AnyRef]] = javaMaps.asJavaCollection + private def create(v: Seq[Map[String, Any]], serializer: BeakerObjectConverter): com.twosigma.beakerx.table.TableDisplay = { + val javaMaps: Seq[java.util.Map[String, Object]] = v.map(m => m.mapValues(_.asInstanceOf[Object]).asJava) + val javaCollection: java.util.Collection[java.util.Map[String, Object]] = javaMaps.asJava new com.twosigma.beakerx.table.TableDisplay(javaCollection, serializer) } @@ -70,15 +70,15 @@ class TableDisplay private(tableDisplay: com.twosigma.beakerx.table.TableDisplay this(TableDisplay.create(v, co, cl)) } - def this(v: Array[Map[String, AnyRef]]) = { + def this(v: Array[Map[String, Any]]) = { this(TableDisplay.create(v)) } - def this(v: Seq[Map[String, AnyRef]]) = { + def this(v: Seq[Map[String, Any]]) = { this(TableDisplay.create(v)) } - def this(v: Seq[Map[String, AnyRef]], serializer: BeakerObjectConverter) = { + def this(v: Seq[Map[String, Any]], serializer: BeakerObjectConverter) = { this(TableDisplay.create(v, serializer)) } From 0a8b467407e86b14c81f0d39a9c51c9721dabac2 Mon Sep 17 00:00:00 2001 From: Joe Pallas Date: Tue, 29 Aug 2017 14:50:48 -0700 Subject: [PATCH 3/3] #5798 Use Any instead of AnyVal in Text, Rasters, and ConstantLine --- .../scala/chart/xychart/plotitem/ConstantLine.scala | 8 ++++---- .../beakerx/scala/chart/xychart/plotitem/Rasters.scala | 8 ++++---- .../beakerx/scala/chart/xychart/plotitem/Text.scala | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/ConstantLine.scala b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/ConstantLine.scala index 98fdcedc07..925d887c0c 100644 --- a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/ConstantLine.scala +++ b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/ConstantLine.scala @@ -20,23 +20,23 @@ import com.twosigma.beakerx.chart.xychart.plotitem.StrokeType class ConstantLine extends com.twosigma.beakerx.chart.xychart.plotitem.ConstantLine { - def this(x: AnyVal) { + def this(x: Any) { this() super.setX(x.asInstanceOf[Number]) } - def this(x: AnyVal, y: AnyVal) { + def this(x: Any, y: Any) { this(x) super.setY(y.asInstanceOf[Number]) } - def this(x: AnyVal, y: AnyVal, style: StrokeType, color: Color) { + def this(x: Any, y: Any, style: StrokeType, color: Color) { this(x, y) super.setStyle(style) super.setColor(color) } - def this(x: AnyVal, y: AnyVal, color: Color, width: Float, showLabel: Boolean) { + def this(x: Any, y: Any, color: Color, width: Float, showLabel: Boolean) { this(x, y) super.setColor(color) super.setWidth(width) diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Rasters.scala b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Rasters.scala index 5469b50487..f878a4be06 100644 --- a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Rasters.scala +++ b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Rasters.scala @@ -18,24 +18,24 @@ package com.twosigma.beakerx.scala.chart.xychart.plotitem import scala.collection.JavaConverters._ -class Rasters(y: Seq[AnyVal], height: Seq[AnyVal], width: Seq[AnyVal]) extends com.twosigma.beakerx.chart.xychart.plotitem.Rasters { +class Rasters(y: Seq[Any], height: Seq[Any], width: Seq[Any]) extends com.twosigma.beakerx.chart.xychart.plotitem.Rasters { super.setY(y.map(x => x.asInstanceOf[Number]).asJava) super.setHeight(height.map(x => x.asInstanceOf[Number]).asJava) super.setWidth(width.map(x => x.asInstanceOf[Number]).asJava) - def this(x: Seq[AnyVal], y: Seq[AnyVal], height: Seq[AnyVal], width: Seq[AnyVal], opacity: Seq[AnyVal]) { + def this(x: Seq[Any], y: Seq[Any], height: Seq[Any], width: Seq[Any], opacity: Seq[Any]) { this(y, height, width) super.setX(x.map(x => x.asInstanceOf[AnyRef]).asJava) super.setOpacity(opacity.map(x => x.asInstanceOf[Number]).asJava) } - def this(x: Seq[AnyVal], y: Seq[AnyVal], height: Seq[AnyVal], width: Seq[AnyVal], opacity: Seq[AnyVal], dataString: Array[Byte]) { + def this(x: Seq[Any], y: Seq[Any], height: Seq[Any], width: Seq[Any], opacity: Seq[Any], dataString: Array[Byte]) { this(x, y, height, width, opacity) super.setDataString(dataString) } - def this(x: Seq[AnyVal], y: Seq[AnyVal], height: Seq[AnyVal], width: Seq[AnyVal], opacity: Seq[AnyVal], fileUrl: String) { + def this(x: Seq[Any], y: Seq[Any], height: Seq[Any], width: Seq[Any], opacity: Seq[Any], fileUrl: String) { this(x, y, height, width, opacity) super.setFileUrl(fileUrl) } diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Text.scala b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Text.scala index 5ce6d9fa60..63c0c955fb 100644 --- a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Text.scala +++ b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Text.scala @@ -18,7 +18,7 @@ package com.twosigma.beakerx.scala.chart.xychart.plotitem class Text extends com.twosigma.beakerx.chart.xychart.plotitem.Text { - def this(x: AnyVal, y: AnyVal, text: String, pointerAngle: Double) { + def this(x: Any, y: Any, text: String, pointerAngle: Double) { this() super.setX(x.asInstanceOf[Number]) super.setY(y.asInstanceOf[Number])