changeset 8728:56f28bdec049 8u60-b01

RT-39831: Stop using deprecated builders in samples, toys, and other apps [krushforth]
author Elina Kleyman <elina.kleyman@oracle.com>
date Sun, 01 Feb 2015 13:01:40 +0200
parents d677f03f5938
children 92264dad45e2 0a920e61eed4 a3d237d867f3
files apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/OldTestViewer.java apps/samples/Ensemble8/src/app/java/ensemble/HomePage.java apps/samples/Ensemble8/src/app/java/ensemble/ScrollEventSynthesizer.java apps/samples/Ensemble8/src/app/java/ensemble/control/BendingPages.java apps/samples/Ensemble8/src/app/java/ensemble/control/BookBend.java apps/samples/Ensemble8/src/app/java/ensemble/samplepage/PieChartDataVisualizer.java apps/samples/Modena/src/main/java/modena/Modena.java apps/samples/Modena/src/main/java/modena/SamplePage.java apps/samples/Modena/src/main/java/modena/SamplePageHelpers.java
diffstat 9 files changed, 770 insertions(+), 645 deletions(-) [+]
line wrap: on
line diff
--- a/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/OldTestViewer.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/OldTestViewer.java	Sun Feb 01 13:01:40 2015 +0200
@@ -57,14 +57,13 @@
 import javafx.scene.PointLight;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.Label;
-import javafx.scene.control.LabelBuilder;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.VBoxBuilder;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.paint.PhongMaterial;
@@ -86,10 +85,6 @@
 import com.javafx.experiments.importers.obj.ObjImporter;
 import com.sun.javafx.geom.Vec3d;
 
-
-/**
- *
- */
 public class OldTestViewer extends Application {
     public static final String PATH_PROPERTY = "file";
 
@@ -239,8 +234,6 @@
         spheresGroup.getChildren().addAll(box1, cylinder1, sphere1);
         spheresGroup.setRotateX(180.0);
 
-
-
         /*
         // red
         final Sphere redPos = new Sphere(4);
@@ -515,7 +508,7 @@
         Button light3zeroXYZButton;
         Button light3show;
         Button light3hide;
-        
+
         /*
         Button backButton;
         Button stopButton;
@@ -621,42 +614,27 @@
             }
         };
 
-        borderPane.setCenter(VBoxBuilder.create()
-            .id("center")
-            .spacing(0)
-            .alignment(Pos.TOP_CENTER)
-            .children(
-                lightColorPicker,
-                backColorPicker,
-                fovLabel = LabelBuilder.create()
-                    .id("fov-label")
-                    .text("fov")
-                    .build(),
-                nearLabel = LabelBuilder.create()
-                    .id("near-label")
-                    .text("Near Clip")
-                    .build(),
-                farLabel = LabelBuilder.create()
-                    .id("far-label")
-                    .text("Far Clip")
-                    .build(),
-                resetFovButton = ButtonBuilder.create()
-                    .id("resetFov-button")
-                    .text("reset FOV")
-                    .onAction(resetFovAction)
-                    .build(),
-                resetNearButton = ButtonBuilder.create()
-                    .id("resetNear-button")
-                    .text("reset near")
-                    .onAction(resetNearAction)
-                    .build(),
-                resetFarButton = ButtonBuilder.create()
-                    .id("resetFar-button")
-                    .text("reset far")
-                    .onAction(resetFarAction)
-                    .build()
-                )
-            .build());
+        fovLabel = new Label("fov");
+        fovLabel.setId("fov-label");
+        nearLabel = new Label("Near Clip");
+        nearLabel.setId("near-label");
+        farLabel = new Label("Far Clip");
+        farLabel.setId("far-label");
+        resetFovButton = new Button("reset FOV");
+        resetFovButton.setId("resetFov-button");
+        resetFovButton.setOnAction(resetFovAction);
+        resetNearButton = new Button("reset near");
+        resetNearButton.setId("resetNear-button");
+        resetNearButton.setOnAction(resetNearAction);
+        resetFarButton = new Button("reset far");
+        resetFarButton.setId("resetFar-button");
+        resetFarButton.setOnAction(resetFarAction);
+
+        VBox vbox = new VBox(0, lightColorPicker, backColorPicker, fovLabel, nearLabel, farLabel,
+                resetFovButton, resetNearButton, resetFarButton);
+        vbox.setId("center");
+        vbox.setAlignment(Pos.TOP_CENTER);
+        borderPane.setCenter(vbox);
         
         handleMouse2(fovLabel);
         handleMouse2(nearLabel);
@@ -715,50 +693,31 @@
             }
         });
 
-        borderPane.setLeft(VBoxBuilder.create()
-            .id("left")
-            .spacing(0)
-            .alignment(Pos.TOP_CENTER)
-            .children(
-                light2ColorPicker,
-                light2Label = LabelBuilder.create()
-                    .id("light2-label")
-                    .text("light2")
-                    .build(),
-                light2xyLabel = LabelBuilder.create()
-                    .id("light2xy-label")
-                    .text("light2 XY")
-                    .build(),
-                light2xzLabel = LabelBuilder.create()
-                    .id("light2xz-label")
-                    .text("light2 XZ")
-                    .build(),
-                light2yzLabel = LabelBuilder.create()
-                    .id("light2yz-label")
-                    .text("light2 YZ")
-                    .build(),
-                light2resetXYZButton = ButtonBuilder.create()
-                    .id("light2-resetXYZ")
-                    .text("reset XYZ")
-                    .onAction(light2resetXYZAction)
-                    .build(),
-                light2zeroXYZButton = ButtonBuilder.create()
-                    .id("light2-zeroXYZ")
-                    .text("zero XYZ")
-                    .onAction(light2zeroXYZAction)
-                    .build(),
-                light2show = ButtonBuilder.create()
-                    .id("light2-show")
-                    .text("show")
-                    .onAction(light2showAction)
-                    .build(),
-                light2hide = ButtonBuilder.create()
-                    .id("light2-hide")
-                    .text("hide")
-                    .onAction(light2hideAction)
-                    .build()
-                )
-            .build());
+        light2Label = new Label("light2");
+        light2Label.setId("light2-label");
+        light2xyLabel = new Label("light2 XY");
+        light2xyLabel.setId("light2xy-label");
+        light2xzLabel = new Label("light2 XZ");
+        light2xzLabel.setId("light2xz-label");
+        light2yzLabel = new Label("light2 YZ");
+        light2yzLabel.setId("light2yz-label");
+        light2resetXYZButton = new Button("reset XYZ");
+        light2resetXYZButton.setId("light2-resetXYZ");
+        light2resetXYZButton.setOnAction(light2resetXYZAction);
+        light2zeroXYZButton = new Button("zero XYZ");
+        light2zeroXYZButton.setId("light2-zeroXYZ");
+        light2zeroXYZButton.setOnAction(light2zeroXYZAction);
+        light2show = new Button("show");
+        light2show.setId("light2-show");
+        light2show.setOnAction(light2showAction);
+        light2hide = new Button("hide");
+        light2hide.setId("light2-hide");
+        light2hide.setOnAction(light2hideAction);
+        VBox vbox2 = new VBox(0, light2ColorPicker, light2Label, light2xyLabel, light2xzLabel, light2yzLabel,
+                light2resetXYZButton, light2zeroXYZButton, light2show, light2hide);
+        vbox2.setId("left");
+        vbox2.setAlignment(Pos.TOP_CENTER);
+        borderPane.setLeft(vbox2);
 
         handleMouse2(light2Label);
         handleMouse2(light2xyLabel);
@@ -818,93 +777,59 @@
             }
         });
 
-        borderPane.setRight(VBoxBuilder.create()
-            .id("right")
-            .spacing(0)
-            .alignment(Pos.TOP_CENTER)
-            .children(
-                light3ColorPicker,
-                light3Label = LabelBuilder.create()
-                    .id("light3-label")
-                    .text("light3")
-                    .build(),
-                light3xyLabel = LabelBuilder.create()
-                    .id("light3xy-label")
-                    .text("light3 XY")
-                    .build(),
-                light3xzLabel = LabelBuilder.create()
-                    .id("light3xz-label")
-                    .text("light3 XZ")
-                    .build(),
-                light3yzLabel = LabelBuilder.create()
-                    .id("light3yz-label")
-                    .text("light3 YZ")
-                    .build(),
-                light3resetXYZButton = ButtonBuilder.create()
-                    .id("light3-resetXYZ")
-                    .text("reset XYZ")
-                    .onAction(light3resetXYZAction)
-                    .build(),
-                light3zeroXYZButton = ButtonBuilder.create()
-                    .id("light3-zeroXYZ")
-                    .text("zero XYZ")
-                    .onAction(light3zeroXYZAction)
-                    .build(),
-                light3show = ButtonBuilder.create()
-                    .id("light3-show")
-                    .text("show")
-                    .onAction(light3showAction)
-                    .build(),
-                light3hide = ButtonBuilder.create()
-                    .id("light3-hide")
-                    .text("hide")
-                    .onAction(light3hideAction)
-                    .build()
-                )
-            .build());
+        light3Label = new Label("light3");
+        light3Label.setId("light3-label");
+        light3xyLabel = new Label("light3 XY");
+        light3xyLabel.setId("light3xy-label");
+        light3xzLabel = new Label("light3 XZ");
+        light3xzLabel.setId("light3xz-label");
+        light3yzLabel = new Label("light3 YZ");
+        light3yzLabel.setId("light3yz-label");
+        light3resetXYZButton = new Button("reset XYZ");
+        light3resetXYZButton.setId("light3-resetXYZ");
+        light3resetXYZButton.setOnAction(light3resetXYZAction);
+        light3zeroXYZButton = new Button("zero XYZ");
+        light3zeroXYZButton.setId("light3-zeroXYZ");
+        light3zeroXYZButton.setOnAction(light3zeroXYZAction);
+        light3show = new Button("show");
+        light3show.setId("light3-show");
+        light3show.setOnAction(light3showAction);
+        light3hide = new Button("hide");
+        light3hide.setId("light3-hide");
+        light3hide.setOnAction(light3hideAction);
+
+        VBox vbox3 = new VBox(0, light3ColorPicker, light3Label, light3xyLabel, light3xzLabel, light3yzLabel,
+                light3resetXYZButton, light3zeroXYZButton, light3show, light3hide);
+        vbox3.setId("right");
+        vbox3.setAlignment(Pos.TOP_CENTER);
+        borderPane.setRight(vbox3);
 
         handleMouse2(light3Label);
         handleMouse2(light3xyLabel);
         handleMouse2(light3xzLabel);
         handleMouse2(light3yzLabel);
+/*
+        backButton = new Button("<-");
+        backButton.setId("back-button");
+        backButton.setOnAction(backAction);
+        stopButton = new Button("Stop");
+        stopButton.setId("stop-button");
+        stopButton.setOnAction(stopAction);
+        playButton = new Button("Play");
+        playButton.setId("play-button");
+        playButton.setOnAction(playAction);
+        pauseButton = new Button("Pause");
+        pauseButton.setId("pause-button");
+        pauseButton.setOnAction(pauseAction);
+        forwardButton = new Button("->");
+        forwardButton.setId("forward-button");
+        forwardButton.setOnAction(forwardAction);
 
-
-
-/*
-        borderPane.setBottom(HBoxBuilder.create()
-            .id("bottom")
-            .spacing(0)
-            .alignment(Pos.CENTER)
-            .children(
-                backButton = ButtonBuilder.create()
-                    .id("back-button")
-                    .text("<-")
-                    .onAction(backAction)
-                    .build(),
-                stopButton = ButtonBuilder.create()
-                    .id("stop-button")
-                    .text("Stop")
-                    .onAction(stopAction)
-                    .build(),
-                playButton = ButtonBuilder.create()
-                    .id("play-button")
-                    .text("Play")
-                    .onAction(playAction)
-                    .build(),
-                pauseButton = ButtonBuilder.create()
-                    .id("pause-button")
-                    .text("Pause")
-                    .onAction(pauseAction)
-                    .build(),
-                forwardButton = ButtonBuilder.create()
-                    .id("forward-button")
-                    .text("->")
-                    .onAction(forwardAction)
-                    .build()
-                )
-            .build());
-            */
-        
+        HBox hbox = new HBox(0, backButton, stopButton, playButton, pauseButton, forwardButton);
+        hbox.setId("bottom");
+        hbox.setAlignment(Pos.CENTER);
+        borderPane.setBottom(hbox);
+*/
         stage.show();
     }
     
