--- a/jdk/src/java.desktop/macosx/classes/apple/laf/AquaLookAndFeel.java	Wed Aug 16 11:31:56 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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 apple.laf;
-
-/*
- * This class is essentially a placeholder since
- * "apple.laf.AquaLookAndFeel" is so widely used, documented,
- * and hard coded that it is impractical to remove it.
- */
-@SuppressWarnings("serial") // JDK implementation class
-public class AquaLookAndFeel extends com.apple.laf.AquaLookAndFeel { }

--- a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationAdapter.java	Wed Aug 16 11:31:56 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2011, 2017, 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.apple.eawt;
-
-import java.awt.desktop.AboutHandler;
-import java.awt.desktop.AppForegroundListener;
-import java.awt.desktop.AppHiddenListener;
-import java.awt.desktop.AppReopenedListener;
-import java.awt.desktop.OpenFilesHandler;
-import java.awt.desktop.OpenURIHandler;
-import java.awt.desktop.PreferencesHandler;
-import java.awt.desktop.PrintFilesHandler;
-import java.awt.desktop.QuitHandler;
-import java.awt.desktop.ScreenSleepListener;
-import java.awt.desktop.SystemEventListener;
-import java.awt.desktop.SystemSleepListener;
-import java.awt.desktop.UserSessionListener;
-
-/**
- * An abstract adapter class for receiving {@code ApplicationEvents}.
- *
- * ApplicationEvents are deprecated. Use individual app event listeners or handlers instead.
- *
- * @see Application#addAppEventListener(SystemEventListener)
- *
- * @see AboutHandler
- * @see PreferencesHandler
- * @see OpenURIHandler
- * @see OpenFilesHandler
- * @see PrintFilesHandler
- * @see QuitHandler
- *
- * @see AppReopenedListener
- * @see AppForegroundListener
- * @see AppHiddenListener
- * @see UserSessionListener
- * @see ScreenSleepListener
- * @see SystemSleepListener
- *
- * @deprecated replaced by {@link AboutHandler}, {@link PreferencesHandler}, {@link AppReopenedListener}, {@link OpenFilesHandler}, {@link PrintFilesHandler}, {@link QuitHandler}, {@link MacQuitResponse}.
- * @since 1.4
- */
-@SuppressWarnings("deprecation")
-@Deprecated
-public class ApplicationAdapter implements ApplicationListener {
-    @Deprecated
-    public void handleAbout(final ApplicationEvent event) { }
-
-    @Deprecated
-    public void handleOpenApplication(final ApplicationEvent event) { }
-
-    @Deprecated
-    public void handleOpenFile(final ApplicationEvent event) { }
-
-    @Deprecated
-    public void handlePreferences(final ApplicationEvent event) { }
-
-    @Deprecated
-    public void handlePrintFile(final ApplicationEvent event) { }
-
-    @Deprecated
-    public void handleQuit(final ApplicationEvent event) { }
-
-    @Deprecated
-    public void handleReOpenApplication(final ApplicationEvent event) { }
-}

--- a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationEvent.java	Wed Aug 16 11:31:56 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2011, 2017, 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.apple.eawt;
-
-import java.awt.desktop.AboutHandler;
-import java.awt.desktop.AppReopenedListener;
-import java.awt.desktop.OpenFilesHandler;
-import java.awt.desktop.PreferencesHandler;
-import java.awt.desktop.PrintFilesHandler;
-import java.awt.desktop.QuitHandler;
-import java.util.EventObject;
-
-/**
- * The class of events sent to the deprecated ApplicationListener callbacks.
- *
- * @deprecated replaced by {@link AboutHandler}, {@link PreferencesHandler}, {@link AppReopenedListener}, {@link OpenFilesHandler}, {@link PrintFilesHandler}, {@link QuitHandler}, {@link MacQuitResponse}
- * @since 1.4
- */
-@Deprecated
-@SuppressWarnings("serial") // JDK implementation class
-public class ApplicationEvent extends EventObject {
-    private String fFilename = null;
-    private boolean fHandled = false;
-
-    ApplicationEvent(final Object source) {
-        super(source);
-    }
-
-    ApplicationEvent(final Object source, final String filename) {
-        super(source);
-        fFilename = filename;
-    }
-
-    /**
-     * Determines whether an ApplicationListener has acted on a particular event.
-     * An event is marked as having been handled with {@code setHandled(true)}.
-     *
-     * @return {@code true} if the event has been handled, otherwise {@code false}
-     *
-     * @since 1.4
-     * @deprecated
-     */
-    @Deprecated
-    public boolean isHandled() {
-        return fHandled;
-    }
-
-    /**
-     * Marks the event as handled.
-     * After this method handles an ApplicationEvent, it may be useful to specify that it has been handled.
-     * This is usually used in conjunction with {@code getHandled()}.
-     * Set to {@code true} to designate that this event has been handled. By default it is {@code false}.
-     *
-     * @param state {@code true} if the event has been handled, otherwise {@code false}.
-     *
-     * @since 1.4
-     * @deprecated
-     */
-    @Deprecated
-    public void setHandled(final boolean state) {
-        fHandled = state;
-    }
-
-    /**
-     * Provides the filename associated with a particular AppleEvent.
-     * When the ApplicationEvent corresponds to an AppleEvent that needs to act on a particular file, the ApplicationEvent carries the name of the specific file with it.
-     * For example, the Print and Open events refer to specific files.
-     * For these cases, this returns the appropriate file name.
-     *
-     * @return the full path to the file associated with the event, if applicable, otherwise {@code null}
-     *
-     * @since 1.4
-     * @deprecated use {@link OpenFilesHandler} or {@link PrintFilesHandler} instead
-     */
-    @Deprecated
-    public String getFilename() {
-        return fFilename;
-    }
-}

