hg: openjfx/8/controls/rt: 3 new changesets

hang.vo at oracle.com hang.vo at oracle.com
Mon Dec 10 07:34:11 PST 2012 

Changeset: bf75ca4caf36
Author:    David Grieve<david.grieve at oracle.com>
Date:      2012-12-07 14:41 -0500
URL:       http://hg.openjdk.java.net/openjfx/8/controls/rt/rev/bf75ca4caf36

RT-21709 [partial]: prepare to make CSS Styleable* properites public

! javafx-ui-charts/src/javafx/scene/chart/BarChart.java
! javafx-ui-charts/src/javafx/scene/chart/Chart.java
! javafx-ui-charts/src/javafx/scene/chart/LineChart.java
! javafx-ui-charts/src/javafx/scene/chart/PieChart.java
! javafx-ui-charts/src/javafx/scene/chart/StackedAreaChart.java
! javafx-ui-charts/src/javafx/scene/chart/StackedBarChart.java
! javafx-ui-charts/src/javafx/scene/chart/XYChart.java
! javafx-ui-charts/test/javafx/scene/chart/XYChartTest.java
! javafx-ui-common/src/com/sun/javafx/css/CascadingStyle.java
! javafx-ui-common/src/com/sun/javafx/css/CssError.java
! javafx-ui-common/src/com/sun/javafx/css/Declaration.java
+ javafx-ui-common/src/com/sun/javafx/css/Origin.java
- javafx-ui-common/src/com/sun/javafx/css/Property.java
! javafx-ui-common/src/com/sun/javafx/css/Rule.java
! javafx-ui-common/src/com/sun/javafx/css/Style.java
! javafx-ui-common/src/com/sun/javafx/css/StyleConverter.java
! javafx-ui-common/src/com/sun/javafx/css/StyleHelper.java
! javafx-ui-common/src/com/sun/javafx/css/StyleManager.java
! javafx-ui-common/src/com/sun/javafx/css/Styleable.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableBooleanProperty.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableDoubleProperty.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableFloatProperty.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableIntegerProperty.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableLongProperty.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableObjectProperty.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableProperty.java
+ javafx-ui-common/src/com/sun/javafx/css/StyleablePropertyMetaData.java
! javafx-ui-common/src/com/sun/javafx/css/StyleableStringProperty.java
! javafx-ui-common/src/com/sun/javafx/css/Stylesheet.java
+ javafx-ui-common/src/com/sun/javafx/css/SubCSSProperty.java
- javafx-ui-common/src/com/sun/javafx/css/SubStyleableProperty.java
! javafx-ui-common/src/com/sun/javafx/css/converters/FontConverter.java
! javafx-ui-common/src/javafx/scene/Node.java
! javafx-ui-common/src/javafx/scene/Scene.java
! javafx-ui-common/src/javafx/scene/image/ImageView.java
! javafx-ui-common/src/javafx/scene/layout/Background.java
! javafx-ui-common/src/javafx/scene/layout/BackgroundConverter.java
! javafx-ui-common/src/javafx/scene/layout/Border.java
! javafx-ui-common/src/javafx/scene/layout/BorderConverter.java
! javafx-ui-common/src/javafx/scene/layout/FlowPane.java
! javafx-ui-common/src/javafx/scene/layout/GridPane.java
! javafx-ui-common/src/javafx/scene/layout/HBox.java
! javafx-ui-common/src/javafx/scene/layout/Region.java
! javafx-ui-common/src/javafx/scene/layout/StackPane.java
! javafx-ui-common/src/javafx/scene/layout/TilePane.java
! javafx-ui-common/src/javafx/scene/layout/VBox.java
! javafx-ui-common/src/javafx/scene/shape/Line.java
! javafx-ui-common/src/javafx/scene/shape/Path.java
! javafx-ui-common/src/javafx/scene/shape/Polyline.java
! javafx-ui-common/src/javafx/scene/shape/Rectangle.java
! javafx-ui-common/src/javafx/scene/shape/Shape.java
! javafx-ui-common/src/javafx/scene/text/Text.java
! javafx-ui-common/src/javafx/scene/text/TextFlow.java
! javafx-ui-common/test/unit/com/sun/javafx/css/DeclarationTest.java
! javafx-ui-common/test/unit/com/sun/javafx/css/Node_cssStyleMap_Test.java
! javafx-ui-common/test/unit/com/sun/javafx/css/RuleTest.java
+ javafx-ui-common/test/unit/com/sun/javafx/css/StyleablePropertyMetaDataTest.java
- javafx-ui-common/test/unit/com/sun/javafx/css/StyleablePropertyTest.java
! javafx-ui-common/test/unit/com/sun/javafx/css/StylesheetTest.java
! javafx-ui-common/test/unit/com/sun/javafx/css/TestNode.java
! javafx-ui-common/test/unit/com/sun/javafx/css/TestNodeBase.java
! javafx-ui-common/test/unit/com/sun/javafx/css/TypeTest.java
! javafx-ui-common/test/unit/com/sun/javafx/scene/layout/RegionTest.java
! javafx-ui-common/test/unit/com/sun/javafx/scene/layout/region/BackgroundFillConverterTest.java
! javafx-ui-common/test/unit/com/sun/javafx/test/CssMethodsTestBase.java
! javafx-ui-common/test/unit/com/sun/javafx/test/OnInvalidateMethodsTestBase.java
! javafx-ui-common/test/unit/javafx/scene/CSSNode.java
! javafx-ui-common/test/unit/javafx/scene/Node_onInvalidate_Test.java
! javafx-ui-common/test/unit/javafx/scene/layout/TilePaneTest.java
! javafx-ui-common/test/unit/javafx/scene/shape/ShapeTest.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/CellSkinBase.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ColorPickerSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ContextMenuContent.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/FXVK.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledImpl.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledText.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/PaginationSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ProgressBarSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ProgressIndicatorSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TableColumnHeader.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TextInputControlSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ToolBarSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeCellSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeTableRowSkin.java
! javafx-ui-controls/src/javafx/scene/chart/Axis.java
! javafx-ui-controls/src/javafx/scene/chart/CategoryAxis.java
! javafx-ui-controls/src/javafx/scene/chart/NumberAxis.java
! javafx-ui-controls/src/javafx/scene/chart/ValueAxis.java
! javafx-ui-controls/src/javafx/scene/control/Accordion.java
! javafx-ui-controls/src/javafx/scene/control/Cell.java
! javafx-ui-controls/src/javafx/scene/control/Control.java
! javafx-ui-controls/src/javafx/scene/control/Hyperlink.java
! javafx-ui-controls/src/javafx/scene/control/Label.java
! javafx-ui-controls/src/javafx/scene/control/Labeled.java
! javafx-ui-controls/src/javafx/scene/control/ListView.java
! javafx-ui-controls/src/javafx/scene/control/MenuBar.java
! javafx-ui-controls/src/javafx/scene/control/MenuItem.java
! javafx-ui-controls/src/javafx/scene/control/Pagination.java
! javafx-ui-controls/src/javafx/scene/control/PopupControl.java
! javafx-ui-controls/src/javafx/scene/control/ProgressBar.java
! javafx-ui-controls/src/javafx/scene/control/ProgressIndicator.java
! javafx-ui-controls/src/javafx/scene/control/RadioButton.java
! javafx-ui-controls/src/javafx/scene/control/ScrollBar.java
! javafx-ui-controls/src/javafx/scene/control/ScrollPane.java
! javafx-ui-controls/src/javafx/scene/control/Separator.java
! javafx-ui-controls/src/javafx/scene/control/SkinBase.java
! javafx-ui-controls/src/javafx/scene/control/Slider.java
! javafx-ui-controls/src/javafx/scene/control/SplitPane.java
! javafx-ui-controls/src/javafx/scene/control/Tab.java
! javafx-ui-controls/src/javafx/scene/control/TabPane.java
! javafx-ui-controls/src/javafx/scene/control/TableColumn.java
! javafx-ui-controls/src/javafx/scene/control/TextField.java
! javafx-ui-controls/src/javafx/scene/control/TitledPane.java
! javafx-ui-controls/src/javafx/scene/control/ToggleButton.java
! javafx-ui-controls/src/javafx/scene/control/ToolBar.java
! javafx-ui-controls/src/javafx/scene/control/Tooltip.java
! javafx-ui-controls/src/javafx/scene/control/cell/CheckBoxTableCell.java
! javafx-ui-controls/test/com/sun/javafx/scene/control/skin/LabeledImplTest.java
! javafx-ui-controls/test/com/sun/javafx/scene/control/skin/LabeledImplTestOther.java
! javafx-ui-controls/test/com/sun/javafx/scene/control/skin/LabeledTextTest.java
! javafx-ui-controls/test/javafx/scene/chart/AxisTest.java
! javafx-ui-controls/test/javafx/scene/chart/CategoryAxisTest.java
! javafx-ui-controls/test/javafx/scene/chart/NumberAxisTest.java
! javafx-ui-controls/test/javafx/scene/chart/ValueAxisTest.java
! javafx-ui-controls/test/javafx/scene/control/ControlSkinTest.java
! javafx-ui-controls/test/javafx/scene/control/ControlTest.java
! javafx-ui-controls/test/javafx/scene/control/HyperlinkTest.java
! javafx-ui-controls/test/javafx/scene/control/LabelTest.java
! javafx-ui-controls/test/javafx/scene/control/LabeledTest.java
! javafx-ui-controls/test/javafx/scene/control/PaginationTest.java
! javafx-ui-controls/test/javafx/scene/control/ScrollBarTest.java
! javafx-ui-controls/test/javafx/scene/control/ScrollPaneTest.java
! javafx-ui-controls/test/javafx/scene/control/SeparatorTest.java
! javafx-ui-controls/test/javafx/scene/control/SliderTest.java
! javafx-ui-controls/test/javafx/scene/control/SplitPaneTest.java
! javafx-ui-controls/test/javafx/scene/control/TabPaneTest.java
! javafx-ui-controls/test/javafx/scene/control/TextInputControlTest.java
! javafx-ui-controls/test/javafx/scene/control/TitledPaneTest.java
! javafx-ui-controls/test/javafx/scene/control/ToolbarTest.java
! javafx-ui-controls/test/javafx/scene/control/TooltipTest.java