@@ -1074,9 +999,7 @@
 
         });
     }
-    
- 
-    
+
     //=============================================================================
     // start
     //=============================================================================
--- a/apps/samples/Ensemble8/src/app/java/ensemble/HomePage.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/HomePage.java	Sun Feb 01 13:01:40 2015 +0200
@@ -38,8 +38,6 @@
 import javafx.beans.value.ObservableValue;
 import javafx.css.PseudoClass;
 import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.Bounds;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
@@ -48,16 +46,9 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.Pagination;
 import javafx.scene.control.Skin;
-import javafx.scene.effect.BlendBuilder;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadowBuilder;
-import javafx.scene.effect.Effect;
-import javafx.scene.effect.InnerShadowBuilder;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
 import javafx.util.Callback;
 import java.lang.ref.Reference;
--- a/apps/samples/Ensemble8/src/app/java/ensemble/ScrollEventSynthesizer.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/ScrollEventSynthesizer.java	Sun Feb 01 13:01:40 2015 +0200
@@ -213,11 +213,11 @@
             };
 
             // animate a slow down from current velocity to zero
-            inertiaTimeline = TimelineBuilder.create()
-                .keyFrames(
+            inertiaTimeline = new Timeline(
                     new KeyFrame(Duration.ZERO, new KeyValue(animatePosition, 0)),
-                    new KeyFrame(Duration.millis(INERTIA_DURATION), new KeyValue(animatePosition, 1d, Interpolator.SPLINE(0.0513, 0.1131, 0.1368, 1.0000)))
-                ).build();
+                    new KeyFrame(Duration.millis(INERTIA_DURATION), new KeyValue(animatePosition, 1d,
+                            Interpolator.SPLINE(0.0513, 0.1131, 0.1368, 1.0000)))
+            );
             inertiaTimeline.play();
         }
     }
--- a/apps/samples/Ensemble8/src/app/java/ensemble/control/BendingPages.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/control/BendingPages.java	Sun Feb 01 13:01:40 2015 +0200
@@ -37,9 +37,7 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import javafx.event.EventHandler;
 import javafx.geometry.HPos;
 import javafx.geometry.Point2D;
 import javafx.geometry.VPos;
@@ -47,7 +45,6 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Path;
-import javafx.scene.shape.PathBuilder;
 import javafx.util.Duration;
 import static ensemble.control.BendingPages.State.*;
 import static ensemble.control.BendingPages.AnimationState.*;
@@ -58,16 +55,9 @@
 public class BendingPages extends Region {
 
     private BookBend bookBend;
-    private Path frontPageBack = PathBuilder.create()
-        .stroke(null)
-        .id("frontPageBack")
-        .build();
+    private Path frontPageBack = new Path();
 
-    private Path shadow = PathBuilder.create()
-        .stroke(null)
-        .id("frontPageShadow")
-        .mouseTransparent(true)
-        .build();
+    private Path shadow = new Path();
 
     private ObjectProperty<Node> frontPage = new SimpleObjectProperty<Node>(new Region());
     
@@ -185,6 +175,11 @@
     private Timeline animation;
 
     public BendingPages() {
+        frontPageBack.setStroke(null);
+        frontPageBack.setId("frontPageBack");
+        shadow.setStroke(null);
+        shadow.setId("frontPageShadow");
+        shadow.setMouseTransparent(true);
         getChildren().setAll(backPage.get(), frontPage.get(), frontPageBack, shadow);
         
         backPage.addListener((ObservableValue<? extends Node> arg0, Node arg1, Node arg2) -> {
@@ -332,12 +327,12 @@
         t.addListener((ObservableValue<? extends Number> arg0, Number arg1, Number t1) -> {
             bookBend.update(fx + (targetX - fx) * t1.doubleValue(), fy + (targetY - fy) * t1.doubleValue());
         });
-        animation = TimelineBuilder.create()
-                .keyFrames(new KeyFrame(Duration.millis(200), (ActionEvent arg0) -> {
-                    animState = NO_ANIMATION;
-        },
-                    new KeyValue(t, 1, Interpolator.EASE_OUT)))
-                .build();
+
+        Timeline animation = new Timeline(
+                new KeyFrame(Duration.millis(200), (ActionEvent arg0) -> { animState = NO_ANIMATION; },
+                new KeyValue(t, 1, Interpolator.EASE_OUT))
+        );
+
         animation.play();
         animState = ANIMATION;
         fixMouseTransparency();
--- a/apps/samples/Ensemble8/src/app/java/ensemble/control/BookBend.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/control/BookBend.java	Sun Feb 01 13:01:40 2015 +0200
@@ -292,25 +292,26 @@
                 new Stop(0, pathColor), 
                 new Stop((xC - xF) / (xO - xF), bendStartColor), 
                 new Stop((xB - xF) / (xO - xF), bendEndColor)));
-        
+
+        ArcTo arcTo1 = new ArcTo();
+        arcTo1.setXAxisRotation(Math.toDegrees(-ANGLE));
+        arcTo1.setRadiusX(bE_a);
+        arcTo1.setRadiusY(bE_b);
+        arcTo1.setX(BP1.getX());
+        arcTo1.setY(BP1.getY());
+        ArcTo arcTo2 = new ArcTo();
+        arcTo2.setXAxisRotation(Math.toDegrees(-ANGLE));
+        arcTo2.setRadiusX(rE_a);
+        arcTo2.setRadiusY(rE_b);
+        arcTo2.setX(RP4.getX());
+        arcTo2.setY(RP4.getY());
+
         p.getElements().setAll(
                 new MoveTo(BP4.getX(), BP4.getY()),
-                ArcToBuilder.create()
-                    .XAxisRotation(Math.toDegrees(-ANGLE))
-                    .radiusX(bE_a)
-                    .radiusY(bE_b)
-                    .x(BP1.getX())
-                    .y(BP1.getY())
-                    .build(),
+                arcTo1,
                 new LineTo(xF, yF), 
                 new LineTo(RP1.getX(), RP1.getY()),
-                ArcToBuilder.create()
-                    .XAxisRotation(Math.toDegrees(-ANGLE))
-                    .radiusX(rE_a)
-                    .radiusY(rE_b)
-                    .x(RP4.getX())
-                    .y(RP4.getY())
-                    .build(),
+                arcTo2,
                 new ClosePath());
 
         if (shadow != null) {
@@ -321,26 +322,27 @@
                     new Stop(level0 * 0.3 + level1 * 0.7, Color.rgb(0, 0, 0, 0.25)), 
                     new Stop(level1, Color.rgb(0, 0, 0, 0.0)), 
                     new Stop(1, Color.rgb(0, 0, 0, 0))));
-            
+
+            ArcTo arcTo3 = new ArcTo();
+            arcTo3.setXAxisRotation(Math.toDegrees(-ANGLE));
+            arcTo3.setRadiusX(rE_a);
+            arcTo3.setRadiusY(rE_b);
+            arcTo3.setX(RP4.getX());
+            arcTo3.setY(RP4.getY());
+            arcTo3.setSweepFlag(true);
+            ArcTo arcTo4 = new ArcTo();
+            arcTo4.setXAxisRotation(Math.toDegrees(-ANGLE));
+            arcTo4.setRadiusX(bE_a);
+            arcTo4.setRadiusY(bE_b);
+            arcTo4.setX(BP3.getX());
+            arcTo4.setY(BP3.getY());
+            arcTo4.setSweepFlag(true);
+
             shadow.getElements().setAll(
                     new MoveTo(RP3.getX(), RP3.getY()),
-                    ArcToBuilder.create()
-                        .XAxisRotation(Math.toDegrees(-ANGLE))
-                        .radiusX(rE_a)
-                        .radiusY(rE_b)
-                        .x(RP4.getX())
-                        .y(RP4.getY())
-                        .sweepFlag(true)
-                        .build(),
-                    new LineTo(BP4.getX(), BP4.getY()), 
-                    ArcToBuilder.create()
-                        .XAxisRotation(Math.toDegrees(-ANGLE))
-                        .radiusX(bE_a)
-                        .radiusY(bE_b)
-                        .x(BP3.getX())
-                        .y(BP3.getY())
-                        .sweepFlag(true)
-                        .build(),
+                    arcTo3,
+                    new LineTo(BP4.getX(), BP4.getY()),
+                    arcTo4,
                     new LineTo(xO, yO),
                     new ClosePath());
         }
--- a/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/PieChartDataVisualizer.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/PieChartDataVisualizer.java	Sun Feb 01 13:01:40 2015 +0200
@@ -33,7 +33,6 @@
 
 
 import ensemble.samples.charts.pie.chart.PieChartApp;
-import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
@@ -41,8 +40,8 @@
 import javafx.scene.Node;
 import javafx.scene.chart.PieChart;
 import javafx.scene.chart.PieChart.Data;
-import javafx.scene.control.ContextMenuBuilder;
-import javafx.scene.control.MenuItemBuilder;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TableColumn;
@@ -50,7 +49,6 @@
 import javafx.scene.control.TableRow;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.input.ContextMenuEvent;