--- a/jdk/src/java.desktop/macosx/classes/com/apple/eawt/ApplicationListener.java	Wed Aug 16 11:31:56 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2011, 2017, 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.apple.eawt;
-
-import java.awt.desktop.AboutHandler;
-import java.awt.desktop.AppForegroundListener;
-import java.awt.desktop.AppHiddenListener;
-import java.awt.desktop.AppReopenedListener;
-import java.awt.desktop.OpenFilesHandler;
-import java.awt.desktop.OpenURIHandler;
-import java.awt.desktop.PreferencesHandler;
-import java.awt.desktop.PrintFilesHandler;
-import java.awt.desktop.QuitHandler;
-import java.awt.desktop.ScreenSleepListener;
-import java.awt.desktop.SystemEventListener;
-import java.awt.desktop.SystemSleepListener;
-import java.awt.desktop.UserSessionListener;
-import java.util.EventListener;
-
-/**
- * ApplicationEvents are deprecated. Use individual AppEvent listeners or handlers instead.
- *
- * @see Application#addAppEventListener(SystemEventListener)
- *
- * @see AboutHandler
- * @see PreferencesHandler
- * @see OpenURIHandler
- * @see OpenFilesHandler
- * @see PrintFilesHandler
- * @see QuitHandler
- *
- * @see AppReopenedListener
- * @see AppForegroundListener
- * @see AppHiddenListener
- * @see UserSessionListener
- * @see ScreenSleepListener
- * @see SystemSleepListener
- *
- * @since 1.4
- * @deprecated replaced by {@link AboutHandler}, {@link PreferencesHandler}, {@link AppReopenedListener}, {@link OpenFilesHandler}, {@link PrintFilesHandler}, {@link QuitHandler}, {@link MacQuitResponse}
- */
-@SuppressWarnings("deprecation")
-@Deprecated
-public interface ApplicationListener extends EventListener {
-    /**
-     * Called when the user selects the About item in the application menu. If {@code event} is not handled by
-     * setting {@code isHandled(true)}, a default About window consisting of the application's name and icon is
-     * displayed. To display a custom About window, designate the {@code event} as being handled and display the
-     * appropriate About window.
-     *
-     * @param event an ApplicationEvent initiated by the user choosing About in the application menu
-     * @deprecated use {@link AboutHandler}
-     */
-    @Deprecated
-    public void handleAbout(ApplicationEvent event);
-
-    /**
-     * Called when the application receives an Open Application event from the Finder or another application. Usually
-     * this will come from the Finder when a user double-clicks your application icon. If there is any special code
-     * that you want to run when you user launches your application from the Finder or by sending an Open Application
-     * event from another application, include that code as part of this handler. The Open Application event is sent
-     * after AWT has been loaded.
-     *
-     * @param event the Open Application event
-     * @deprecated no replacement
-     */
-    @Deprecated
-    public void handleOpenApplication(ApplicationEvent event);
-
-    /**
-     * Called when the application receives an Open Document event from the Finder or another application. This event
-     * is generated when a user double-clicks a document in the Finder. If the document is registered as belonging
-     * to your application, this event is sent to your application. Documents are bound to a particular application based
-     * primarily on their suffix. In the Finder, a user selects a document and then from the File Menu chooses Get Info.
-     * The Info window allows users to bind a document to a particular application.
-     *
-     * These events are sent only if the bound application has file types listed in the Info.plist entries Document Types
-     * or CFBundleDocumentTypes.
-     *
-     * The ApplicationEvent sent to this handler holds a reference to the file being opened.
-     *
-     * @param event an Open Document event with reference to the file to be opened
-     * @deprecated use {@link OpenFilesHandler}
-     */
-    @Deprecated
-    public void handleOpenFile(ApplicationEvent event);
-
-    /**
-     * Called when the Preference item in the application menu is selected. Native Mac OS X applications make their
-     * Preferences window available through the application menu. Java applications are automatically given an application
-     * menu in Mac OS X. By default, the Preferences item is disabled in that menu. If you are deploying an application
-     * on Mac OS X, you should enable the preferences item with {@code setEnabledPreferencesMenu(true)} in the
-     * Application object and then display your Preferences window in this handler.
-     *
-     * @param event triggered when the user selects Preferences from the application menu
-     * @deprecated use {@link PreferencesHandler}
-     */
-    @Deprecated
-    public void handlePreferences(ApplicationEvent event);
-
-    /**
-     * Called when the application is sent a request to print a particular file or files. You can allow other applications to
-     * print files with your application by implementing this handler. If another application sends a Print Event along
-     * with the name of a file that your application knows how to process, you can use this handler to determine what to
-     * do with that request. You might open your entire application, or just invoke your printing classes.
-     *
-     * These events are sent only if the bound application has file types listed in the Info.plist entries Document Types
-     * or CFBundleDocumentTypes.
-     *
-     * The ApplicationEvent sent to this handler holds a reference to the file being opened.
-     *
-     * @param event a Print Document event with a reference to the file(s) to be printed
-     * @deprecated use {@link PrintFilesHandler}
-     */
-    @Deprecated
-    public void handlePrintFile(ApplicationEvent event);
-
-    /**
-     * Called when the application is sent the Quit event. This event is generated when the user selects Quit from the
-     * application menu, when the user types Command-Q, or when the user control clicks on your application icon in the
-     * Dock and chooses Quit. You can either accept or reject the request to quit. You might want to reject the request
-     * to quit if the user has unsaved work. Reject the request, move into your code to save changes, then quit your
-     * application. To accept the request to quit, and terminate the application, set {@code isHandled(true)} for the
-     * {@code event}. To reject the quit, set {@code isHandled(false)}.
-     *
-     * @param event a Quit Application event
-     * @deprecated use {@link QuitHandler} and {@link MacQuitResponse}
-     */
-    @Deprecated
-    public void handleQuit(ApplicationEvent event);
-
-    /**
-     * Called when the application receives a Reopen Application event from the Finder or another application. Usually
-     * this will come when a user clicks on your application icon in the Dock. If there is any special code
-     * that needs to run when your user clicks on your application icon in the Dock or when a Reopen Application
-     * event is sent from another application, include that code as part of this handler.
-     *
-     * @param event the Reopen Application event
-     * @deprecated use {@link AppReopenedListener}
-     */
-    @Deprecated
-    public void handleReOpenApplication(ApplicationEvent event);
-}

