--- a/jdk/src/java.desktop/share/classes/java/awt/Desktop.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/Desktop.java	Tue Feb 14 01:11:03 2017 +0300
@@ -335,7 +335,7 @@
      * most of the platforms support the {@link Desktop.Action#OPEN}
      * action.  But for a specific file, there may not be an
      * application registered to open it.  In this case, {@link
-     * #isSupported} may return {@code true}, but the corresponding
+     * #isSupported(Action)} may return {@code true}, but the corresponding
      * action method will throw an {@link IOException}.
      *
      * @param action the specified {@link Action}
@@ -720,7 +720,7 @@
      * default behavior.
      *
      * @param aboutHandler the handler to respond to the
-     * {@link java.awt.desktop.AboutHandler#handleAbout} )} message
+     * {@link java.awt.desktop.AboutHandler#handleAbout(AboutEvent)} message
      *
      * @throws SecurityException if a security manager exists and it
      * denies the
@@ -828,7 +828,7 @@
      * open a URL.
      *
      * Setting the handler to {@code null} causes all
-     * {@link OpenURIHandler#openURI(AppEvent.OpenURIEvent)} requests to be
+     * {@link OpenURIHandler#openURI(OpenURIEvent)} requests to be
      * enqueued until another handler is set.
      *
      * @implNote Please note that for Mac OS, notifications

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/AppForegroundEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -30,8 +30,8 @@
  * Event sent when the application has become the foreground app, and when it is
  * no longer the foreground app.
  *
- * @see AppForegroundListener#appRaisedToForeground(AppEvent.AppForegroundEvent)
- * @see AppForegroundListener#appMovedToBackground(AppEvent.AppForegroundEvent)
+ * @see AppForegroundListener#appRaisedToForeground(AppForegroundEvent)
+ * @see AppForegroundListener#appMovedToBackground(AppForegroundEvent)
  *
  * @since 9
  */

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/AppHiddenEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -29,8 +29,8 @@
 /**
  * Event sent when the application has been hidden or shown.
  *
- * @see AppHiddenListener#appHidden(AppEvent.AppHiddenEvent)
- * @see AppHiddenListener#appUnhidden(AppEvent.AppHiddenEvent)
+ * @see AppHiddenListener#appHidden(AppHiddenEvent)
+ * @see AppHiddenListener#appUnhidden(AppHiddenEvent)
  *
  * @since 9
  */

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/AppReopenedEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -29,7 +29,7 @@
 /**
  * Event sent when the application is asked to re-open itself.
  *
- * @see AppReopenedListener#appReopened(AppEvent.AppReopenedEvent)
+ * @see AppReopenedListener#appReopened(AppReopenedEvent)
  *
  * @since 9
  */

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/OpenURIEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -31,7 +31,7 @@
 /**
  * Event sent when the app is asked to open a {@code URI}.
  *
- * @see OpenURIHandler#openURI(AppEvent.OpenURIEvent)
+ * @see OpenURIHandler#openURI(OpenURIEvent)
  *
  * @since 9
  */

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/PrintFilesEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -33,7 +33,7 @@
 /**
  * Event sent when the app is asked to print a list of files.
  *
- * @see PrintFilesHandler#printFiles(AppEvent.PrintFilesEvent)
+ * @see PrintFilesHandler#printFiles(PrintFilesEvent)
  * @since 9
  */
 public final class PrintFilesEvent extends FilesEvent {

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/QuitEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -28,7 +28,7 @@
 /**
  * Event sent when the application is asked to quit.
  *
- * @see QuitHandler#handleQuitRequestWith(AppEvent.QuitEvent, QuitResponse)
+ * @see QuitHandler#handleQuitRequestWith(QuitEvent, QuitResponse)
  *
  * @since 9
  */

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/ScreenSleepEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -28,8 +28,8 @@
  * Event sent when the displays attached to the system enter and exit power save
  * sleep.
  *
- * @see ScreenSleepListener#screenAboutToSleep(AppEvent.ScreenSleepEvent)
- * @see ScreenSleepListener#screenAwoke(AppEvent.ScreenSleepEvent)
+ * @see ScreenSleepListener#screenAboutToSleep(ScreenSleepEvent)
+ * @see ScreenSleepListener#screenAwoke(ScreenSleepEvent)
  *
  * @since 9
  */

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/SystemSleepEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -28,8 +28,8 @@
 /**
  * Event sent when the system enters and exits power save sleep.
  *
- * @see SystemSleepListener#systemAboutToSleep(AppEvent.SystemSleepEvent)
- * @see SystemSleepListener#systemAwoke(AppEvent.SystemSleepEvent)
+ * @see SystemSleepListener#systemAboutToSleep(SystemSleepEvent)
+ * @see SystemSleepListener#systemAwoke(SystemSleepEvent)
  *
  * @since 9
  */

--- a/jdk/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java	Tue Feb 14 00:09:32 2017 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/desktop/UserSessionEvent.java	Tue Feb 14 01:11:03 2017 +0300
@@ -29,8 +29,8 @@
  *
  * Some systems may provide a reason of a user session change.
  *
- * @see UserSessionListener#userSessionActivated(AppEvent.UserSessionEvent)
- * @see UserSessionListener#userSessionDeactivated(AppEvent.UserSessionEvent)
+ * @see UserSessionListener#userSessionActivated(UserSessionEvent)
+ * @see UserSessionListener#userSessionDeactivated(UserSessionEvent)
  *
  * @since 9
  */