Update tests and examples to use Glyph() instead of new Glyph()

Author: mattpap

anscombe/src/main/scala/Anscombe.scala

@@ -62,10 +62,10 @@ object Anscombe extends js.JSApp {
             val ygrid = new Grid().plot(plot).axis(yaxis).dimension(1)
             val line_renderer = new GlyphRenderer()
                 .data_source(lines_source)
-                .glyph(new Line().x(x).y(y).line_color("#666699").line_width(2))
+                .glyph(Line().x(x).y(y).line_color("#666699").line_width(2))
             val circle_renderer = new GlyphRenderer()
                 .data_source(circles_source)
-                .glyph(new Circle().x(xname).y(yname).size(12).fill_color("#cc6633").line_color("#cc6633").fill_alpha(50%%))
+                .glyph(Circle().x(xname).y(yname).size(12).fill_color("#cc6633").line_color("#cc6633").fill_alpha(50%%))
             plot.renderers := List(xaxis, yaxis, xgrid, ygrid, line_renderer, circle_renderer)
             plot
         }

bokeh/src/test/scala/Bokeh.scala

@@ -101,102 +101,102 @@ class BokehSpec extends Specification {
 
     "glyphs" should {
         "support AnnularWedge" in {
-            val obj = new AnnularWedge()
+            val obj = AnnularWedge()
             obj.fields.length shouldEqual 18
         }
 
         "support Annulus" in {
-            val obj = new Annulus()
+            val obj = Annulus()
             obj.fields.length shouldEqual 15
         }
 
         "support Arc" in {
-            val obj = new Arc()
+            val obj = Arc()
             obj.fields.length shouldEqual 15
         }
 
         "support Bezier" in {
-            val obj = new Bezier()
+            val obj = Bezier()
             obj.fields.length shouldEqual 17
         }
 
         "support ImageRGBA" in {
-            val obj = new ImageRGBA()
+            val obj = ImageRGBA()
             obj.fields.length shouldEqual 10
         }
 
         "support Image" in {
-            val obj = new Image()
+            val obj = Image()
             obj.fields.length shouldEqual 11
         }
 
         "support ImageURL" in {
-            val obj = new ImageURL()
+            val obj = ImageURL()
             obj.fields.length shouldEqual 13
         }
 
         "support Line" in {
-            val obj = new Line()
+            val obj = Line()
             obj.fields.length shouldEqual 11
         }
 
         "support MultiLine" in {
-            val obj = new MultiLine()
+            val obj = MultiLine()
             obj.fields.length shouldEqual 11
         }
 
         "support Oval" in {
-            val obj = new Oval()
+            val obj = Oval()
             obj.fields.length shouldEqual 16
         }
 
         "support Patch" in {
-            val obj = new Patch()
+            val obj = Patch()
             obj.fields.length shouldEqual 13
         }
 
         "support Patches" in {
-            val obj = new Patches()
+            val obj = Patches()
             obj.fields.length shouldEqual 13
         }
 
         "support Quad" in {
-            val obj = new Quad()
+            val obj = Quad()
             obj.fields.length shouldEqual 15
         }
 
         "support Quadratic" in {
-            val obj = new Quadratic()
+            val obj = Quadratic()
             obj.fields.length shouldEqual 15
         }
 
         "support Ray" in {
-            val obj = new Ray()
+            val obj = Ray()
             obj.fields.length shouldEqual 13
         }
 
         "support Rect" in {
-            val obj = new Rect()
+            val obj = Rect()
             obj.fields.length shouldEqual 17
         }
 
         "support Segment" in {
-            val obj = new Segment()
+            val obj = Segment()
             obj.fields.length shouldEqual 13
         }
 
         "support Text" in {
-            val obj = new Text()
+            val obj = Text()
             obj.fields.length shouldEqual 15
         }
 
         "support Wedge" in {
-            val obj = new Wedge()
+            val obj = Wedge()
             obj.fields.length shouldEqual 17
         }
 
         "support Gear" in {
-            val obj = new Gear()
+            val obj = Gear()
             obj.fields.length shouldEqual 19
         }
     }
@@ -248,67 +248,67 @@ class BokehSpec extends Specification {
 
     "markers" should {
         "support Asterisk" in {
-            val obj = new Asterisk()
+            val obj = Asterisk()
             obj.fields.length shouldEqual 15
         }
 
         "support Circle" in {
-            val obj = new Circle()
+            val obj = Circle()
             obj.fields.length shouldEqual 17
         }
 
         "support CircleCross" in {
-            val obj = new CircleCross()
+            val obj = CircleCross()
             obj.fields.length shouldEqual 15
         }
 
         "support CircleX" in {
-            val obj = new CircleX()
+            val obj = CircleX()
             obj.fields.length shouldEqual 15
         }
 
         "support Cross" in {
-            val obj = new Cross()
+            val obj = Cross()
             obj.fields.length shouldEqual 15
         }
 
         "support Diamond" in {
-            val obj = new Diamond()
+            val obj = Diamond()
             obj.fields.length shouldEqual 15
         }
 
         "support DiamondCross" in {
-            val obj = new DiamondCross()
+            val obj = DiamondCross()
             obj.fields.length shouldEqual 15
         }
 
         "support InvertedTriangle" in {
-            val obj = new InvertedTriangle()
+            val obj = InvertedTriangle()
             obj.fields.length shouldEqual 15
         }
 
         "support Square" in {
-            val obj = new Square()
+            val obj = Square()
             obj.fields.length shouldEqual 15
         }
 
         "support SquareCross" in {
-            val obj = new SquareCross()
+            val obj = SquareCross()
             obj.fields.length shouldEqual 15
         }
 
         "support SquareX" in {
-            val obj = new SquareX()
+            val obj = SquareX()
             obj.fields.length shouldEqual 15
         }
 
         "support Triangle" in {
-            val obj = new Triangle()
+            val obj = Triangle()
             obj.fields.length shouldEqual 15
         }
 
         "support PlainX" in {
-            val obj = new PlainX()
+            val obj = PlainX()
             obj.fields.length shouldEqual 15
         }
     }

examples/src/main/scala/models/Anscombe.scala

@@ -58,10 +58,10 @@ object Anscombe extends Example {
         val ygrid = new Grid().plot(plot).axis(yaxis).dimension(1)
         val line_renderer = new GlyphRenderer()
             .data_source(lines)
-            .glyph(new Line().x(lines.x).y(lines.y).line_color("#666699").line_width(2))
+            .glyph(Line().x(lines.x).y(lines.y).line_color("#666699").line_width(2))
         val circle_renderer = new GlyphRenderer()
             .data_source(circles)
-            .glyph(new Circle().x(x_col).y(y_col).size(12).fill_color("#cc6633").line_color("#cc6633").fill_alpha(50%%))
+            .glyph(Circle().x(x_col).y(y_col).size(12).fill_color("#cc6633").line_color("#cc6633").fill_alpha(50%%))
         plot.renderers := List(xaxis, yaxis, xgrid, ygrid, line_renderer, circle_renderer)
         plot
     }

examples/src/main/scala/models/Calendars.scala

@@ -96,13 +96,13 @@ object Calendars extends Example {
             .height(300)
             .outline_line_color()
 
-        val days_glyph = new Rect().x('days).y('weeks).width(0.9).height(0.9).fill_color('day_backgrounds).line_color(Color.Silver)
+        val days_glyph = Rect().x('days).y('weeks).width(0.9).height(0.9).fill_color('day_backgrounds).line_color(Color.Silver)
         val days_renderer = new GlyphRenderer().data_source(source).glyph(days_glyph)
 
-        val holidays_glyph = new Rect().x('holidays_days).y('holidays_weeks).width(0.9).height(0.9).fill_color(Color.Pink).line_color(Color.IndianRed)
+        val holidays_glyph = Rect().x('holidays_days).y('holidays_weeks).width(0.9).height(0.9).fill_color(Color.Pink).line_color(Color.IndianRed)
         val holidays_renderer = new GlyphRenderer().data_source(holidays_source).glyph(holidays_glyph)
 
-        val text_glyph = new Text().x('days).y('weeks).text('day_labels).text_align(TextAlign.Center).text_baseline(TextBaseline.Middle)
+        val text_glyph = Text().x('days).y('weeks).text('day_labels).text_align(TextAlign.Center).text_baseline(TextBaseline.Middle)
         val text_renderer = new GlyphRenderer().data_source(source).glyph(text_glyph)
 
         val xaxis = new CategoricalAxis()

examples/src/main/scala/models/Choropleth.scala

@@ -44,15 +44,15 @@ object Choropleth extends Example {
     val xdr = new DataRange1d()
     val ydr = new DataRange1d()
 
-    val county_patches = new Patches()
+    val county_patches = Patches()
         .xs(county_xs)
         .ys(county_ys)
         .fill_color(county_colors)
         .fill_alpha(0.7)
         .line_color(Color.White)
         .line_width(0.5)
 
-    val state_patches = new Patches()
+    val state_patches = Patches()
         .xs(state_xs)
         .ys(state_ys)
         .fill_alpha(0.0)

examples/src/main/scala/models/ColorSpec.scala

@@ -14,7 +14,7 @@ object ColorSpec extends Example {
     val xdr = new DataRange1d()
     val ydr = new DataRange1d()
 
-    val circle = new Circle().x(x).y(y).size(15).fill_color(color).line_color(Color.Black)
+    val circle = Circle().x(x).y(y).size(15).fill_color(color).line_color(Color.Black)
 
     val renderer = new GlyphRenderer()
         .data_source(source)

examples/src/main/scala/models/Colors.scala

@@ -161,7 +161,7 @@ object Colors extends Example {
     val plot = new Plot().title("CSS3 Color Names").x_range(xdr).y_range(ydr).width(600).height(2000)
 
     // TODO: categorical dimensions; using Column would cause type error
-    val rect_glyph = new Rect().x('groups).y('names).width(1).height(1).fill_color(colors).line_color()
+    val rect_glyph = Rect().x('groups).y('names).width(1).height(1).fill_color(colors).line_color()
     val rect = new GlyphRenderer().data_source(source).glyph(rect_glyph)
 
     val x1axis = new CategoricalAxis().plot(plot).major_label_orientation(pi/4)

examples/src/main/scala/models/DataTables.scala

@@ -35,8 +35,8 @@ object DataTables extends Example {
         val yaxis = new LinearAxis().plot(plot)
         val ygrid = new Grid().plot(plot).dimension(1).ticker(yaxis.ticker.value)
         plot.left <<= (yaxis :: _)
-        val cty_glyph = new Circle().x('index).y(cty).fill_color("#396285").size(8).fill_alpha(0.5).line_alpha(0.5)
-        val hwy_glyph = new Circle().x('index).y(hwy).fill_color("#CE603D").size(8).fill_alpha(0.5).line_alpha(0.5)
+        val cty_glyph = Circle().x('index).y(cty).fill_color("#396285").size(8).fill_alpha(0.5).line_alpha(0.5)
+        val hwy_glyph = Circle().x('index).y(hwy).fill_color("#CE603D").size(8).fill_alpha(0.5).line_alpha(0.5)
         val cty_renderer = new GlyphRenderer().data_source(source).glyph(cty_glyph)
         val hwy_renderer = new GlyphRenderer().data_source(source).glyph(hwy_glyph)
         plot.renderers := List(cty_renderer, hwy_renderer, xaxis, yaxis, ygrid)

examples/src/main/scala/models/DateAxis.scala

@@ -18,7 +18,7 @@ object DateAxis extends Example {
     val xdr = new DataRange1d()
     val ydr = new DataRange1d()
 
-    val circle = new Circle().x(times).y(y).fill_color(Color.Red).size(5).line_color(Color.Black)
+    val circle = Circle().x(times).y(y).fill_color(Color.Red).size(5).line_color(Color.Black)
 
     val renderer = new GlyphRenderer()
         .data_source(source)

examples/src/main/scala/models/Daylight.scala

@@ -57,19 +57,19 @@ object Daylight extends Example {
     val sources = List(source, patch1_source, patch2_source, text_source)
     val plot = new Plot().title(title).x_range(xdr).y_range(ydr).width(800).height(400)
 
-    val patch1 = new Patch().x('dates).y('times).fill_color(Color.SkyBlue).fill_alpha(0.8)
+    val patch1 = Patch().x('dates).y('times).fill_color(Color.SkyBlue).fill_alpha(0.8)
     val patch1_glyph = new GlyphRenderer().data_source(patch1_source).glyph(patch1)
 
-    val patch2 = new Patch().x('dates).y('times).fill_color(Color.Orange).fill_alpha(0.8)
+    val patch2 = Patch().x('dates).y('times).fill_color(Color.Orange).fill_alpha(0.8)
     val patch2_glyph = new GlyphRenderer().data_source(patch2_source).glyph(patch2)
 
-    val line1 = new Line().x('dates).y('sunrises).line_color(Color.Yellow).line_width(2)
+    val line1 = Line().x('dates).y('sunrises).line_color(Color.Yellow).line_width(2)
     val line1_glyph = new GlyphRenderer().data_source(source).glyph(line1)
 
-    val line2 = new Line().x('dates).y('sunsets).line_color(Color.Red).line_width(2)
+    val line2 = Line().x('dates).y('sunsets).line_color(Color.Red).line_width(2)
     val line2_glyph = new GlyphRenderer().data_source(source).glyph(line2)
 
-    val text = new Text().x('dates).y('times).text('texts).angle(0).text_align(TextAlign.Center)
+    val text = Text().x('dates).y('times).text('texts).angle(0).text_align(TextAlign.Center)
     val text_glyph = new GlyphRenderer().data_source(text_source).glyph(text)
 
     val glyphs = List(patch1_glyph, patch2_glyph, line1_glyph, line2_glyph, text_glyph)