diff --git a/apps/samples/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java b/apps/samples/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java --- a/apps/samples/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java +++ b/apps/samples/3DViewer/src/main/java/com/javafx/experiments/exporters/javasource/JavaSourceExporter.java @@ -405,7 +405,7 @@ nodeCode.append(indent + "try {\n"); nodeCode.append(indent + " " + materialName + ".setDiffuseMap("+toString(material.getDiffuseMap())+");\n"); nodeCode.append(indent + "} catch (NullPointerException npe) {\n"); - nodeCode.append(indent + " System.err.println(\"Could not load texture resource ["+material.getDiffuseMap().impl_getUrl()+"]\");\n"); + nodeCode.append(indent + " System.err.println(\"Could not load texture resource ["+material.getDiffuseMap().getUrl()+"]\");\n"); nodeCode.append(indent + "}\n"); } if (material.getBumpMap() != null) { @@ -421,7 +421,7 @@ } private String toString(Image image) { - String url = image.impl_getUrl(); + String url = image.getUrl(); if (url.startsWith(baseUrl)) { return "new Image("+className+".class.getResource(\""+url.substring(baseUrl.length())+"\").toExternalForm())"; } else { diff --git a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java --- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java +++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java @@ -541,7 +541,7 @@ StringBuilder builder = new StringBuilder(); if (property.equals("-fx-background-image")) { //NOI18N Image p = bi.getImage(); - builder.append(Deprecation.getUrl(p)); + builder.append(p.getUrl()); } else { if (property.equals("-fx-background-position")) { //NOI18N double left = 0, right = 0, top = 0, bottom = 0; @@ -609,7 +609,7 @@ StringBuilder builder = new StringBuilder(); if (property.equals("-fx-border-image")) { //NOI18N Image p = bi.getImage(); - builder.append(Deprecation.getUrl(p)); + builder.append(p.getUrl()); } else { if (property.equals("-fx-background-position")) { //NOI18N diff --git a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/metadata/util/DesignImage.java b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/metadata/util/DesignImage.java --- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/metadata/util/DesignImage.java +++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/metadata/util/DesignImage.java @@ -53,10 +53,10 @@ public DesignImage(Image image) { assert image != null; - assert Deprecation.getUrl(image) != null; + assert image.getUrl() != null; this.image = image; - this.location = Deprecation.getUrl(image); + this.location = image.getUrl(); } public Image getImage() { diff --git a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java --- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java +++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java @@ -159,11 +159,6 @@ // public static void setTraversalEngine(Parent parent, TraversalEngine engine) { // parent.setImpl_traversalEngine(engine); // } - // Deprecated stuff in Image - // RT-21216 : Promote impl_getUrl to public API - public static String getUrl(Image image) { - return image.impl_getUrl(); - } // // RT-21217 : Promote impl_fromPlatformImage to public API // public static Image fromPlatformImage(Object platformImage) { diff --git a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/effectpicker/editors/ImageControl.java b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/effectpicker/editors/ImageControl.java --- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/effectpicker/editors/ImageControl.java +++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/control/effectpicker/editors/ImageControl.java @@ -168,7 +168,7 @@ } editor_label.setText(labelString); - editor_textfield.setText(initVal == null ? "" : Deprecation.getUrl(initVal)); //NOI18N + editor_textfield.setText(initVal == null ? "" : initVal.getUrl()); //NOI18N setValue(initVal); } } diff --git a/modules/controls/src/main/java/javafx/scene/control/DialogPane.java b/modules/controls/src/main/java/javafx/scene/control/DialogPane.java --- a/modules/controls/src/main/java/javafx/scene/control/DialogPane.java +++ b/modules/controls/src/main/java/javafx/scene/control/DialogPane.java @@ -356,7 +356,7 @@ final ImageView imageView = (ImageView)graphicNode; final Image image = imageView.getImage(); if (image != null) { - final String imageViewUrl = image.impl_getUrl(); + final String imageViewUrl = image.getUrl(); if (url.equals(imageViewUrl)) return; } @@ -391,7 +391,7 @@ if (graphic instanceof ImageView) { final Image image = ((ImageView)graphic).getImage(); if (image != null) { - return image.impl_getUrl(); + return image.getUrl(); } } return null; diff --git a/modules/controls/src/main/java/javafx/scene/control/Labeled.java b/modules/controls/src/main/java/javafx/scene/control/Labeled.java --- a/modules/controls/src/main/java/javafx/scene/control/Labeled.java +++ b/modules/controls/src/main/java/javafx/scene/control/Labeled.java @@ -476,7 +476,7 @@ final ImageView imageView = (ImageView)graphicNode; final Image image = imageView.getImage(); if (image != null) { - final String imageViewUrl = image.impl_getUrl(); + final String imageViewUrl = image.getUrl(); if (url.equals(imageViewUrl)) return; } @@ -512,7 +512,7 @@ if (graphic instanceof ImageView) { final Image image = ((ImageView)graphic).getImage(); if (image != null) { - return image.impl_getUrl(); + return image.getUrl(); } } return null; diff --git a/modules/controls/src/main/java/javafx/scene/control/Tooltip.java b/modules/controls/src/main/java/javafx/scene/control/Tooltip.java --- a/modules/controls/src/main/java/javafx/scene/control/Tooltip.java +++ b/modules/controls/src/main/java/javafx/scene/control/Tooltip.java @@ -385,7 +385,7 @@ final ImageView imageView = (ImageView)graphicNode; final Image image = imageView.getImage(); if (image != null) { - final String imageViewUrl = image.impl_getUrl(); + final String imageViewUrl = image.getUrl(); if (url.equals(imageViewUrl)) return; } @@ -413,7 +413,7 @@ if (graphic instanceof ImageView) { final Image image = ((ImageView)graphic).getImage(); if (image != null) { - return image.impl_getUrl(); + return image.getUrl(); } } return null; diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java @@ -294,7 +294,7 @@ Image im = iv.getImage(); if (im == null) return null; - String url = im.impl_getUrl(); + String url = im.getUrl(); if (url == null || PixelUtils.supportedFormatType(url)) { com.sun.prism.Image pi = (com.sun.prism.Image)im.impl_getPlatformImage(); diff --git a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java --- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java +++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/QuantumClipboard.java @@ -435,7 +435,7 @@ return false; } - String url = image.impl_getUrl(); + String url = image.getUrl(); if (url == null || PixelUtils.supportedFormatType(url)) { com.sun.prism.Image prismImage = (com.sun.prism.Image)image.impl_getPlatformImage(); diff --git a/modules/graphics/src/main/java/javafx/scene/image/Image.java b/modules/graphics/src/main/java/javafx/scene/image/Image.java --- a/modules/graphics/src/main/java/javafx/scene/image/Image.java +++ b/modules/graphics/src/main/java/javafx/scene/image/Image.java @@ -47,8 +47,6 @@ import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.ReadOnlyObjectPropertyBase; import javafx.beans.property.ReadOnlyObjectWrapper; -import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.scene.paint.Color; import javafx.util.Duration; import com.sun.javafx.runtime.async.AsyncOperation; @@ -158,12 +156,14 @@ private final String url; /** - * @treatAsPrivate implementation detail - * @deprecated This is an internal API that is not intended for use and will be removed in the next version + * Returns the url used to use fetch the pixel data contained in the Image instance, + * if specified in the constructor. If no url is provided in the constructor (for + * instance, if the Image is constructed from an + * {@link #Image(InputStream) InputStream}), this method will return null. + * + * @since 9 */ - // SB-dependency: RT-21216 has been filed to track this - @Deprecated - public final String impl_getUrl() { + public final String getUrl() { return url; } @@ -804,7 +804,7 @@ loader = loadImage(impl_source, getRequestedWidth(), getRequestedHeight(), isPreserveRatio(), isSmooth()); } else { - loader = loadImage(impl_getUrl(), getRequestedWidth(), getRequestedHeight(), + loader = loadImage(getUrl(), getRequestedWidth(), getRequestedHeight(), isPreserveRatio(), isSmooth()); } finishImage(loader); diff --git a/modules/graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java b/modules/graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java --- a/modules/graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java +++ b/modules/graphics/src/test/java/test/com/sun/javafx/scene/layout/RegionTest.java @@ -331,7 +331,7 @@ // for (int i=0; i