modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ColorPickerSkin.java

Print this page
rev 8726 : [mq]: rt40280

*** 1,7 **** /* ! * Copyright (c) 2012, 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 --- 1,7 ---- /* ! * Copyright (c) 2012, 2015, 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
*** 53,62 **** --- 53,63 ---- import java.util.HashMap; import java.util.Map; import javafx.scene.control.ColorPicker; + import javafx.scene.control.TextField; import javafx.beans.property.BooleanProperty; import javafx.beans.value.WritableValue; import javafx.css.Styleable; import javafx.css.StyleableProperty; import javafx.event.ActionEvent;
*** 656,661 **** --- 657,672 ---- @Override public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() { return getClassCssMetaData(); } + @Override protected javafx.util.StringConverter<Color> getConverter() { + return null; + } + + /** + * ColorPicker does not use a main text field. + */ + @Override protected TextField getEditor() { + return null; + } }