-import javafx.util.Callback;
 import javafx.util.StringConverter;
 
 
@@ -119,50 +117,39 @@
             }
         });
 
-        setContextMenu(ContextMenuBuilder.create()
-                .items(
-                    MenuItemBuilder.create()
-                        .text("Insert item")
-//                        .accelerator(new KeyCodeCombination(KeyCode.INSERT, KeyCombination.CONTROL_DOWN))
-                        .onAction(new EventHandler<ActionEvent>() {
-                            
-                            long itemIndex = 0;
+        MenuItem item1 = new MenuItem("Insert item");
+        item1.setOnAction(new EventHandler<ActionEvent>() {
+            long itemIndex = 0;
+            @Override
+            public void handle(ActionEvent t) {
+                int index = getSelectionModel().getSelectedIndex();
+                if (index < 0 || index >= chart.getData().size()) {
+                    index = chart.getData().size();
+                }
+                chart.getData().add(index, new Data("Item " + (++itemIndex), Math.random() * 100));
+                getSelectionModel().select(index);
+            }
+        });
 
-                            @Override
-                            public void handle(ActionEvent t) {
-                                int index = getSelectionModel().getSelectedIndex();
-                                if (index < 0 || index >= chart.getData().size()) {
-                                    index = chart.getData().size();
-                                }
-                                chart.getData().add(index, new Data("Item " + (++itemIndex), Math.random() * 100));
-                                getSelectionModel().select(index);
-                            }
-                        })
-                        .build(),
-                    MenuItemBuilder.create()
-                        .text("Delete item")
-//                        .accelerator(new KeyCodeCombination(KeyCode.DELETE, KeyCombination.CONTROL_DOWN))
-                        .onAction((ActionEvent t) -> {
-                            int index = getSelectionModel().getSelectedIndex();
-                            if (index >= 0 && index < chart.getData().size()) {
-                                chart.getData().remove(index);
-                            }
-        })
-                        .build(),
-                    MenuItemBuilder.create()
-                        .text("Clear data")
-                        .onAction((ActionEvent t) -> {
-                            chart.getData().clear();
-        })
-                        .build(),
-                    MenuItemBuilder.create()
-                        .text("Set new data")
-                        .onAction((ActionEvent t) -> {
-                            chart.setData(PieChartApp.generateData());
-        })
-                        .build())
-                .build());
-        
+        MenuItem item2 = new MenuItem("Delete item");
+        item2.setOnAction((ActionEvent t) -> {
+            int index = getSelectionModel().getSelectedIndex();
+            if (index >= 0 && index < chart.getData().size()) {
+                chart.getData().remove(index);
+            }
+        });
+
+        MenuItem item3 = new MenuItem("Clear data");
+        item3.setOnAction((ActionEvent t) -> {
+            chart.getData().clear();
+        });
+
+        MenuItem item4 = new MenuItem("Set new data");
+        item4.setOnAction((ActionEvent t) -> {
+            chart.setData(PieChartApp.generateData());
+        });
+
+        setContextMenu(new ContextMenu(item1, item2, item3, item4));
         getColumns().setAll(nameColumn, pieValueColumn);
     }
 }
--- a/apps/samples/Modena/src/main/java/modena/Modena.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Modena/src/main/java/modena/Modena.java	Sun Feb 01 13:01:40 2015 +0200
@@ -61,7 +61,7 @@
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.SnapshotParameters;
-import javafx.scene.control.ButtonBuilder;
+import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.ComboBox;
@@ -69,13 +69,11 @@
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.RadioMenuItem;
-import javafx.scene.control.RadioMenuItemBuilder;
-import javafx.scene.control.ScrollPaneBuilder;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Separator;
-import javafx.scene.control.TabBuilder;
+import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToggleButtonBuilder;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.ToolBar;
 import javafx.scene.control.Tooltip;
@@ -83,7 +81,7 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.image.WritableImage;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBoxBuilder;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.transform.Scale;
@@ -309,35 +307,28 @@
             samplePage = samplePageNavigation.getSamplePage();
             // Create Content Area
             contentTabs = new TabPane();
-            contentTabs.getTabs().addAll(
-                TabBuilder.create().text("All Controls").content( samplePageNavigation ).build(),
-                TabBuilder.create().text("UI Mosaic").content(
-                    ScrollPaneBuilder.create().content(
-                        mosaic = (Node)FXMLLoader.load(Modena.class.getResource("ui-mosaic.fxml"))
-                    ).build()
-                ).build(),
-                TabBuilder.create().text("Alignment Test").content(
-                    ScrollPaneBuilder.create().content(
-                        heightTest = (Node)FXMLLoader.load(Modena.class.getResource("SameHeightTest.fxml"))
-                    ).build()
-                ).build(),
-                TabBuilder.create().text("Simple Windows").content(
-                    ScrollPaneBuilder.create().content(
-                        simpleWindows = new SimpleWindowPage()
-                    ).build()
-                ).build(),
-                TabBuilder.create().text("Combinations").content(
-                    ScrollPaneBuilder.create().content(
-                        combinationsTest = (Node)FXMLLoader.load(Modena.class.getResource("CombinationTest.fxml"))
-                    ).build()
-                ).build(),
-                // Customer example from bug report http://javafx-jira.kenai.com/browse/DTL-5561
-                TabBuilder.create().text("Customer Example").content(
-                    ScrollPaneBuilder.create().content(
-                        customerTest = (Node)FXMLLoader.load(Modena.class.getResource("ScottSelvia.fxml"))
-                    ).build()
-                ).build()
-            );
+            Tab tab1 = new Tab("All Controls");
+            tab1.setContent(samplePageNavigation);
+            Tab tab2 = new Tab("UI Mosaic");
+            tab2.setContent(new ScrollPane(mosaic = (Node)FXMLLoader.load(Modena.class.getResource("ui-mosaic.fxml"))));
+
+            Tab tab3 = new Tab("Alignment Test");
+            tab3.setContent(new ScrollPane(heightTest =
+                    (Node)FXMLLoader.load(Modena.class.getResource("SameHeightTest.fxml"))));
+
+            Tab tab4 = new Tab("Simple Windows");
+            tab4.setContent(new ScrollPane(simpleWindows = new SimpleWindowPage()));
+
+            Tab tab5 = new Tab("Combinations");
+            tab5.setContent(new ScrollPane(combinationsTest =
+                    (Node)FXMLLoader.load(Modena.class.getResource("CombinationTest.fxml"))));
+
+            // Customer example from bug report http://javafx-jira.kenai.com/browse/DTL-5561
+            Tab tab6 = new Tab("Customer Example");
+            tab6.setContent(new ScrollPane(customerTest =
+                    (Node)FXMLLoader.load(Modena.class.getResource("ScottSelvia.fxml"))));
+
+            contentTabs.getTabs().addAll(tab1, tab2, tab3, tab4, tab5, tab6);
             contentTabs.getSelectionModel().select(selectedTab);
             samplePage.setMouseTransparent(test);
             // height test set selection for 
@@ -350,64 +341,54 @@
                 }
             });
             // Create Toolbar
-            retinaButton = ToggleButtonBuilder.create()
-                .text("@2x")
-                .selected(retina)
-                .onAction(event -> {
-                    ToggleButton btn = (ToggleButton)event.getSource();
-                    setRetinaMode(btn.isSelected());
-                })
-                .build();
+            retinaButton = new ToggleButton("@2x");
+            retinaButton.setSelected(retina);
+            retinaButton.setOnAction(event -> {
+                ToggleButton btn = (ToggleButton)event.getSource();
+                setRetinaMode(btn.isSelected());
+            });
             ToggleGroup themesToggleGroup = new ToggleGroup();
-            ToolBar toolBar = new ToolBar(
-                HBoxBuilder.create()
-                    .children(
-                        modenaButton = ToggleButtonBuilder.create()
-                            .text("Modena")
-                            .toggleGroup(themesToggleGroup)
-                            .selected(modena)
-                            .onAction(rebuild)
-                            .styleClass("left-pill")
-                            .build(),
-                        ToggleButtonBuilder.create()
-                            .text("Caspian")
-                            .toggleGroup(themesToggleGroup)
-                            .selected(!modena)
-                            .onAction(rebuild)
-                            .styleClass("right-pill")
-                            .build()
-                    )
-                    .build(),
-                ButtonBuilder.create()
-                    .graphic(new ImageView(new Image(Modena.class.getResource("reload_12x14.png").toString())))
-                    .onAction(rebuild)
-                    .build(),
-                rtlButton = ToggleButtonBuilder.create()
-                    .text("RTL")
-                    .onAction(event -> root.setNodeOrientation(rtlButton.isSelected() ? 
-                            NodeOrientation.RIGHT_TO_LEFT : NodeOrientation.LEFT_TO_RIGHT))
-                    .build(),
-                embeddedPerformanceButton = ToggleButtonBuilder.create()
-                    .text("EP")
-                    .selected(embeddedPerformanceMode)
-                    .tooltip(new Tooltip("Apply Embedded Performance extra stylesheet"))
-                    .onAction(event -> {
-                        embeddedPerformanceMode = embeddedPerformanceButton.isSelected();
-                        rebuild.handle(event);
-                    })
-                    .build(),
-                new Separator(),
-                retinaButton,
-                new Label("Base:"),
-                createBaseColorPicker(),
-                new Label("Background:"),
-                createBackgroundColorPicker(),
-                new Label("Accent:"),
-                createAccentColorPicker(),
-                new Separator(),
-                ButtonBuilder.create().text("Save...").onAction(saveBtnHandler).build(),
-                ButtonBuilder.create().text("Restart").onAction(event -> restart()).build()
-            );
+            modenaButton = new ToggleButton("Modena");
+            modenaButton.setToggleGroup(themesToggleGroup);
+            modenaButton.setSelected(modena);
+            modenaButton.setOnAction(rebuild);
+            modenaButton.getStyleClass().add("left-pill:");
+            ToggleButton caspianButton = new ToggleButton("Caspian");
+            caspianButton.setToggleGroup(themesToggleGroup);
+            caspianButton.setSelected(!modena);
+            caspianButton.setOnAction(rebuild);
+            caspianButton.getStyleClass().add("right-pill");
+            Button reloadButton = new Button("", new ImageView(new Image(Modena.class.getResource("reload_12x14.png").toString())));
+            reloadButton.setOnAction(rebuild);
+
+            rtlButton = new ToggleButton("RTL");
+            rtlButton.setOnAction(event -> root.setNodeOrientation(rtlButton.isSelected() ?
+                    NodeOrientation.RIGHT_TO_LEFT : NodeOrientation.LEFT_TO_RIGHT));
+
+            embeddedPerformanceButton = new ToggleButton("EP");
+            embeddedPerformanceButton.setSelected(embeddedPerformanceMode);
+            embeddedPerformanceButton.setTooltip(new Tooltip("Apply Embedded Performance extra stylesheet"));
+            embeddedPerformanceButton.setOnAction(event -> {
+                embeddedPerformanceMode = embeddedPerformanceButton.isSelected();
+                rebuild.handle(event);
+            });
+
+            Button saveButton = new Button("Save...");
+            saveButton.setOnAction(saveBtnHandler);
+
+            Button restartButton = new Button("Restart");
+            retinaButton.setOnAction(event -> restart());
+
+            ToolBar toolBar = new ToolBar(new HBox(modenaButton, caspianButton), reloadButton, rtlButton,
+                    embeddedPerformanceButton, new Separator(), retinaButton,
+                    new Label("Base:"),
+                    createBaseColorPicker(),
+                    new Label("Background:"),
+                    createBackgroundColorPicker(),
+                    new Label("Accent:"),
+                    createAccentColorPicker(),
+                    new Separator(), saveButton, restartButton
+                    );
             toolBar.setId("TestAppToolbar");
             // Create content group used for scaleing @2x
             final Pane contentGroup = new Pane() {
@@ -444,7 +425,11 @@
     }
 
     public RadioMenuItem buildFontRadioMenuItem(String name, final String in_fontName, final int in_fontSize, ToggleGroup tg) {
-        return RadioMenuItemBuilder.create().text(name).onAction(event -> setFont(in_fontName, in_fontSize)).style("-fx-font: " + in_fontSize + "px \"" + in_fontName + "\";").toggleGroup(tg).build();
+        RadioMenuItem rmItem = new RadioMenuItem(name);
+        rmItem.setOnAction(event -> setFont(in_fontName, in_fontSize));
+        rmItem.setStyle("-fx-font: " + in_fontSize + "px \"" + in_fontName + "\";");
+        rmItem.setToggleGroup(tg);
+        return rmItem;
     }
     
     public void setFont(String in_fontName, int in_fontSize) {
--- a/apps/samples/Modena/src/main/java/modena/SamplePage.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Modena/src/main/java/modena/SamplePage.java	Sun Feb 01 13:01:40 2015 +0200
@@ -46,10 +46,8 @@
 import javafx.scene.control.*;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.HBoxBuilder;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-import javafx.scene.layout.VBoxBuilder;
 import javafx.scene.paint.Color;
 import javafx.scene.web.HTMLEditor;
 
@@ -82,20 +80,27 @@
                 withState(new Button("Focused & Hover"), "focused, hover"),
                 withState(new Button("Focused & Armed"), "focused, armed"),
                 withState(new Button("Disabled"), "disabled"));
