On Fri, 4 Jun 2021 22:09:09 GMT, Kevin Rushforth <k...@openjdk.org> wrote:
>> Michael Strauß has updated the pull request with a new target base due to a >> merge or a rebase. The pull request now contains 15 commits: >> >> - Merge branch 'master' into feature/image-datauri >> >> # Conflicts: >> # >> modules/javafx.graphics/src/test/java/test/com/sun/javafx/iio/ImageStorageTest.java >> - Accept regular file paths, change javadoc >> - Merge branch 'openjdk:master' into feature/image-datauri >> - Rename DataURI.isValidURI >> - Reverted a change >> - Allow leading and trailing whitespace in data URI >> - Removed test >> - Changed data URI detection >> - Merge branch 'master' into feature/image-datauri >> - Moved test >> - ... and 5 more: >> https://git.openjdk.java.net/jfx/compare/7b7050c4...315523c5 > > modules/javafx.graphics/src/main/java/javafx/css/converter/URLConverter.java > line 98: > >> 96: } >> 97: >> 98: private URL resolve(String stylesheetUrl, String resource) { > > Why was this change done? It seems unnecessary and possibly unwanted. `resource` is never `null` at this point, and it is already trimmed. Also, contrary to the comment, I cannot see this method being used anywhere in tests, so I made it private. ------------- PR: https://git.openjdk.java.net/jfx/pull/508