--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/Painter.java	Wed Aug 16 11:31:56 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2005, 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
- * 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.java.swing;
-
-/**
- * This class is preserved for backward compatibility with JDK 6.
- *
- * @deprecated Use {@link javax.swing.Painter} instead.
- */
-@Deprecated
-public interface Painter<T> extends javax.swing.Painter<T> {
-}

--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java	Wed Aug 16 11:31:56 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2005, 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
- * 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.java.swing.plaf.nimbus;
-
-/**
- * This class is preserved for backward compatibility with JDK 6.
- *
- * @deprecated Use {@link javax.swing.plaf.nimbus.AbstractRegionPainter} instead.
- */
-@Deprecated
-public abstract class AbstractRegionPainter extends javax.swing.plaf.nimbus.AbstractRegionPainter {
-}

--- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java	Wed Aug 16 11:31:56 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2005, 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.java.swing.plaf.nimbus;
-
-/**
- * This class is preserved for backward compatibility with JDK 6.
- *
- * @deprecated Use {@link javax.swing.plaf.nimbus.NimbusLookAndFeel} instead.
- */
-@Deprecated
-@SuppressWarnings("serial") // Superclass not serializable
-public class NimbusLookAndFeel extends javax.swing.plaf.nimbus.NimbusLookAndFeel {
-}

--- a/jdk/test/javax/swing/JTable/6937798/bug6937798.java	Wed Aug 16 11:31:56 2017 -0700
+++ b/jdk/test/javax/swing/JTable/6937798/bug6937798.java	Thu Aug 17 13:51:01 2017 -0700
@@ -25,13 +25,11 @@
    @bug 6937798
    @summary Nimbus: Issues with JTable grid
    @author Alexander Potochkin
-   @modules java.desktop/com.sun.java.swing.plaf.nimbus
    @run main bug6937798
 */
 
-import com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel;
-
 import javax.swing.*;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 import java.awt.*;

--- a/jdk/test/javax/swing/plaf/nimbus/Test6741426.java	Wed Aug 16 11:31:56 2017 -0700
+++ b/jdk/test/javax/swing/plaf/nimbus/Test6741426.java	Thu Aug 17 13:51:01 2017 -0700
@@ -25,12 +25,12 @@
    @bug 6741426
    @summary Tests reusing Nimbus borders across different components (JComboBox border set on a JTextField)
    @author Peter Zhelezniakov
-   @modules java.desktop/com.sun.java.swing.plaf.nimbus
    @run main Test6741426
 */
 
-import com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel;
 import javax.swing.*;
+import javax.swing.plaf.nimbus.NimbusLookAndFeel;
+
 import java.awt.image.BufferedImage;