+        Button defaultButton = new Button("Button");
+        defaultButton.setDefaultButton(true);
         newSection("Default Button:",
-                ButtonBuilder.create().text("Button").defaultButton(true).build(),
+                defaultButton,
                 withState(new Button("Hover"), "default, hover"),
                 withState(new Button("Armed"), "default, armed"),
                 withState(new Button("Focused"), "default, focused"),
                 withState(new Button("Focused & Hover"), "default, focused, hover"),
                 withState(new Button("Focused & Armed"), "default, focused, armed"),
                 withState(new Button("Disabled"), "default, disabled"));
-        newSection("Nice Colors:",
-                ButtonBuilder.create().text("Button").style("-fx-base: #f3622d;").build(),
-                ButtonBuilder.create().text("Button").style("-fx-base: #fba71b;").build(),
-                ButtonBuilder.create().text("Button").style("-fx-base: #57b757;").build(),
-                ButtonBuilder.create().text("Button").style("-fx-base: #41a9c9;").build(),
-                ButtonBuilder.create().text("Button").style("-fx-base: #888;").build());
+        Button b1 = new Button("Button");
+        b1.setStyle("-fx-base: #f3622d;");
+        Button b2 = new Button("Button");
+        b2.setStyle("-fx-base: #fba71b;");
+        Button b3 = new Button("Button");
+        b3.setStyle("-fx-base: #57b757;");
+        Button b4 = new Button("Button");
+        b4.setStyle("-fx-base: #41a9c9;");
+        Button b5 = new Button("Button");
+        b5.setStyle("-fx-base: #888;");
+        newSection("Nice Colors:", b1, b2, b3, b4, b5);
         newSection("Greys:",0,
                 createGreyButton(0),
                 createGreyButton(0.1),
@@ -112,89 +117,150 @@
         ToggleGroup tg2 = new ToggleGroup();
         ToggleGroup tg3 = new ToggleGroup();
         ToggleGroup tg4 = new ToggleGroup();
+
+        ToggleButton left1 = new ToggleButton("Left");
+        left1.getStyleClass().add("left-pill");
+        left1.setToggleGroup(tg1);
+        ToggleButton center1 = new ToggleButton("Center");
+        center1.getStyleClass().add("center-pill");
+        center1.setToggleGroup(tg1);
+        ToggleButton right1 = new ToggleButton("Right");
+        right1.getStyleClass().add("right-pill");
+        right1.setToggleGroup(tg1);
+
+        ToggleButton left2 = new ToggleButton("Left");
+        left2.getStyleClass().add("left-pill");
+        left2.setToggleGroup(tg2);
+        left2.setSelected(true);
+        ToggleButton center2 = new ToggleButton("Center");
+        center2.getStyleClass().add("center-pill");
+        center2.setToggleGroup(tg2);
+        ToggleButton right2 = new ToggleButton("Right");
+        right2.getStyleClass().add("right-pill");
+        right2.setToggleGroup(tg2);
+
+        ToggleButton left3 = new ToggleButton("Left");
+        left3.getStyleClass().add("left-pill");
+        left3.setToggleGroup(tg3);
+        ToggleButton center3 = new ToggleButton("Center");
+        center3.getStyleClass().add("center-pill");
+        center3.setToggleGroup(tg3);
+        center3.setSelected(true);
+        ToggleButton right3 = new ToggleButton("Right");
+        right3.getStyleClass().add("right-pill");
+        right3.setToggleGroup(tg3);
+
+        ToggleButton left4 = new ToggleButton("Left");
+        left4.getStyleClass().add("left-pill");
+        left4.setToggleGroup(tg4);
+        ToggleButton center4 = new ToggleButton("Center");
+        center4.getStyleClass().add("center-pill");
+        center4.setToggleGroup(tg4);
+        ToggleButton right4 = new ToggleButton("Right");
+        right4.getStyleClass().add("right-pill");
+        right4.setToggleGroup(tg4);
+        right4.setSelected(true);
+
         newSection("Pill Toggle\nButtons:",
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("Left").styleClass("left-pill").toggleGroup(tg1).build(),
-                        ToggleButtonBuilder.create().text("Center").styleClass("center-pill").toggleGroup(tg1).build(),
-                        ToggleButtonBuilder.create().text("Right").styleClass("right-pill").toggleGroup(tg1).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("Left").styleClass("left-pill").toggleGroup(tg2).selected(true).build(),
-                        ToggleButtonBuilder.create().text("Center").styleClass("center-pill").toggleGroup(tg2).build(),
-                        ToggleButtonBuilder.create().text("Right").styleClass("right-pill").toggleGroup(tg2).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("Left").styleClass("left-pill").toggleGroup(tg3).build(),
-                        ToggleButtonBuilder.create().text("Center").styleClass("center-pill").toggleGroup(tg3).selected(true).build(),
-                        ToggleButtonBuilder.create().text("Right").styleClass("right-pill").toggleGroup(tg3).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("Left").styleClass("left-pill").toggleGroup(tg4).build(),
-                        ToggleButtonBuilder.create().text("Center").styleClass("center-pill").toggleGroup(tg4).build(),
-                        ToggleButtonBuilder.create().text("Right").styleClass("right-pill").toggleGroup(tg4).selected(true).build()
-                    )
-                    .build());
+                new HBox(left1, center1, right1),
+                new HBox(left2, center2, right2),
+                new HBox(left3, center3, right3),
+                new HBox(left4, center4, right4)
+        );
+
         ToggleGroup tg5 = new ToggleGroup();
         ToggleGroup tg6 = new ToggleGroup();
         ToggleGroup tg7 = new ToggleGroup();
         ToggleGroup tg8 = new ToggleGroup();
