--- old/modules/javafx.base/src/test/java/javafx/util/converter/DateTimeStringConverterShim.java 2016-11-02 13:31:34.240590327 -0400 +++ /dev/null 2016-10-31 09:37:02.128008072 -0400 @@ -1,57 +0,0 @@ -/* - * Copyright (c) 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 - * 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.util.converter; - -import java.text.DateFormat; -import java.util.Locale; - -public class DateTimeStringConverterShim { - - public static int getTimeStyle(DateTimeStringConverter tsc) { - return tsc.timeStyle; - } - - public static String getPattern(DateTimeStringConverter tsc) { - return tsc.pattern; - } - - public static int getDateStyle(DateTimeStringConverter tsc) { - return tsc.dateStyle; - } - - public static DateFormat getDateFormat(DateTimeStringConverter tsc) { - return tsc.getDateFormat(); - } - - public static DateFormat getDateFormatVar(DateTimeStringConverter tsc) { - return tsc.dateFormat; - } - - public static Locale getLocale(DateTimeStringConverter tsc) { - return tsc.locale; - } - -} --- /dev/null 2016-10-31 09:37:02.128008072 -0400 +++ new/modules/javafx.base/src/shims/java/javafx/util/converter/DateTimeStringConverterShim.java 2016-11-02 13:31:34.084593871 -0400 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 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 + * 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.util.converter; + +import java.text.DateFormat; +import java.util.Locale; + +public class DateTimeStringConverterShim { + + public static int getTimeStyle(DateTimeStringConverter tsc) { + return tsc.timeStyle; + } + + public static String getPattern(DateTimeStringConverter tsc) { + return tsc.pattern; + } + + public static int getDateStyle(DateTimeStringConverter tsc) { + return tsc.dateStyle; + } + + public static DateFormat getDateFormat(DateTimeStringConverter tsc) { + return tsc.getDateFormat(); + } + + public static DateFormat getDateFormatVar(DateTimeStringConverter tsc) { + return tsc.dateFormat; + } + + public static Locale getLocale(DateTimeStringConverter tsc) { + return tsc.locale; + } + +}