Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5798 scala interfaces part 2a #5889

Merged
merged 3 commits into from
Aug 30, 2017
Merged

5798 scala interfaces part 2a #5889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d457aaa
#5798 Use Any instead of AnyVal in Line constructor
jpallas Aug 22, 2017
2a623d8
#5798 Use Any instead of AnyRef in TableDisplay
jpallas Aug 23, 2017
0a8b467
#5798 Use Any instead of AnyVal in Text, Rasters, and ConstantLine
jpallas Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions doc/contents/scala/tableApiScala.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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]))"
")"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions .../scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/ConstantLine.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Line.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Rasters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion kernel/scala/src/main/java/com/twosigma/beakerx/scala/chart/xychart/plotitem/Text.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
22 changes: 11 additions & 11 deletions kernel/scala/src/main/java/com/twosigma/beakerx/scala/table/TableDisplay.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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))
}

Expand Down