+
+        ToggleButton left5 = new ToggleButton("#");
+        left5.getStyleClass().add("left-pill");
+        left5.setToggleGroup(tg5);
+        ToggleButton center5 = new ToggleButton("#");
+        center5.getStyleClass().add("center-pill");
+        center5.setToggleGroup(tg5);
+        ToggleButton right5 = new ToggleButton("#");
+        right5.getStyleClass().add("right-pill");
+        right5.setToggleGroup(tg5);
+
+        ToggleButton left5_1 = new ToggleButton("L");
+        left5_1.getStyleClass().add("left-pill");
+        left5_1.setToggleGroup(tg5);
+        withState(left5_1, "focused");
+        ToggleButton center5_1 = new ToggleButton("C");
+        center5_1.getStyleClass().add("center-pill");
+        center5_1.setToggleGroup(tg5);
+        ToggleButton right5_1 = new ToggleButton("R");
+        right5_1.getStyleClass().add("right-pill");
+        right5_1.setToggleGroup(tg5);
+
+        ToggleButton left5_2 = new ToggleButton("L");
+        left5_2.getStyleClass().add("left-pill");
+        left5_2.setToggleGroup(tg5);
+        ToggleButton center5_2 = new ToggleButton("C");
+        center5_2.getStyleClass().add("center-pill");
+        center5_2.setToggleGroup(tg5);
+        withState(center5_2, "focused");
+        ToggleButton right5_2 = new ToggleButton("R");
+        right5_2.getStyleClass().add("right-pill");
+        right5_2.setToggleGroup(tg5);
+
+        ToggleButton left5_3 = new ToggleButton("L");
+        left5_3.getStyleClass().add("left-pill");
+        left5_3.setToggleGroup(tg5);
+        ToggleButton center5_3 = new ToggleButton("C");
+        center5_3.getStyleClass().add("center-pill");
+        center5_3.setToggleGroup(tg5);
+        ToggleButton right5_3 = new ToggleButton("R");
+        right5_3.getStyleClass().add("right-pill");
+        right5_3.setToggleGroup(tg5);
+        withState(right5_3, "focused");
+
+        ToggleButton left6 = new ToggleButton("L");
+        left6.getStyleClass().add("left-pill");
+        left6.setToggleGroup(tg6);
+        left6.setSelected(true);
+        withState(left6, "focused");
+        ToggleButton center6 = new ToggleButton("C");
+        center6.getStyleClass().add("center-pill");
+        center6.setToggleGroup(tg6);
+        ToggleButton right6 = new ToggleButton("R");
+        right6.getStyleClass().add("right-pill");
+        right6.setToggleGroup(tg6);
+
+        ToggleButton left7 = new ToggleButton("L");
+        left7.getStyleClass().add("left-pill");
+        left7.setToggleGroup(tg7);
+        ToggleButton center7 = new ToggleButton("C");
+        center7.getStyleClass().add("center-pill");
+        center7.setToggleGroup(tg7);
+        center7.setSelected(true);
+        withState(center7, "focused");
+        ToggleButton right7 = new ToggleButton("R");
+        right7.getStyleClass().add("right-pill");
+        right7.setToggleGroup(tg7);
+
+        ToggleButton left8 = new ToggleButton("L");
+        left8.getStyleClass().add("left-pill");
+        left8.setToggleGroup(tg8);
+        ToggleButton center8 = new ToggleButton("C");
+        center8.getStyleClass().add("center-pill");
+        center8.setToggleGroup(tg8);
+        ToggleButton right8 = new ToggleButton("R");
+        right8.getStyleClass().add("right-pill");
+        right8.setToggleGroup(tg8);
+        right8.setSelected(true);
+        withState(right8, "focused");
+
         newSection("Pill Toggle\nButtons\nFocused:",
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("#").styleClass("left-pill").toggleGroup(tg5).build(),
-                        ToggleButtonBuilder.create().text("#").styleClass("center-pill").toggleGroup(tg5).build(),
-                        ToggleButtonBuilder.create().text("#").styleClass("right-pill").toggleGroup(tg5).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        withState(ToggleButtonBuilder.create().text("L").styleClass("left-pill").toggleGroup(tg5).build(),"focused"),
-                        ToggleButtonBuilder.create().text("C").styleClass("center-pill").toggleGroup(tg5).build(),
-                        ToggleButtonBuilder.create().text("R").styleClass("right-pill").toggleGroup(tg5).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("L").styleClass("left-pill").toggleGroup(tg5).build(),
-                        withState(ToggleButtonBuilder.create().text("C").styleClass("center-pill").toggleGroup(tg5).build(),"focused"),
-                        ToggleButtonBuilder.create().text("R").styleClass("right-pill").toggleGroup(tg5).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("L").styleClass("left-pill").toggleGroup(tg5).build(),
-                        ToggleButtonBuilder.create().text("C").styleClass("center-pill").toggleGroup(tg5).build(),
-                        withState(ToggleButtonBuilder.create().text("R").styleClass("right-pill").toggleGroup(tg5).build(),"focused")
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        withState(ToggleButtonBuilder.create().text("L").styleClass("left-pill").toggleGroup(tg6).selected(true).build(),"focused"),
-                        ToggleButtonBuilder.create().text("C").styleClass("center-pill").toggleGroup(tg6).build(),
-                        ToggleButtonBuilder.create().text("R").styleClass("right-pill").toggleGroup(tg6).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("L").styleClass("left-pill").toggleGroup(tg7).build(),
-                        withState(ToggleButtonBuilder.create().text("C").styleClass("center-pill").toggleGroup(tg7).selected(true).build(),"focused"),
-                        ToggleButtonBuilder.create().text("R").styleClass("right-pill").toggleGroup(tg7).build()
-                    )
-                    .build(),
-                HBoxBuilder.create()
-                    .children(
-                        ToggleButtonBuilder.create().text("L").styleClass("left-pill").toggleGroup(tg8).build(),
-                        ToggleButtonBuilder.create().text("C").styleClass("center-pill").toggleGroup(tg8).build(),
-                        withState(ToggleButtonBuilder.create().text("R").styleClass("right-pill").toggleGroup(tg8).selected(true).build(),"focused")
-                    )
-                    .build());
+                new HBox(left5, center5, right5),
+                new HBox(left5_1, center5_1, right5_1),
+                new HBox(left5_2, center5_2, right5_2),
+                new HBox(left5_3, center5_3, right5_3),
+                new HBox(left6, center6, right6),
+                new HBox(left7, center7, right7),
+                new HBox(left8, center8, right8)
+        );
         newSection("ToggleButton:",
                 new ToggleButton("Button"),
                 withState(new ToggleButton("Hover"), "hover"),
@@ -227,8 +293,13 @@
                 withState(new CheckBox("Focused & Hover"), "selected, focused, hover"),
                 withState(new CheckBox("Focused & Armed"), "selected, focused, armed"),
                 withState(new CheckBox("Disabled"), "selected, disabled"));
+
+        CheckBox checkB = new CheckBox("CheckBox");
+        checkB.setSelected(true);
+        checkB.setIndeterminate(true);
+        checkB.setAllowIndeterminate(true);
         newSection("CheckBox\nIndeterminate:",
-                CheckBoxBuilder.create().text("CheckBox").selected(true).indeterminate(true).allowIndeterminate(true).build(),
+                checkB,
                 withState(new CheckBox("Hover"), "indeterminate, selected, hover"),
                 withState(new CheckBox("Armed"), "indeterminate, selected, armed"),
                 withState(new CheckBox("Focused"), "indeterminate, selected, focused"),
@@ -263,36 +334,68 @@
                 withState(new Hyperlink("Disabled"), "disabled"));
         ObservableList<String> choiceBoxLongList = sampleItems(200);
         choiceBoxLongList.add(100, "Long List");
+        ChoiceBox<String> cb1 = new ChoiceBox<String>(sampleItems());
+        cb1.setValue("Item A");
+        ChoiceBox<String> cb2 = new ChoiceBox<String>(choiceBoxLongList);
+        cb2.setValue("Long List");
+        ChoiceBox<String> cb3 = new ChoiceBox<String>(sampleItems());
+        cb3.setValue("Item B");
+        ChoiceBox<String> cb4 = new ChoiceBox<String>(sampleItems());
+        cb4.setValue("Item B");
+        ChoiceBox<String> cb5 = new ChoiceBox<String>(sampleItems());
+        cb5.setValue("Item B");
+        ChoiceBox<String> cb6 = new ChoiceBox<String>(sampleItems());
+        cb6.setValue("Item C");
+        cb6.setDisable(true);
         newSection(
-                "ChoiceBox:",
-                ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item A").build(),
-                ChoiceBoxBuilder.<String>create().items(choiceBoxLongList).value("Long List").build(),
-                withState(ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "hover"),
-                withState(ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "showing"),
-                withState(ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "focused"),
-                ChoiceBoxBuilder.<String>create().items(sampleItems()).value("Item C").disable(true).build()
-        );
+                "ChoiceBox:", cb1, cb2,
+                withState(cb3, "hover"),
+                withState(cb4,"showing"),
+                withState(cb5,"focused"),
+                cb6);
+        ChoiceBox<String> c1 = new ChoiceBox<String>(sampleItems());
+        c1.setValue("Item A");
+        ChoiceBox<String> c2 = new ChoiceBox<String>(choiceBoxLongList);
+        c2.setValue("Long List");
+        ChoiceBox<String> c3 = new ChoiceBox<String>(sampleItems());
+        c3.setValue("Item B");
+        ChoiceBox<String> c4 = new ChoiceBox<String>(sampleItems());
+        c4.setValue("Item B");
+        ChoiceBox<String> c5 = new ChoiceBox<String>(sampleItems());
+        c5.setValue("Item B");
+        ChoiceBox<String> c6 = new ChoiceBox<String>(sampleItems());
+        c6.setValue("Item C");
+        c6.setDisable(true);
         newSection(
-                "ComboBox:",
-                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item A").build(),
-                ComboBoxBuilder.<String>create().items(choiceBoxLongList).value("Long List").build(),
-                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "hover"),
-                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "showing"),
-                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").build(), "focused"),
-                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item C").disable(true).build()
-                );
+                "ChoiceBox:", c1, c2,
+                withState(c3, "hover"),
+                withState(c4, "showing"),
+                withState(c5,"focused"),
+                c6);
+        ComboBox<String> com1 = new ComboBox<String>(sampleItems());
+        com1.setValue("Item A");
+        com1.setEditable(true);
+        ComboBox<String> com2 = new ComboBox<String>(sampleItems());
+        com2.setValue("Item B");
+        com2.setEditable(true);
+        ComboBox<String> com3 = new ComboBox<String>(sampleItems());
+        com3.setValue("Item B");
+        com3.setEditable(true);
         newSection(
-                "ComboBox\nEditable:",
-                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item A").editable(true).build(),
-                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").editable(true).build(), "editable", ".arrow-button", "hover"),
-                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").editable(true).build(), "editable", ".arrow-button", "pressed")
-                );
+                "ComboBox\nEditable:", com1,
+                withState(com2, "editable", ".arrow-button", "hover"),
+                withState(com3, "editable", ".arrow-button", "pressed"));
+        ComboBox<String> co1 = new ComboBox<String>(sampleItems());
+        co1.setValue("Item B");
+        co1.setEditable(true);
+        ComboBox<String> co2 = new ComboBox<String>(sampleItems());
+        co2.setValue("Item C");
+        co2.setEditable(true);
+        co2.setDisable(true);
         newSection(
                 "ComboBox\nEditable\n(More):",
-                withState(ComboBoxBuilder.<String>create().items(sampleItems()).value("Item B").editable(true).build(), "editable,contains-focus", ".text-field", "focused"),
-                ComboBoxBuilder.<String>create().items(sampleItems()).value("Item C").editable(true).disable(true).build()
-                );
-
+                withState(co1, "editable,contains-focus", ".text-field", "focused"),
+                co2);
         String[] spinnerStyles = new String[] {
                 "default",
                 Spinner.STYLE_CLASS_ARROWS_ON_RIGHT_HORIZONTAL,
@@ -316,149 +419,266 @@
                     spinners[2]
             );
         }
