--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/CursorConverter.java 2015-09-03 15:33:18.952328100 -0700 +++ /dev/null 2015-09-03 15:33:20.000000000 -0700 @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2011, 2014, 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.css.converters; - -import com.sun.javafx.css.StyleConverterImpl; -import javafx.css.ParsedValue; -import javafx.css.StyleConverter; -import javafx.scene.Cursor; -import javafx.scene.text.Font; - -public final class CursorConverter extends StyleConverterImpl { - - // lazy, thread-safe instatiation - private static class Holder { - static final CursorConverter INSTANCE = new CursorConverter(); - } - - public static StyleConverter getInstance() { - return Holder.INSTANCE; - } - - private CursorConverter() { - super(); - } - - @Override - public Cursor convert(ParsedValue value, Font not_used) { - - // the parser doesn't covert cusor, so convert it from the raw value - String string = value.getValue(); - - if (string != null) { - - int index = string.indexOf("Cursor."); - if (index > -1) { - string = string.substring(index+"Cursor.".length()); - } - string = string.replace('-','_').toUpperCase(); - } - - try { - return Cursor.cursor(string); - } catch (IllegalArgumentException | NullPointerException exception) { - return Cursor.DEFAULT; - } - } - - @Override - public String toString() { - return "CursorConverter"; - } -} --- /dev/null 2015-09-03 15:33:20.000000000 -0700 +++ new/modules/graphics/src/main/java/javafx/css/converter/CursorConverter.java 2015-09-03 15:33:18.179283900 -0700 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2011, 2014, 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.css.converter; + +import javafx.css.ParsedValue; +import javafx.css.StyleConverter; +import javafx.scene.Cursor; +import javafx.scene.text.Font; + +/** + * @since 9 + */ +public final class CursorConverter extends StyleConverter { + + // lazy, thread-safe instatiation + private static class Holder { + static final CursorConverter INSTANCE = new CursorConverter(); + } + + public static StyleConverter getInstance() { + return Holder.INSTANCE; + } + + private CursorConverter() { + super(); + } + + @Override + public Cursor convert(ParsedValue value, Font not_used) { + + // the parser doesn't covert cusor, so convert it from the raw value + String string = value.getValue(); + + if (string != null) { + + int index = string.indexOf("Cursor."); + if (index > -1) { + string = string.substring(index+"Cursor.".length()); + } + string = string.replace('-','_').toUpperCase(); + } + + try { + return Cursor.cursor(string); + } catch (IllegalArgumentException | NullPointerException exception) { + return Cursor.DEFAULT; + } + } + + @Override + public String toString() { + return "CursorConverter"; + } +}