--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java 2016-06-03 22:22:14.519310202 -0700 +++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java 2016-06-03 22:22:14.375310204 -0700 @@ -145,7 +145,8 @@ // Deprecated stuff in FXMLLoader // RT-21226 : Promote setStaticLoad to public API public static void setStaticLoad(FXMLLoader loader, boolean staticLoad) { - loader.impl_setStaticLoad(staticLoad); +// loader.impl_setStaticLoad(staticLoad); + System.err.println("Error: impl_setStaticLoad is no longer publicly accessible"); } // RT-20184 : FX should provide a Parent.pick() routine --- old/modules/controls/src/main/java/com/sun/javafx/scene/control/ControlHelper.java 2016-06-03 22:22:14.919310198 -0700 +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/ControlHelper.java 2016-06-03 22:22:14.775310199 -0700 @@ -27,6 +27,7 @@ import com.sun.javafx.scene.layout.RegionHelper; import com.sun.javafx.util.Utils; +import javafx.beans.property.StringProperty; import javafx.scene.Node; import javafx.scene.control.Control; @@ -54,6 +55,10 @@ ((ControlHelper) getHelper(node)).superProcessCSSImpl(node); } + public static StringProperty skinClassNameProperty(Control control) { + return controlAccessor.skinClassNameProperty(control); + } + void superProcessCSSImpl(Node node) { super.processCSSImpl(node); } @@ -73,6 +78,7 @@ public interface ControlAccessor { void doProcessCSS(Node node); + StringProperty skinClassNameProperty(Control control); } } --- old/modules/controls/src/main/java/javafx/scene/control/Control.java 2016-06-03 22:22:15.331310193 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/Control.java 2016-06-03 22:22:15.175310195 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -88,6 +88,10 @@ public void doProcessCSS(Node node) { ((Control) node).doProcessCSS(); } + @Override + public StringProperty skinClassNameProperty(Control control) { + return control.skinClassNameProperty(); + } }); // Ensures that the default application user agent stylesheet is loaded @@ -655,11 +659,7 @@ private String currentSkinClassName = null; private StringProperty skinClassName; - /** - * @treatAsPrivate - * @since JavaFX 2.1 - */ - @Deprecated protected StringProperty skinClassNameProperty() { + StringProperty skinClassNameProperty() { if (skinClassName == null) { skinClassName = new StyleableStringProperty() { --- old/modules/controls/src/main/java/javafx/scene/control/DatePicker.java 2016-06-03 22:22:15.735310189 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/DatePicker.java 2016-06-03 22:22:15.599310190 -0700 @@ -475,6 +475,7 @@ /** * {@inheritDoc} + * @since JavaFX 8.0 */ @Override public List> getControlCssMetaData() { --- old/modules/controls/src/main/java/javafx/scene/control/Separator.java 2016-06-03 22:22:16.187310183 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/Separator.java 2016-06-03 22:22:15.995310186 -0700 @@ -312,12 +312,9 @@ } /** - * RT-19263 - * @treatAsPrivate implementation detail - * @deprecated This is an experimental API that is not intended for general use and is subject to change in future versions + * {@inheritDoc} * @since JavaFX 8.0 */ - @Deprecated @Override protected List> getControlCssMetaData() { return getClassCssMetaData(); } --- old/modules/controls/src/main/java/javafx/scene/control/Slider.java 2016-06-03 22:22:16.723310177 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/Slider.java 2016-06-03 22:22:16.567310179 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -792,12 +792,9 @@ } /** - * RT-19263 - * @treatAsPrivate implementation detail - * @deprecated This is an experimental API that is not intended for general use and is subject to change in future versions + * {@inheritDoc} * @since JavaFX 8.0 */ - @Deprecated @Override protected List> getControlCssMetaData() { return getClassCssMetaData(); } --- old/modules/controls/src/main/java/javafx/scene/control/Tab.java 2016-06-03 22:22:17.147310173 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/Tab.java 2016-06-03 22:22:16.995310174 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -789,20 +789,13 @@ private final EventHandlerManager eventHandlerManager = new EventHandlerManager(this); - /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version - */ + /** {@inheritDoc} */ @Override public EventDispatchChain buildEventDispatchChain(EventDispatchChain tail) { return tail.prepend(eventHandlerManager); } - /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version - */ - protected void setEventHandler(EventType eventType, EventHandler eventHandler) { + void setEventHandler(EventType eventType, EventHandler eventHandler) { eventHandlerManager.setEventHandler(eventType, eventHandler); } --- old/modules/controls/src/main/java/javafx/scene/control/TableColumnBase.java 2016-06-03 22:22:17.575310168 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/TableColumnBase.java 2016-06-03 22:22:17.423310170 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -51,6 +51,7 @@ import javafx.scene.Node; import com.sun.javafx.event.EventHandlerManager; +import com.sun.javafx.scene.control.TableColumnBaseHelper; import java.util.HashMap; import javafx.beans.property.ReadOnlyDoubleProperty; @@ -99,6 +100,17 @@ */ @IDProperty("id") public abstract class TableColumnBase implements EventTarget, Styleable { + static { + TableColumnBaseHelper.setTableColumnBaseAccessor( + new TableColumnBaseHelper.TableColumnBaseAccessor() { + + @Override + public void setWidth(TableColumnBase tableColumnBase, double width) { + tableColumnBase.doSetWidth(width); + } + + }); + } /*************************************************************************** * * @@ -415,7 +427,7 @@ setMinWidth(0.0F); } - impl_setWidth(getWidth()); + doSetWidth(getWidth()); } }; } @@ -432,7 +444,7 @@ public final double getPrefWidth() { return prefWidth.get(); } private final DoubleProperty prefWidth = new SimpleDoubleProperty(this, "prefWidth", DEFAULT_WIDTH) { @Override protected void invalidated() { - impl_setWidth(getPrefWidth()); + doSetWidth(getPrefWidth()); } }; @@ -448,7 +460,7 @@ public final double getMaxWidth() { return maxWidth.get(); } private DoubleProperty maxWidth = new SimpleDoubleProperty(this, "maxWidth", DEFAULT_MAX_WIDTH) { @Override protected void invalidated() { - impl_setWidth(getWidth()); + doSetWidth(getWidth()); } }; @@ -753,12 +765,7 @@ * * **************************************************************************/ - /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version - */ - @Deprecated - public void impl_setWidth(double width) { + void doSetWidth(double width) { setWidth(Utils.boundedSize(width, getMinWidth(), getMaxWidth())); } --- old/modules/controls/src/main/java/javafx/scene/control/TableUtil.java 2016-06-03 22:22:17.983310163 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/TableUtil.java 2016-06-03 22:22:17.835310165 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -376,13 +376,13 @@ double newWidth = column.getWidth() + delta; if (newWidth > column.getMaxWidth()) { - column.impl_setWidth(column.getMaxWidth()); + column.doSetWidth(column.getMaxWidth()); return newWidth - column.getMaxWidth(); } else if (newWidth < column.getMinWidth()) { - column.impl_setWidth(column.getMinWidth()); + column.doSetWidth(column.getMinWidth()); return newWidth - column.getMinWidth(); } else { - column.impl_setWidth(newWidth); + column.doSetWidth(newWidth); return 0.0F; } } --- old/modules/controls/src/main/java/javafx/scene/control/TextArea.java 2016-06-03 22:22:18.423310158 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/TextArea.java 2016-06-03 22:22:18.259310160 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -430,11 +430,7 @@ */ public static final int DEFAULT_PREF_ROW_COUNT = 10; - /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version - */ - public static final int DEFAULT_PARAGRAPH_CAPACITY = 32; + static final int DEFAULT_PARAGRAPH_CAPACITY = 32; /** * Creates a {@code TextArea} with empty text content. --- old/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java 2016-06-03 22:22:18.879310153 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java 2016-06-03 22:22:18.711310155 -0700 @@ -2002,6 +2002,7 @@ /** * {@inheritDoc} + * @since JavaFX 8.0 */ @Override public List> getControlCssMetaData() { --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java 2016-06-03 22:22:19.507310146 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java 2016-06-03 22:22:19.155310150 -0700 @@ -27,6 +27,7 @@ import com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler; import com.sun.javafx.scene.control.Properties; +import com.sun.javafx.scene.control.TableColumnBaseHelper; import javafx.beans.property.DoubleProperty; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.ReadOnlyObjectWrapper; @@ -393,7 +394,7 @@ double width = getNestedColumnHeader().prefWidth(height); if (getTableColumn() != null) { - getTableColumn().impl_setWidth(width); + TableColumnBaseHelper.setWidth(getTableColumn(), width); } return width; --- old/modules/controls/src/main/java/javafx/scene/control/skin/TableSkinUtils.java 2016-06-03 22:22:20.231310138 -0700 +++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableSkinUtils.java 2016-06-03 22:22:20.071310140 -0700 @@ -25,6 +25,7 @@ package javafx.scene.control.skin; import com.sun.javafx.scene.control.Properties; +import com.sun.javafx.scene.control.TableColumnBaseHelper; import com.sun.javafx.scene.control.TreeTableViewBackingList; import com.sun.javafx.scene.control.skin.Utils; import javafx.beans.property.BooleanProperty; @@ -143,7 +144,7 @@ maxWidth = Math.max(maxWidth, tc.getWidth()); } - tc.impl_setWidth(maxWidth); + TableColumnBaseHelper.setWidth(tc, maxWidth); } @@ -218,7 +219,7 @@ maxWidth = Math.max(maxWidth, tc.getWidth()); } - tc.impl_setWidth(maxWidth); + TableColumnBaseHelper.setWidth(tc, maxWidth); } public static ObjectProperty> columnResizePolicyProperty(TableViewSkinBase tableSkin) { --- old/modules/controls/src/main/module-info/module-info.java 2016-06-03 22:22:20.731310132 -0700 +++ new/modules/controls/src/main/module-info/module-info.java 2016-06-03 22:22:20.499310135 -0700 @@ -32,6 +32,8 @@ exports javafx.scene.control.cell; exports javafx.scene.control.skin; + exports com.sun.javafx.scene.control to + javafx.web; exports com.sun.javafx.scene.control.behavior to javafx.web; exports com.sun.javafx.scene.control.inputmap to --- old/modules/controls/src/test/java/test/javafx/scene/control/TableViewTest.java 2016-06-03 22:22:21.683310122 -0700 +++ new/modules/controls/src/test/java/test/javafx/scene/control/TableViewTest.java 2016-06-03 22:22:21.175310127 -0700 @@ -36,6 +36,7 @@ import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList; import com.sun.javafx.scene.control.SelectedCellsMap; +import com.sun.javafx.scene.control.TableColumnBaseHelper; import com.sun.javafx.scene.control.behavior.TableCellBehavior; import javafx.beans.InvalidationListener; import test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils; @@ -1955,7 +1956,7 @@ StageLoader sl = new StageLoader(table); // resize the last column - last.impl_setWidth(400); + TableColumnBaseHelper.setWidth(last, 400); assertEquals(400, last.getWidth(), 0.0); // hide the first column @@ -3344,7 +3345,7 @@ // sneak some hidden columns in there column = new TableColumn<>("h" + i); column.setVisible( false ); - column.impl_setWidth(50); + TableColumnBaseHelper.setWidth(column, 50); column.setResizable(false); table.getColumns().add( column ); } @@ -3465,7 +3466,7 @@ // sneak some hidden columns in there column = new TableColumn<>("h" + i); column.setVisible( false ); - column.impl_setWidth(50); + TableColumnBaseHelper.setWidth(column, 50); column.setResizable(false); table.getColumns().add( column ); } --- old/modules/controls/src/test/java/test/javafx/scene/control/TextAreaTest.java 2016-06-03 22:22:22.211310116 -0700 +++ new/modules/controls/src/test/java/test/javafx/scene/control/TextAreaTest.java 2016-06-03 22:22:22.039310118 -0700 @@ -33,6 +33,7 @@ import javafx.beans.property.StringProperty; import javafx.scene.Scene; import javafx.scene.control.TextArea; +import javafx.scene.control.TextAreaShim; import javafx.scene.control.TextInputControlShim; import org.junit.Before; import org.junit.Ignore; @@ -90,7 +91,7 @@ } @Test public void checkDefaultParagraphCapacity() { - assertEquals(TextArea.DEFAULT_PARAGRAPH_CAPACITY, 32); + assertEquals(TextAreaShim.getDefaultParagraphCapacity(txtArea), 32); } @Test public void checkDefaultWrapText() { --- old/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java 2016-06-03 22:22:22.699310110 -0700 +++ new/modules/controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java 2016-06-03 22:22:22.531310112 -0700 @@ -25,6 +25,7 @@ package test.javafx.scene.control; +import com.sun.javafx.scene.control.TableColumnBaseHelper; import static com.sun.xml.internal.fastinfoset.alphabet.BuiltInRestrictedAlphabets.table; import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains; import static javafx.scene.control.TreeTableColumn.SortType.ASCENDING; @@ -2722,7 +2723,7 @@ StageLoader sl = new StageLoader(table); // resize the last column - last.impl_setWidth(400); + TableColumnBaseHelper.setWidth(last, 400); assertEquals(400, last.getWidth(), 0.0); // hide the first column --- old/modules/fxml/src/main/java/com/sun/javafx/fxml/ParseTraceElement.java 2016-06-03 22:22:25.135310083 -0700 +++ new/modules/fxml/src/main/java/com/sun/javafx/fxml/ParseTraceElement.java 2016-06-03 22:22:24.539310090 -0700 @@ -29,7 +29,7 @@ /* * An element in a parse trace, as returned by - * {@link javafx.fxml.FXMLLoader#impl_getParseTrace()}. + * {@link javafx.fxml.FXMLLoader#getParseTrace()}. * * @since JavaFX 2.1 */ --- old/modules/fxml/src/main/java/javafx/fxml/FXMLLoader.java 2016-06-03 22:22:25.991310073 -0700 +++ new/modules/fxml/src/main/java/javafx/fxml/FXMLLoader.java 2016-06-03 22:22:25.747310076 -0700 @@ -82,6 +82,7 @@ import com.sun.javafx.fxml.expression.ExpressionValue; import com.sun.javafx.fxml.expression.KeyPath; import static com.sun.javafx.FXPermissions.MODIFY_FXML_CLASS_LOADER_PERMISSION; +import com.sun.javafx.fxml.FXMLLoaderHelper; import java.net.MalformedURLException; import java.security.AccessController; import java.security.PrivilegedAction; @@ -306,7 +307,7 @@ throw constructLoadException("Cannot bind to builder property."); } - if (!impl_isStaticLoad()) { + if (!isStaticLoad()) { value = value.substring(BINDING_EXPRESSION_PREFIX.length(), value.length() - 1); expression = Expression.valueOf(value); @@ -1143,7 +1144,7 @@ FXMLLoader.this.location.toExternalForm())); } fxmlLoader.setClassLoader(cl); - fxmlLoader.impl_setStaticLoad(staticLoad); + fxmlLoader.setStaticLoad(staticLoad); Object value = fxmlLoader.loadImpl(callerClass); @@ -2045,6 +2046,13 @@ return System.getProperty("javafx.version"); } }); + + FXMLLoaderHelper.setFXMLLoaderAccessor(new FXMLLoaderHelper.FXMLLoaderAccessor() { + @Override + public void setStaticLoad(FXMLLoader fxmlLoader, boolean staticLoad) { + fxmlLoader.setStaticLoad(staticLoad); + } + }); } /** @@ -2353,26 +2361,20 @@ clearImports(); } - /** + /* * Returns the static load flag. - * - * @treatAsPrivate - * @deprecated */ - public boolean impl_isStaticLoad() { + boolean isStaticLoad() { // SB-dependency: RT-21226 has been filed to track this return staticLoad; } - /** + /* * Sets the static load flag. * * @param staticLoad - * - * @treatAsPrivate - * @deprecated */ - public void impl_setStaticLoad(boolean staticLoad) { + void setStaticLoad(boolean staticLoad) { // SB-dependency: RT-21226 has been filed to track this this.staticLoad = staticLoad; } @@ -2613,7 +2615,7 @@ if (loader.current != null) { messageBuilder.append(":"); - messageBuilder.append(loader.impl_getLineNumber()); + messageBuilder.append(loader.getLineNumber()); } messageBuilder.append("\n"); @@ -2623,30 +2625,21 @@ /** * Returns the current line number. - * - * @treatAsPrivate - * @deprecated - * @since JavaFX 2.2 */ - public int impl_getLineNumber() { + int getLineNumber() { return xmlStreamReader.getLocation().getLineNumber(); } /** * Returns the current parse trace. - * - * @treatAsPrivate - * @deprecated - * @since JavaFX 2.1 */ - // SB-dependency: RT-21475 has been filed to track this - public ParseTraceElement[] impl_getParseTrace() { + ParseTraceElement[] getParseTrace() { ParseTraceElement[] parseTrace = new ParseTraceElement[loaders.size()]; int i = 0; for (FXMLLoader loader : loaders) { parseTrace[i++] = new ParseTraceElement(loader.location, (loader.current != null) ? - loader.impl_getLineNumber() : -1); + loader.getLineNumber() : -1); } return parseTrace; --- old/modules/fxml/src/test/addExports 2016-06-03 22:22:27.427310057 -0700 +++ new/modules/fxml/src/test/addExports 2016-06-03 22:22:26.419310068 -0700 @@ -10,5 +10,6 @@ -XaddExports:javafx.graphics/com.sun.prism=ALL-UNNAMED -XaddExports:javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED # +-XaddExports:javafx.fxml/com.sun.javafx.fxml=ALL-UNNAMED -XaddExports:javafx.fxml/com.sun.javafx.fxml.builder=ALL-UNNAMED -XaddExports:javafx.fxml/com.sun.javafx.fxml.expression=ALL-UNNAMED --- old/modules/fxml/src/test/java/test/javafx/fxml/FXMLLoader_ScriptTest.java 2016-06-03 22:22:28.307310047 -0700 +++ new/modules/fxml/src/test/java/test/javafx/fxml/FXMLLoader_ScriptTest.java 2016-06-03 22:22:28.127310049 -0700 @@ -24,6 +24,7 @@ * questions. */ +import com.sun.javafx.fxml.FXMLLoaderHelper; import org.junit.Test; import java.io.IOException; @@ -38,7 +39,7 @@ @SuppressWarnings("deprecation") public void testStaticScriptLoad() throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("static_script_load.fxml")); - fxmlLoader.impl_setStaticLoad(true); + FXMLLoaderHelper.setStaticLoad(fxmlLoader, true); AtomicBoolean scriptCalled = new AtomicBoolean(); AtomicBoolean scriptEndCalled = new AtomicBoolean(); fxmlLoader.setLoadListener(new LoadListener() { --- old/modules/fxml/src/test/java/test/javafx/fxml/RT_18218Test.java 2016-06-03 22:22:28.739310042 -0700 +++ new/modules/fxml/src/test/java/test/javafx/fxml/RT_18218Test.java 2016-06-03 22:22:28.579310044 -0700 @@ -25,6 +25,7 @@ package test.javafx.fxml; +import com.sun.javafx.fxml.FXMLLoaderHelper; import java.io.IOException; import java.util.Map; import javafx.fxml.FXMLLoader; @@ -38,7 +39,7 @@ @SuppressWarnings({"unchecked", "deprecation"}) public void testStaticScriptLoad() throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("rt_18218.fxml")); - fxmlLoader.impl_setStaticLoad(true); + FXMLLoaderHelper.setStaticLoad(fxmlLoader, true); fxmlLoader.setLoadListener(new LoadListener() { private String unknownStaticPropertyElementName = null; --- old/modules/media/src/main/java/javafx/scene/media/MediaPlayer.java 2016-06-03 22:22:29.187310037 -0700 +++ new/modules/media/src/main/java/javafx/scene/media/MediaPlayer.java 2016-06-03 22:22:29.051310039 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2667,11 +2667,8 @@ * finished with it or a massive memory leak will occur. * * @return the current frame to be used for rendering, or null if not in a render cycle - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version */ - @Deprecated - public VideoDataBuffer impl_getLatestFrame() { + VideoDataBuffer getLatestFrame() { synchronized (renderLock) { if (null != currentRenderFrame) { currentRenderFrame.holdFrame(); --- old/modules/media/src/main/java/javafx/scene/media/MediaView.java 2016-06-03 22:22:29.827310030 -0700 +++ new/modules/media/src/main/java/javafx/scene/media/MediaView.java 2016-06-03 22:22:29.575310033 -0700 @@ -1002,33 +1002,22 @@ private int decodedFrameCount; private int renderedFrameCount; - /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version - */ - @Deprecated - public void impl_perfReset() { + void perfReset() { decodedFrameCount = 0; renderedFrameCount = 0; } /** * @return number of frames that have been submitted for rendering - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version */ - @Deprecated - public int impl_perfGetDecodedFrameCount() { + int perfGetDecodedFrameCount() { return decodedFrameCount; } /** * @return number of frames that have been rendered - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version */ - @Deprecated - public int impl_perfGetRenderedFrameCount() { + int perfGetRenderedFrameCount() { return renderedFrameCount; } --- old/modules/media/src/main/java/javafx/scene/media/NGMediaView.java 2016-06-03 22:22:30.283310025 -0700 +++ new/modules/media/src/main/java/javafx/scene/media/NGMediaView.java 2016-06-03 22:22:30.135310027 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -152,7 +152,7 @@ return; // not ready yet... } - VideoDataBuffer frame = player.impl_getLatestFrame(); + VideoDataBuffer frame = player.getLatestFrame(); if (null == frame) { return; } --- old/modules/web/src/android/java/javafx/scene/web/WebEngine.java 2016-06-03 22:22:30.779310019 -0700 +++ new/modules/web/src/android/java/javafx/scene/web/WebEngine.java 2016-06-03 22:22:30.599310021 -0700 @@ -1245,13 +1245,8 @@ * is always called on the JavaFX Application Thread. * @return the debugger associated with this web engine. * The return value cannot be {@code null}. - * @treatAsPrivate This is an internal API that can be changed or - * removed in the future. - * @deprecated This is an internal API that can be changed or - * removed in the future. */ - @Deprecated - public Debugger impl_getDebugger() { + Debugger getDebugger() { return debugger; } --- old/modules/web/src/ios/java/javafx/scene/web/WebEngine.java 2016-06-03 22:22:31.447310012 -0700 +++ new/modules/web/src/ios/java/javafx/scene/web/WebEngine.java 2016-06-03 22:22:31.139310015 -0700 @@ -184,8 +184,7 @@ private Debugger debugger = new DebuggerImpl(); - @Deprecated - public Debugger impl_getDebugger(){ + Debugger getDebugger(){ return debugger; } --- old/modules/web/src/main/java/javafx/scene/web/HTMLEditor.java 2016-06-03 22:22:31.911310007 -0700 +++ new/modules/web/src/main/java/javafx/scene/web/HTMLEditor.java 2016-06-03 22:22:31.763310008 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ package javafx.scene.web; +import com.sun.javafx.scene.control.ControlHelper; import javafx.css.StyleableProperty; import javafx.scene.control.Control; @@ -46,7 +47,7 @@ * Creates a new instance of the HTMLEditor control. */ public HTMLEditor() { - ((StyleableProperty)super.skinClassNameProperty()).applyStyle( + ((StyleableProperty) ControlHelper.skinClassNameProperty(this)).applyStyle( null, "javafx.scene.web.HTMLEditorSkin" ); --- old/modules/web/src/main/java/javafx/scene/web/WebEngine.java 2016-06-03 22:22:32.411310001 -0700 +++ new/modules/web/src/main/java/javafx/scene/web/WebEngine.java 2016-06-03 22:22:32.251310003 -0700 @@ -25,13 +25,8 @@ package javafx.scene.web; -import com.sun.javafx.geom.BaseBounds; -import com.sun.javafx.geom.transform.BaseTransform; -import com.sun.javafx.jmx.MXNodeAlgorithm; -import com.sun.javafx.jmx.MXNodeAlgorithmContext; import com.sun.javafx.scene.web.Debugger; import com.sun.javafx.scene.web.Printable; -import com.sun.javafx.sg.prism.NGNode; import com.sun.javafx.tk.TKPulseListener; import com.sun.javafx.tk.Toolkit; import com.sun.javafx.webkit.*; @@ -40,9 +35,7 @@ import com.sun.javafx.webkit.prism.theme.PrismRenderer; import com.sun.javafx.webkit.theme.RenderThemeImpl; import com.sun.javafx.webkit.theme.Renderer; -import com.sun.prism.Graphics; import com.sun.webkit.*; -import com.sun.webkit.graphics.WCGraphicsContext; import com.sun.webkit.graphics.WCGraphicsManager; import com.sun.webkit.network.URLs; import com.sun.webkit.network.Util; @@ -1476,7 +1469,7 @@ } - /** + /* * Returns the debugger associated with this web engine. * The debugger is an object that can be used to debug * the web page currently loaded into the web engine. @@ -1487,13 +1480,8 @@ * is always called on the JavaFX Application Thread. * @return the debugger associated with this web engine. * The return value cannot be {@code null}. - * @treatAsPrivate This is an internal API that can be changed or - * removed in the future. - * @deprecated This is an internal API that can be changed or - * removed in the future. */ - @Deprecated - public Debugger impl_getDebugger() { + Debugger getDebugger() { return debugger; } --- old/modules/web/src/test/java/javafx/scene/web/WebEngineShim.java 2016-06-03 22:22:32.935309995 -0700 +++ new/modules/web/src/test/java/javafx/scene/web/WebEngineShim.java 2016-06-03 22:22:32.759309997 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,7 @@ */ package javafx.scene.web; +import com.sun.javafx.scene.web.Debugger; import com.sun.webkit.WebPage; public class WebEngineShim { @@ -36,4 +37,7 @@ e.dispose(); } + public static Debugger getDebugger(WebEngine e) { + return e.getDebugger(); + } } --- old/modules/web/src/test/java/test/javafx/scene/web/DebuggerTest.java 2016-06-03 22:22:33.415309990 -0700 +++ new/modules/web/src/test/java/test/javafx/scene/web/DebuggerTest.java 2016-06-03 22:22:33.247309992 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import javafx.scene.web.WebEngineShim; import javafx.util.Callback; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -40,7 +41,7 @@ @Test public void testSimpleMessageExchange() { submit(() -> { - Debugger debugger = getEngine().impl_getDebugger(); + Debugger debugger = WebEngineShim.getDebugger(getEngine()); final List callbackMessages = new ArrayList(); debugger.setMessageCallback(message -> { @@ -59,7 +60,7 @@ @Test public void testEnabledProperty() { submit(() -> { - Debugger debugger = getEngine().impl_getDebugger(); + Debugger debugger = WebEngineShim.getDebugger(getEngine()); assertEquals(false, debugger.isEnabled()); @@ -82,7 +83,7 @@ @Test public void testMessageCallbackProperty() { submit(() -> { - Debugger debugger = getEngine().impl_getDebugger(); + Debugger debugger = WebEngineShim.getDebugger(getEngine()); Callback callback = new Callback() { public Void call(String message) { return null; @@ -102,7 +103,7 @@ @Test public void testSendMessageIllegalStateException() { submit(() -> { - Debugger debugger = getEngine().impl_getDebugger(); + Debugger debugger = WebEngineShim.getDebugger(getEngine()); try { debugger.sendMessage("foo"); fail("IllegalStateException expected but not thrown"); @@ -113,7 +114,7 @@ @Test public void testSendMessageNullPointerException() { submit(() -> { - Debugger debugger = getEngine().impl_getDebugger(); + Debugger debugger = WebEngineShim.getDebugger(getEngine()); debugger.setEnabled(true); try { debugger.sendMessage(null); @@ -124,7 +125,7 @@ @Test public void testThreadCheck() { - Debugger debugger = getEngine().impl_getDebugger(); + Debugger debugger = WebEngineShim.getDebugger(getEngine()); try { debugger.isEnabled(); @@ -159,7 +160,7 @@ @After public void disableDebug() { submit(() -> { - getEngine().impl_getDebugger().setEnabled(false); + WebEngineShim.getDebugger(getEngine()).setEnabled(false); }); } } --- /dev/null 2016-06-03 21:54:31.724881884 -0700 +++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/TableColumnBaseHelper.java 2016-06-03 22:22:33.687309987 -0700 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.javafx.scene.control; + +import com.sun.javafx.util.Utils; +import javafx.scene.control.TableColumnBase; + +/* + * Used to access internal TableColumnBase methods. + */ +public class TableColumnBaseHelper { + + private static TableColumnBaseAccessor tableColumnBaseAccessor; + + static { + Utils.forceInit(TableColumnBase.class); + } + + private TableColumnBaseHelper() { + } + + public static void setWidth(TableColumnBase tableColumnBase, double width) { + tableColumnBaseAccessor.setWidth(tableColumnBase, width); + } + + public static void setTableColumnBaseAccessor(final TableColumnBaseAccessor newAccessor) { + if (tableColumnBaseAccessor != null) { + throw new IllegalStateException(); + } + + tableColumnBaseAccessor = newAccessor; + } + + public interface TableColumnBaseAccessor { + + void setWidth(TableColumnBase tableColumnBase, double width); + + } +} --- /dev/null 2016-06-03 21:54:31.724881884 -0700 +++ new/modules/controls/src/test/java/javafx/scene/control/TextAreaShim.java 2016-06-03 22:22:34.167309981 -0700 @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package javafx.scene.control; + +public class TextAreaShim extends TextArea { + public static int getDefaultParagraphCapacity(TextArea ta) { + return ta.DEFAULT_PARAGRAPH_CAPACITY; + } + +} --- /dev/null 2016-06-03 21:54:31.724881884 -0700 +++ new/modules/fxml/src/main/java/com/sun/javafx/fxml/FXMLLoaderHelper.java 2016-06-03 22:22:34.747309975 -0700 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.sun.javafx.fxml; + +import com.sun.javafx.util.Utils; +import javafx.fxml.FXMLLoader; + +/** + * Used to access internal FXMLLoader methods. + */ +public class FXMLLoaderHelper { + private static FXMLLoaderAccessor fxmlLoaderAccessor; + + static { + Utils.forceInit(FXMLLoader.class); + } + + private FXMLLoaderHelper() { + } + + public static void setStaticLoad(FXMLLoader fxmlLoader, boolean staticLoad) { + fxmlLoaderAccessor.setStaticLoad(fxmlLoader, staticLoad); + } + + public static void setFXMLLoaderAccessor(final FXMLLoaderAccessor newAccessor) { + if (fxmlLoaderAccessor != null) { + throw new IllegalStateException(); + } + + fxmlLoaderAccessor = newAccessor; + } + + public interface FXMLLoaderAccessor { + void setStaticLoad(FXMLLoader fxmlLoader, boolean staticLoad); + } +}