-
+        newSection("Color Picker:", new ColorPicker(Color.RED), withState(new ColorPicker(Color.RED), "hover"),
+                withState(new ColorPicker(Color.RED), "showing"), withState(new ColorPicker(Color.RED), "focused"),
+                withState(new ColorPicker(Color.RED), "disabled"));
+        ColorPicker cp1 = new ColorPicker(Color.RED);
+        cp1.getStyleClass().add(ColorPicker.STYLE_CLASS_SPLIT_BUTTON);
+        ColorPicker cp2 = new ColorPicker(Color.RED);
+        cp2.getStyleClass().add(ColorPicker.STYLE_CLASS_SPLIT_BUTTON);
+        ColorPicker cp3 = new ColorPicker(Color.RED);
+        cp3.getStyleClass().add(ColorPicker.STYLE_CLASS_SPLIT_BUTTON);
+        ColorPicker cp4 = new ColorPicker(Color.RED);
+        cp4.getStyleClass().add(ColorPicker.STYLE_CLASS_SPLIT_BUTTON);
+        ColorPicker cp5 = new ColorPicker(Color.RED);
+        cp5.getStyleClass().add(ColorPicker.STYLE_CLASS_SPLIT_BUTTON);
         newSection(
-                "Color Picker:",
-                ColorPickerBuilder.create().value(Color.RED).build(),
-                withState(ColorPickerBuilder.create().value(Color.RED).build(), "hover"),
-                withState(ColorPickerBuilder.create().value(Color.RED).build(), "showing"),
-                withState(ColorPickerBuilder.create().value(Color.RED).build(), "focused"),
-                withState(ColorPickerBuilder.create().value(Color.RED).build(), "disabled")
-                );
+                "Color Picker\n Split Button:", cp1,
+                withState(cp2, "hover"),
+                withState(cp3,"showing"),
+                withState(cp4, "focused"),
+                withState(cp5,"disabled"));
+        MenuButton mb1 = new MenuButton();
+        mb1.getItems().addAll(createMenuItems(20));
+        mb1.setText("right");
+        mb1.setPopupSide(Side.RIGHT);
+        MenuButton mb2 = new MenuButton();
+        mb2.getItems().addAll(createMenuItems(20));
+        mb2.setText("normal");
+        MenuButton mb3 = new MenuButton();
+        mb3.getItems().addAll(createMenuItems(20));
+        mb3.setText("hover");
+        MenuButton mb4 = new MenuButton();
+        mb4.getItems().addAll(createMenuItems(20));
+        mb4.setText("armed");
+        MenuButton mb5 = new MenuButton();
+        mb5.getItems().addAll(createMenuItems(20));
+        mb5.setText("focused");
+        MenuButton mb6 = new MenuButton();
+        mb6.getItems().addAll(createMenuItems(20));
+        mb6.setText("disabled");
+        newSection("MenuButton:", mb1, mb2,
+                withState(mb3, "openvertically, hover"),
+                withState(mb4, "openvertically, armed"),
+                withState(mb5, "openvertically, focused"),
+                withState(mb6, "openvertically, disabled"));
+        SplitMenuButton splitmb1 = new SplitMenuButton(createMenuItems(20));
+        splitmb1.setText("right");
+        splitmb1.setPopupSide(Side.RIGHT);
+        SplitMenuButton splitmb2 = new SplitMenuButton(createMenuItems(20));
+        splitmb2.setText("normal");
+        SplitMenuButton splitmb3 = new SplitMenuButton(createMenuItems(20));
+        splitmb3.setText("hover");
+        SplitMenuButton splitmb4 = new SplitMenuButton(createMenuItems(20));
+        splitmb4.setText("armed");
         newSection(
-                "Color Picker\n Split Button:",
-                ColorPickerBuilder.create().value(Color.RED).styleClass(ColorPicker.STYLE_CLASS_SPLIT_BUTTON).build(),
-                withState(ColorPickerBuilder.create().value(Color.RED).styleClass(ColorPicker.STYLE_CLASS_SPLIT_BUTTON).build(), "hover"),
-                withState(ColorPickerBuilder.create().value(Color.RED).styleClass(ColorPicker.STYLE_CLASS_SPLIT_BUTTON).build(), "showing"),
-                withState(ColorPickerBuilder.create().value(Color.RED).styleClass(ColorPicker.STYLE_CLASS_SPLIT_BUTTON).build(), "focused"),
-                withState(ColorPickerBuilder.create().value(Color.RED).styleClass(ColorPicker.STYLE_CLASS_SPLIT_BUTTON).build(), "disabled")
-                );
+                "SplitMenuButton:", splitmb1, splitmb2,
+                withState(splitmb3, "openvertically",".label", "hover"),
+                withState(splitmb4,"armed,openvertically",".label", "armed"));
+        SplitMenuButton splitmb_m1 = new SplitMenuButton(createMenuItems(20));
+        splitmb_m1.setText("arrow hover");
+        SplitMenuButton splitmb_m2 = new SplitMenuButton(createMenuItems(20));
+        splitmb_m2.setText("showing");
+        SplitMenuButton splitmb_m3 = new SplitMenuButton(createMenuItems(20));
+        splitmb_m3.setText("focused");
+        SplitMenuButton splitmb_m4 = new SplitMenuButton(createMenuItems(20));
+        splitmb_m4.setText("disabled");
         newSection(
-                "MenuButton:",
-                MenuButtonBuilder.create().items(createMenuItems(20)).text("right").popupSide(Side.RIGHT).build(),
-                MenuButtonBuilder.create().items(createMenuItems(20)).text("normal").build(),
-                withState(MenuButtonBuilder.create().items(createMenuItems(20)).text("hover").build(), "openvertically,hover"),
-                withState(MenuButtonBuilder.create().items(createMenuItems(20)).text("armed").build(), "openvertically,armed"),
-                withState(MenuButtonBuilder.create().items(createMenuItems(20)).text("focused").build(), "openvertically,focused"),
-                withState(MenuButtonBuilder.create().items(createMenuItems(20)).text("disabled").build(), "openvertically,disabled")
-                );
-        newSection(
-                "SplitMenuButton:",
-                SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("right").popupSide(Side.RIGHT).build(),
-                SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("normal").build(),
-                withState(SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("hover").build(),"openvertically",".label", "hover"),
-                withState(SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("armed").build(),"armed,openvertically",".label", "armed")
-                );
-        newSection(
-                "SplitMenuButton\nMore:",
-                withState(SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("arrow hover").build(), "openvertically", ".arrow-button", "hover"),
-                withState(SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("showing").build(), "openvertically,showing"),
-                withState(SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("focused").build(), "openvertically,focused"),
-                withState(SplitMenuButtonBuilder.create().items(createMenuItems(20)).text("disabled").build(), "openvertically,disabled")
-                );
+                "SplitMenuButton\nnMore:",
+                withState(splitmb_m1, "openvertically", ".arrow-button", "hover"),
+                withState(splitmb_m2, "openvertically,showing"),
+                withState(splitmb_m3, "openvertically,focused"),
+                withState(splitmb_m4, "openvertically,disabled"));
         newSection(
                 "DatePicker:",
                 new DatePicker(),
                 withState(new DatePicker(),"hover"),
                 withState(new DatePicker(), "showing"),
                 withState(new DatePicker(), "focused"),
-                withState(new DatePicker(), "disabled")
-                );
+                withState(new DatePicker(), "disabled"));
+        Slider s1 = new Slider(0, 100, 50);
+        s1.setMaxWidth(90);
+        Slider s2 = new Slider(0, 100, 50);
+        s2.setMaxWidth(90);
+        Slider s3 = new Slider(0, 100, 50);
+        s3.setMaxWidth(90);
+        Slider s4 = new Slider(0, 100, 50);
+        s4.setMaxWidth(90);
+        Slider s5 = new Slider(0, 100, 50);
+        s5.setShowTickLabels(true);
+        s5.setShowTickMarks(true);
         newDetailedSection(
                 new String[]{"Slider (H):", "normal", "hover", "pressed", "disabled", "tickmarks"},
-                withState(SliderBuilder.create().maxWidth(90).min(0).max(100).value(50).build(), null),
-                withState(SliderBuilder.create().maxWidth(90).min(0).max(100).value(50).build(), null, ".thumb", "hover"),
-                withState(SliderBuilder.create().maxWidth(90).min(0).max(100).value(50).build(), null, ".thumb", "hover, pressed"),
-                withState(SliderBuilder.create().maxWidth(90).min(0).max(100).value(50).build(), "disabled"),
-                SliderBuilder.create().min(0).max(100).value(50).showTickMarks(true).showTickLabels(true).build());
+                withState(s1, null),
+                withState(s2, null, ".thumb", "hover"),
+                withState(s3, null, ".thumb", "hover, pressed"),
+                withState(s4, "disabled"),
+                s5);
         newDetailedSection(
                 new String[]{"Slider (H) Focused:", "normal", "hover", "pressed"},
                 withState(new Slider(0, 100, 50), "focused"),
                 withState(new Slider(0, 100, 50), "focused", ".thumb", "hover"),
                 withState(new Slider(0, 100, 50), "focused", ".thumb", "hover, pressed"));
