From 2ffacafc1380b69e894482994e0bb09e0da7f658 Mon Sep 17 00:00:00 2001 From: serb Date: Thu, 26 Dec 2013 21:33:24 +0400 Subject: [PATCH] 8030987: sun_awt_X11_GtkFileDialogPeer.h can be removed Reviewed-by: pchelko, azvegint --- .../sun/awt/X11/GtkFileDialogPeer.java | 17 +++--- .../sun/awt/sun_awt_X11_GtkFileDialogPeer.c | 25 +++++++++ .../sun/awt/sun_awt_X11_GtkFileDialogPeer.h | 55 ------------------- 3 files changed, 32 insertions(+), 65 deletions(-) delete mode 100644 src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h diff --git a/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java b/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java index a53242ffc..fad3b3b6c 100644 --- a/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java +++ b/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, 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 @@ -24,7 +24,6 @@ */ package sun.awt.X11; -import java.awt.Dialog; import java.awt.FileDialog; import java.awt.peer.FileDialogPeer; import java.io.File; @@ -36,15 +35,15 @@ import sun.awt.AWTAccessor; * * @author Costantino Cerbo (c.cerbo@gmail.com) */ -class GtkFileDialogPeer extends XDialogPeer implements FileDialogPeer { +final class GtkFileDialogPeer extends XDialogPeer implements FileDialogPeer { - private FileDialog fd; + private final FileDialog fd; // A pointer to the native GTK FileChooser widget private volatile long widget = 0L; - public GtkFileDialogPeer(FileDialog fd) { - super((Dialog) fd); + GtkFileDialogPeer(FileDialog fd) { + super(fd); this.fd = fd; } @@ -172,9 +171,7 @@ class GtkFileDialogPeer extends XDialogPeer implements FileDialogPeer { dirname = file.getParent(); } } - GtkFileDialogPeer.this.run(fd.getTitle(), fd.getMode(), dirname, - filename, fd.getFilenameFilter(), - fd.isMultipleMode(), fd.getX(), fd.getY()); + run(fd.getTitle(), fd.getMode(), dirname, filename, + fd.getFilenameFilter(), fd.isMultipleMode(), fd.getX(), fd.getY()); } - } diff --git a/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c b/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c index 66dca0d60..6fd354a65 100644 --- a/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c +++ b/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c @@ -1,3 +1,28 @@ +/* + * Copyright (c) 2010, 2012, 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. + */ + #include #include #include diff --git a/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h b/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h deleted file mode 100644 index 8bdf81549..000000000 --- a/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h +++ /dev/null @@ -1,55 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class sun_awt_X11_GtkFileDialogPeer */ - -#ifndef _Included_sun_awt_X11_GtkFileDialogPeer -#define _Included_sun_awt_X11_GtkFileDialogPeer -#ifdef __cplusplus -extern "C" -{ -#endif - -/* - * Class: sun_awt_X11_GtkFileDialogPeer - * Method: initIDs - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_sun_awt_X11_GtkFileDialogPeer_initIDs -(JNIEnv *, jclass); - -/* - * Class: sun_awt_X11_GtkFileDialogPeer - * Method: run - * Signature: (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/io/FilenameFilter;ZII)V - */ -JNIEXPORT void JNICALL Java_sun_awt_X11_GtkFileDialogPeer_run -(JNIEnv *, jobject, jstring, jint, jstring, jstring, jobject, jboolean, jint, jint); - -/* - * Class: sun_awt_X11_GtkFileDialogPeer - * Method: quit - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_sun_awt_X11_GtkFileDialogPeer_quit -(JNIEnv *, jobject); - -/* - * Class: sun_awt_X11_GtkFileDialogPeer - * Method: toFront - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_sun_awt_X11_GtkFileDialogPeer_toFront -(JNIEnv *, jobject); - -/* - * Class: sun_awt_X11_GtkFileDialogPeer - * Method: setBounds - * Signature: (IIIII)V - */ -JNIEXPORT void JNICALL Java_sun_awt_X11_GtkFileDialogPeer_setBounds -(JNIEnv * env, jobject jpeer, jint x, jint y, jint width, jint height, jint op); - -#ifdef __cplusplus -} -#endif -#endif -- GitLab