Changeset: 382ea952840d
Author:    David Grieve<david.grieve at oracle.com>
Date:      2012-12-07 15:13 -0500
URL:       http://hg.openjdk.java.net/openjfx/8/controls/rt/rev/382ea952840d

merge

- javafx-ui-controls/src/com/preview/javafx/scene/control/TreeTableColumn.java
- javafx-ui-controls/src/com/preview/javafx/scene/control/TreeTableRow.java
- javafx-ui-controls/src/com/preview/javafx/scene/control/TreeTableView.java
- javafx-ui-controls/src/com/sun/javafx/scene/control/WeakEventHandler.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/PaginationSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ProgressBarSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ProgressIndicatorSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TableColumnHeader.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TextInputControlSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ToolBarSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeCellSkin.java
! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/TreeTableRowSkin.java
! javafx-ui-controls/src/javafx/scene/chart/Axis.java
! javafx-ui-controls/src/javafx/scene/chart/ValueAxis.java
! javafx-ui-controls/src/javafx/scene/control/PopupControl.java
! javafx-ui-controls/src/javafx/scene/control/ProgressBar.java
! javafx-ui-controls/src/javafx/scene/control/ProgressIndicator.java
! javafx-ui-controls/src/javafx/scene/control/SkinBase.java
! javafx-ui-controls/src/javafx/scene/control/TabPane.java
! javafx-ui-controls/src/javafx/scene/control/TableColumn.java
! javafx-ui-controls/test/javafx/scene/control/SliderTest.java

Changeset: 55b52b24b94d
Author:    David Grieve<david.grieve at oracle.com>
Date:      2012-12-10 10:26 -0500
URL:       http://hg.openjdk.java.net/openjfx/8/controls/rt/rev/55b52b24b94d

RT-21709 [partial]: fix merge errors after pulling changes onto bf75ca4caf36

! javafx-ui-controls/src/javafx/scene/control/TableColumn.java
! javafx-ui-controls/src/javafx/scene/control/TreeTableColumn.java
! javafx-ui-controls/src/javafx/scene/control/cell/CheckBoxTreeTableCell.java

More information about the openjfx-dev mailing list