+        Slider s_v1 = new Slider(0, 100, 50);
+        s_v1.setOrientation(Orientation.VERTICAL);
+        Slider s_v2 = new Slider(0, 100, 50);
+        s_v2.setOrientation(Orientation.VERTICAL);
+        Slider s_v3 = new Slider(0, 100, 50);
+        s_v3.setOrientation(Orientation.VERTICAL);
+        Slider s_v4 = new Slider(0, 100, 50);
+        s_v4.setOrientation(Orientation.VERTICAL);
+        Slider s_v5 = new Slider(0, 100, 50);
+        s_v5.setOrientation(Orientation.VERTICAL);
+        s_v5.setShowTickLabels(true);
+        s_v5.setShowTickMarks(true);
         newSection("Slider - V:",
-                SliderBuilder.create().min(0).max(100).value(50).orientation(Orientation.VERTICAL).build(),
-                withState(SliderBuilder.create().min(0).max(100).value(50).orientation(Orientation.VERTICAL).build(), null, ".thumb", "hover"),
-                withState(SliderBuilder.create().min(0).max(100).value(50).orientation(Orientation.VERTICAL).build(), null, ".thumb", "hover, pressed"),
-                withState(SliderBuilder.create().min(0).max(100).value(50).orientation(Orientation.VERTICAL).build(), "disabled"),
-                SliderBuilder.create().min(0).max(100).value(50).showTickMarks(true).showTickLabels(true).orientation(Orientation.VERTICAL).build());
+                s_v1,
+                withState(s_v2, null, ".thumb", "hover"),
+                withState(s_v3, null, ".thumb", "hover, pressed"),
+                withState(s_v4, "disabled"),
+                s_v5);
+        ScrollBar sb1 = new ScrollBar();
+        sb1.setMinWidth(30);
+        sb1.setPrefWidth(30);
+        ScrollBar sb2 = new ScrollBar();
+        sb2.setVisibleAmount(60);
+        sb1.setMax(100);
         newDetailedSection(
-                new String[] {"Scrollbar - H: ", "normal", "focused", "small", "big thumb"},
+                new String[]{"Scrollbar - H: ", "normal", "focused", "small", "big thumb"},
                 new ScrollBar(),
-                withState(ScrollBarBuilder.create().build(), "focused"),
-                ScrollBarBuilder.create().minWidth(30).prefWidth(30).build(),
-                ScrollBarBuilder.create().visibleAmount(60).max(100).build()
-                );
+                withState(new ScrollBar(), "focused"), sb1, sb2);
+        ScrollBar sb3 = new ScrollBar();
+        sb3.setOrientation(Orientation.VERTICAL);
+        ScrollBar sb4 = new ScrollBar();
+        sb4.setOrientation(Orientation.VERTICAL);
+        ScrollBar sb5 = new ScrollBar();
+        sb5.setMinHeight(30);
+        sb5.setPrefHeight(30);
+        sb5.setOrientation(Orientation.VERTICAL);
+        ScrollBar sb6 = new ScrollBar();
+        sb6.setOrientation(Orientation.VERTICAL);
+        ScrollBar sb7 = new ScrollBar();
+        sb7.setOrientation(Orientation.VERTICAL);
+        ScrollBar sb8 = new ScrollBar();
+        sb8.setOrientation(Orientation.VERTICAL);
+        ScrollBar sb9 = new ScrollBar();
+        sb9.setOrientation(Orientation.VERTICAL);
         newDetailedSection(
-                new String[] {"Scrollbar - V: ", "normal", "focused", "small", "btn hover", "btn pressed", ".thumb hover", ".thumb pressed"},
-                withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).build(), "vertical"),
-                withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).build(), "focused"),
-                withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).minHeight(30).prefHeight(30).build(), "vertical"),
-                withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).build(), "vertical", ".decrement-button", "hover"),
-                withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).build(), "vertical", ".decrement-button", "pressed"),
-                withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).build(), "vertical", ".thumb", "hover"),
-                withState(ScrollBarBuilder.create().orientation(Orientation.VERTICAL).build(), "vertical", ".thumb", "pressed")
-                );
+                new String[]{"Scrollbar - V: ", "normal", "focused", "small", "btn hover", "btn pressed", ".thumb hover", ".thumb pressed"},
+                withState(sb3, "vertical"),
+                withState(sb4, "focused"),
+                withState(sb5, "vertical"),
+                withState(sb6, "vertical", ".decrement-button", "hover"),
+                withState(sb7, "vertical", ".decrement-button", "pressed"),
+                withState(sb8, "vertical", ".thumb", "hover"),
+                withState(sb9, "vertical", ".thumb", "pressed")
+        );
+        ScrollPane scrollPane = new ScrollPane(scrollPaneContent());
+        scrollPane.setMinWidth(40);
+        scrollPane.setPrefWidth(40);
+        scrollPane.setMinHeight(40);
+        scrollPane.setPrefHeight(40);
         newDetailedSection(
                 new String[] {"ScrollPane: ", "normal", "small", "focused", "empty"},
-                ScrollPaneBuilder.create().content(scrollPaneContent()).build(),
-                ScrollPaneBuilder.create().content(scrollPaneContent()).minWidth(40).prefWidth(40).minHeight(40).prefHeight(40).build(),
-                withState(ScrollPaneBuilder.create().content(scrollPaneContent()).build(), "focused"),
-                ScrollPaneBuilder.create().build()
-                );
+                new ScrollPane(scrollPaneContent()),
+                scrollPane,
+                withState(new ScrollPane(scrollPaneContent()), "focused"),
+                new ScrollPane()
+        );
+        ScrollPane scrollPaneVbar = new ScrollPane(scrollPaneContent());
+        scrollPaneVbar.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        ScrollPane scrollPaneHbar = new ScrollPane(scrollPaneContent());
+        scrollPaneHbar.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         newDetailedSection(
                 new String[] {"ScrollPane H/V: ", "H Bar", "V bar"},
-                ScrollPaneBuilder.create().content(scrollPaneContent()).vbarPolicy(ScrollPane.ScrollBarPolicy.NEVER).build(),
-                ScrollPaneBuilder.create().content(scrollPaneContent()).hbarPolicy(ScrollPane.ScrollBarPolicy.NEVER).build()
-                );
+                scrollPaneVbar,
+                scrollPaneHbar);
+        Separator sep1 = new Separator();
+        sep1.setPrefWidth(100);
+        Separator sep2 = new Separator(Orientation.VERTICAL);
+        sep2.setPrefHeight(50);
         newDetailedSection(
-                new String[] {"Separator: ", "horizontal", "vertical"},
-                SeparatorBuilder.create().prefWidth(100).build(),
-                SeparatorBuilder.create().orientation(Orientation.VERTICAL).prefHeight(50).build()
-                );
+                new String[]{"Separator: ", "horizontal", "vertical"},
+                sep1, sep2);
+        ProgressBar pb1 = new ProgressBar(0.6);
+        pb1.setPrefWidth(200);
+        ProgressBar pb2 = new ProgressBar(0.2);
+        pb2.setPrefWidth(200);
+        ProgressBar pb3 = new ProgressBar(-1);
+        pb3.setPrefWidth(200);
         newDetailedSection(
                 new String[] {"ProgressBar: ", "normal", "disabled", "indeterminate"},
-                ProgressBarBuilder.create().progress(0.6).prefWidth(200).build(),
-                withState(ProgressBarBuilder.create().progress(0.2).prefWidth(200).build(), "disabled"),
-                ProgressBarBuilder.create().progress(-1).prefWidth(200).build()
-                );
+                pb1,
+                withState(pb2, "disabled"),
+                pb3);
         newDetailedSection(
                 new String[] {"ProgressIndicator: ", "normal 0%", "normal 60%", "normal 100%", "disabled"},
                 new ProgressIndicator(0),
                 new ProgressIndicator(0.6),
                 new ProgressIndicator(1),
-                withState(new ProgressIndicator(0.5), "disabled")
-                );
+                withState(new ProgressIndicator(0.5), "disabled"));
+        ProgressIndicator pi1 = new ProgressIndicator(-1);
+        pi1.setMaxWidth(USE_PREF_SIZE);
+        pi1.setMaxHeight(USE_PREF_SIZE);
+        ProgressIndicator pi2 = new ProgressIndicator(-1);
+        pi2.setPrefWidth(30);
+        pi2.setPrefHeight(30);
+        ProgressIndicator pi3 = new ProgressIndicator(-1);
+        pi3.setPrefWidth(60);
+        pi3.setPrefHeight(60);
+        ProgressIndicator pi4 = new ProgressIndicator(-1);
+        pi4.setMaxWidth(USE_PREF_SIZE);
+        pi4.setMaxHeight(USE_PREF_SIZE);
+        pi4.setDisable(true);
         newDetailedSection(
-                new String[] {"ProgressIndicator\nIndeterminate: ", "normal", "small", "large", "disabled"},
-                ProgressIndicatorBuilder.create().progress(-1).maxWidth(USE_PREF_SIZE).maxHeight(USE_PREF_SIZE).build(),
-                ProgressIndicatorBuilder.create().progress(-1).prefWidth(30).prefHeight(30).build(),
-                ProgressIndicatorBuilder.create().progress(-1).prefWidth(60).prefHeight(60).build(),
-                ProgressIndicatorBuilder.create().progress(-1).maxWidth(USE_PREF_SIZE).maxHeight(USE_PREF_SIZE).disable(true).build()
-                );
+                new String[]{"ProgressIndicator\nIndeterminate: ", "normal", "small", "large", "disabled"},
+                pi1, pi2, pi3, pi4);
+        TextField textF = new TextField();
+        textF.setPromptText("Prompt Text");
         newSection(
                 "TextField:",
                 new TextField("TextField"),
-                TextFieldBuilder.create().promptText("Prompt Text").build(),
+                textF,
                 withState(new TextField("Focused"), "focused"),
-                withState(new TextField("Disabled"), "disabled")
-        );
+                withState(new TextField("Disabled"), "disabled"));
+        PasswordField pField1 = new PasswordField();
+        pField1.setText("Password");
+        PasswordField pField2 = new PasswordField();
+        pField2.setPromptText("Prompt Text");
+        PasswordField pField3 = new PasswordField();
+        pField3.setText("Password");
+        PasswordField pField4 = new PasswordField();
+        pField4.setText("Password");
         newSection(
                 "PasswordField:",
-                PasswordFieldBuilder.create().text("Password").build(),
-                PasswordFieldBuilder.create().promptText("Prompt Text").build(),
-                withState(PasswordFieldBuilder.create().text("Password").build(), "focused"),
-                withState(PasswordFieldBuilder.create().text("Password").build(), "disabled")
-        );
+                pField1,
+                pField2,
+                withState(pField3, "focused"),
+                withState(pField4, "disabled"));
+        TextArea tArea1 = new TextArea("TextArea");
+        tArea1.setPrefColumnCount(10);
+        tArea1.setPrefRowCount(2);
+        TextArea tArea2 = new TextArea("Many Lines of\nText.\n#3\n#4\n#5\n#6\n#7\n#8\n#9\n#10");
+        tArea2.setPrefColumnCount(10);
+        tArea2.setPrefRowCount(5);
+        TextArea tArea3 = new TextArea("Many Lines of\nText.\n#3\n#4\n#5\n#6\n#7\n#8\n#9\n#10");
+        tArea3.setPrefColumnCount(6);
+        tArea3.setPrefRowCount(5);
+        TextArea tArea4 = new TextArea("Prompt Text");
+        tArea4.setPrefColumnCount(10);
+        tArea4.setPrefRowCount(2);
+
+        TextArea tArea5 = new TextArea("Focused");
+        tArea5.setPrefColumnCount(7);
+        tArea5.setPrefRowCount(2);
+        TextArea tArea6 = new TextArea("Disabled");
+        tArea6.setPrefColumnCount(8);
+        tArea6.setPrefRowCount(2);
         newSection(
                 "TextArea:",
-                TextAreaBuilder.create().text("TextArea").prefColumnCount(10).prefRowCount(2).build(),
-                TextAreaBuilder.create().text("Many Lines of\nText.\n#3\n#4\n#5\n#6\n#7\n#8\n#9\n#10").prefColumnCount(10).prefRowCount(5).build(),
-                TextAreaBuilder.create().text("Many Lines of\nText.\n#3\n#4\n#5\n#6\n#7\n#8\n#9\n#10").prefColumnCount(6).prefRowCount(5).build(),
-                TextAreaBuilder.create().promptText("Prompt Text").prefColumnCount(10).prefRowCount(2).build(),
-                withState(TextAreaBuilder.create().text("Focused").prefColumnCount(7).prefRowCount(2).build(), "focused"),
-                withState(TextAreaBuilder.create().text("Disabled").prefColumnCount(8).prefRowCount(2).build(), "disabled")
-        );
+                tArea1, tArea2, tArea3, tArea4,
+                withState(tArea5, "focused"),
+                withState(tArea6, "disabled"));
         newSection(
                 "HTMLEditor:",
                 new HTMLEditor() {{
@@ -543,14 +763,16 @@
                 createTabPane(4, 250, 250, null, true, false, Side.RIGHT),
                 withState(createTabPane(5, 200, 250, "Tab Disabled &\nMany Tabs", true, true, Side.RIGHT), null, ".tab", "disabled"),
                 withState(createTabPane(5, 200, 250, "Disabled", true, false, Side.RIGHT), "disabled")
-                );
+        );
+        TitledPane tPane = new TitledPane("Not Collapsible", new Label("Content\nLine2."));
+        tPane.setCollapsible(false);
         newDetailedSection(
-                new String[] { "TitledPane:", "normal", "not collapsible", "hover", "focused", "disabled" },
-                TitledPaneBuilder.create().text("Title").content(new Label("Content\nLine2.")).build(),
-                TitledPaneBuilder.create().text("Not Collapsible").content(new Label("Content\nLine2.")).collapsible(false).build(),
-                withState(TitledPaneBuilder.create().text("Title").content(new Label("Content\nLine2.")).build(), "hover"),
-                withState(TitledPaneBuilder.create().text("Title").content(new Label("Content\nLine2.")).build(), "focused"),
-                withState(TitledPaneBuilder.create().text("Title").content(new Label("Content\nLine2.")).build(), "disabled")
+                new String[]{"TitledPane:", "normal", "not collapsible", "hover", "focused", "disabled"},
+                new TitledPane("Title", new Label("Content\nLine2.")),
+                tPane,
+                withState(new TitledPane("Title", new Label("Content\nLine2.")), "hover"),
+                withState(new TitledPane("Title", new Label("Content\nLine2.")), "focused"),
+                withState(new TitledPane("Title", new Label("Content\nLine2.")), "disabled")
         );
         newDetailedSection(
                 new String[] {"Accordion:", "normal", "hover", "focused", "disabled"},
@@ -639,25 +861,40 @@
                 createTreeTableView(550, true),
                 withState(createTreeTableView(200, true), "focused")
                 );
+        ListView<String> lv = new ListView<>();
+        lv.setPrefWidth(150);
+        lv.setPrefHeight(100);
+        TableView tv = new TableView();
+        tv.setPrefWidth(150);
+        tv.setPrefHeight(100);
+        TreeView treev = new TreeView();
+        treev.setPrefWidth(150);
+        treev.setPrefHeight(100);
         newDetailedSection(
-                new String[] {"Empty:", "ListView", "TableView", "TreeView", "TreeTableView"},
-                ListViewBuilder.<String>create().prefWidth(150).prefHeight(100).build(),
-                TableViewBuilder.create().prefWidth(150).prefHeight(100).build(),
-                TreeViewBuilder.create().prefWidth(150).prefHeight(100).build(),
+                new String[]{"Empty:", "ListView", "TableView", "TreeView", "TreeTableView"},
+                lv, tv, treev,
                 new TreeTableView() {{
                     setPrefSize(150, 100);
-                }}
-                );
+                }});
+        Label label1 = new Label("This is a simple Tooltip.");
+        label1.getStyleClass().add("tooltip");
+        Label label2 = new Label("This is a simple Tooltip\nwith graphic.", createGraphic());
+        label2.getStyleClass().add("tooltip");
+        VBox vb = new VBox(4);
+        vb.setFillWidth(true);
+        Button button1 = new Button("Hover over me");
+        button1.setTooltip(new Tooltip("This is a simple Tooltip."));
+        Button button2 = new Button("me too");
+        button2.setTooltip(new Tooltip("This is a simple Tooltip\nwith more than one line."));
+        Button button3 = new Button("or me");
+        Tooltip tip = new Tooltip("This is a simple Tooltip\nwith graphic.");
+        tip.setGraphic(createGraphic());
+        button3.setTooltip(tip);
+        vb.getChildren().addAll(button1, button2, button3);
+
         newDetailedSection(
-                new String[] {"ToolTip:","inline","inline + graphic", "popup"},
-                LabelBuilder.create().text("This is a simple Tooltip.").styleClass("tooltip").build(),
-                LabelBuilder.create().text("This is a simple Tooltip\nwith graphic.").graphic(createGraphic()).styleClass("tooltip").build(),
-                VBoxBuilder.create().fillWidth(true).spacing(4).children(
-                    ButtonBuilder.create().text("Hover over me").tooltip(new Tooltip("This is a simple Tooltip.")).build(),
-                    ButtonBuilder.create().text("me too").tooltip(new Tooltip("This is a simple Tooltip\nwith more than one line.")).build(),
-                    ButtonBuilder.create().text("or me").tooltip(TooltipBuilder.create().text("This is a simple Tooltip\nwith graphic.").graphic(createGraphic()).build()).build()
-                ).build()
-                );
+                new String[]{"ToolTip:", "inline", "inline + graphic", "popup"},
+                label1, label2, vb);
         newSection(
                 "MenuBar & ContextMenu:",
                 createMenuBar(),
--- a/apps/samples/Modena/src/main/java/modena/SamplePageHelpers.java	Fri Jan 30 10:24:06 2015 -0800
+++ b/apps/samples/Modena/src/main/java/modena/SamplePageHelpers.java	Sun Feb 01 13:01:40 2015 +0200
@@ -42,29 +42,27 @@
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.geometry.Side;
-import javafx.scene.GroupBuilder;
+import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.control.Accordion;
 import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBuilder;
 import javafx.scene.control.CheckMenuItem;
-import javafx.scene.control.CheckMenuItemBuilder;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.MenuItem;
+import javafx.scene.control.RadioMenuItem;
 import javafx.scene.control.Pagination;
-import javafx.scene.control.RadioMenuItemBuilder;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.Separator;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.SplitPane;
-import javafx.scene.control.TabBuilder;
 import javafx.scene.control.TabPane;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TitledPane;
 import javafx.scene.control.TextField;
-import javafx.scene.control.TitledPaneBuilder;
 import javafx.scene.control.ToolBar;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -72,10 +70,9 @@
 import javafx.scene.input.KeyCombination;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.StackPaneBuilder;
 import javafx.scene.paint.Color;
-import javafx.scene.shape.LineBuilder;
-import javafx.scene.shape.RectangleBuilder;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.Rectangle;
 
 /**
  * Helper static methods for Sample Page
@@ -123,11 +120,16 @@
     }
     
     static Node scrollPaneContent() {
-        return GroupBuilder.create().children(
-                RectangleBuilder.create().width(200).height(200).fill(Color.PALETURQUOISE).build(),
-                LineBuilder.create().endX(200).endY(200).stroke(Color.DODGERBLUE).build(),
-                LineBuilder.create().startX(200).endX(0).endY(200).stroke(Color.DODGERBLUE).build()
-            ).build();
+        Line l1 = new Line();
+        l1.setEndX(200);
+        l1.setEndY(200);
+        l1.setStroke(Color.DODGERBLUE);
+        Line l2 = new Line();
+        l2.setStartX(200);
+        l2.setStartY(0);
+        l2.setEndY(200);
+        l2.setStroke(Color.DODGERBLUE);
+        return new Group(new Rectangle(200, 200, Color.PALETURQUOISE), l1, l2);
     }
     
     static Node createTabPane(int numOfTabs, int prefWidth, int prefHeight, String firstTabText, boolean floating, boolean disableFirst, Side side) {
@@ -135,13 +137,10 @@
         tabPane.setSide(side);
         if (floating) tabPane.getStyleClass().add("floating");
         for (int i=1; i<=numOfTabs; i++) {
-            tabPane.getTabs().add(
-                TabBuilder.create()
-                    .text("Tab "+i)
-                    .disable(i==1 && disableFirst)
-                    .content(new Label((i==1 && firstTabText!=null)? firstTabText :"Tab "+i+" Content"))
-                    .build()
-            );
+            Tab tab = new Tab("Tab "+i);
+            tab.setDisable(i==1 && disableFirst);
+            tab.setContent(new Label((i==1 && firstTabText!=null)? firstTabText :"Tab "+i+" Content"));
+            tabPane.getTabs().add(tab);
         }
         if (disableFirst) tabPane.getSelectionModel().select(1);
         tabPane.setPrefWidth(prefWidth);
@@ -150,8 +149,9 @@
     }
     
     static Node wrapBdr(Node node) {
-        return StackPaneBuilder.create().children(node)
-                .style("-fx-border-color: black; -fx-border-width: 3;").build();
+        StackPane sp = new StackPane(node);
+        sp.setStyle("-fx-border-color: black; -fx-border-width: 3;");
+        return sp;
     }
     
     static ToolBar createToolBar(Side side, boolean overFlow, boolean disabled) {
@@ -190,9 +190,9 @@
     static Accordion createAccordion() {
         Accordion accordian = new Accordion();
         accordian.getPanes().addAll(
-            TitledPaneBuilder.create().text("Title 1").content(new Label("Content\nLine2.")).build(),
-            TitledPaneBuilder.create().text("Title 2").content(new Label("Content\nLine2.")).build(),
-            TitledPaneBuilder.create().text("Title 3").content(new Label("Content\nLine2.")).build()
+                new TitledPane("Title 1", new Label("Content\nLine2.")),
+                new TitledPane("Title 2", new Label("Content\nLine2.")),
+                new TitledPane("Title 3", new Label("Content\nLine2."))
         );
         return accordian;
     }
@@ -321,11 +321,16 @@
         menuItems.add(menu13);
         menuItems.add(menu16);
         menuItems.add(new SeparatorMenuItem());
-        menuItems.add(CheckMenuItemBuilder.create().text("Check").build());
-        menuItems.add(CheckMenuItemBuilder.create().text("Check Selected").selected(true).build());
+
+        menuItems.add(new CheckMenuItem("Check"));
+        CheckMenuItem checkMenuItem = new CheckMenuItem("Check Selected");
+        checkMenuItem.setSelected(true);
+        menuItems.add(checkMenuItem);
         menuItems.add(new SeparatorMenuItem());
-        menuItems.add(RadioMenuItemBuilder.create().text("Radio").build());
-        menuItems.add(RadioMenuItemBuilder.create().text("Radio Selected").selected(true).build());
+        menuItems.add(new RadioMenuItem("Radio"));
+        RadioMenuItem radioMenuItem = new RadioMenuItem("Radio Selected");
+        radioMenuItem.setSelected(true);
+        menuItems.add(radioMenuItem);
         menuItems.add(new SeparatorMenuItem());
         menuItems.add(menu15);
 
@@ -360,7 +365,7 @@
         StackPane sp = new StackPane();
         sp.setStyle("-fx-base: rgba("+grey+","+grey+","+grey+",1); -fx-background-color: -fx-background;");
         sp.setPadding(new Insets(8));
-        sp.getChildren().add(ButtonBuilder.create().text(percentage+"%").build());
+        sp.getChildren().add(new Button(percentage+"%"));
         return sp;
     }
 }