From 39fe334e1216b35c99353be42393e50df1e30499 Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Thu, 12 May 2016 20:43:37 +0400
Subject: [PATCH] 8154539: Examine the desktop module's use of
 sun.misc.SoftCache

Reviewed-by: prr, chegar, mchung
---
 jdk/src/java.desktop/share/classes/module-info.java             | 2 --
 .../misc => java.desktop/share/classes/sun/awt}/SoftCache.java  | 2 +-
 jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java      | 1 -
 .../classes/sun/awt/image/MultiResolutionToolkitImage.java      | 2 +-
 jdk/test/com/sun/jdi/ReferrersTest.java                         | 2 +-
 5 files changed, 3 insertions(+), 6 deletions(-)
 rename jdk/src/{jdk.unsupported/share/classes/sun/misc => java.desktop/share/classes/sun/awt}/SoftCache.java (99%)

diff --git a/jdk/src/java.desktop/share/classes/module-info.java b/jdk/src/java.desktop/share/classes/module-info.java
index 5cf785de71f..77150e17b73 100644
--- a/jdk/src/java.desktop/share/classes/module-info.java
+++ b/jdk/src/java.desktop/share/classes/module-info.java
@@ -27,8 +27,6 @@ module java.desktop {
     requires public java.datatransfer;
     requires public java.xml;
     requires java.prefs;
-    // 8147544
-    requires jdk.unsupported;
 
     exports java.applet;
     exports java.awt;
diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/SoftCache.java b/jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java
similarity index 99%
rename from jdk/src/jdk.unsupported/share/classes/sun/misc/SoftCache.java
rename to jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java
index 30bc2ec6068..7b7ea26be86 100644
--- a/jdk/src/jdk.unsupported/share/classes/sun/misc/SoftCache.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SoftCache.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package sun.misc;
+package sun.awt;
 
 import java.lang.ref.SoftReference;
 import java.lang.ref.ReferenceQueue;
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
index fdaeb1ea7ad..8461974375f 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
@@ -65,7 +65,6 @@ import sun.awt.image.MultiResolutionToolkitImage;
 import sun.awt.image.ToolkitImage;
 import sun.awt.image.URLImageSource;
 import sun.font.FontDesignMetrics;
-import sun.misc.SoftCache;
 import sun.net.util.URLUtil;
 import sun.security.action.GetBooleanAction;
 import sun.security.action.GetPropertyAction;
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
index a8e67f767ca..26a86916824 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java
@@ -29,7 +29,7 @@ import java.awt.image.ImageObserver;
 import java.awt.image.MultiResolutionImage;
 import java.util.Arrays;
 import java.util.List;
-import sun.misc.SoftCache;
+import sun.awt.SoftCache;
 
 public class MultiResolutionToolkitImage extends ToolkitImage implements MultiResolutionImage {
 
diff --git a/jdk/test/com/sun/jdi/ReferrersTest.java b/jdk/test/com/sun/jdi/ReferrersTest.java
index b78a5618019..3293b089f31 100644
--- a/jdk/test/com/sun/jdi/ReferrersTest.java
+++ b/jdk/test/com/sun/jdi/ReferrersTest.java
@@ -446,7 +446,7 @@ public class ReferrersTest extends TestScaffold {
         if (rt instanceof ClassType) {
             ClassType ct = (ClassType)rt;
             String name = ct.name();
-            if (name.equals("sun.misc.SoftCache$ValueCell")) {
+            if (name.equals("sun.awt.SoftCache$ValueCell")) {
                 return;
             }
             if (name.equals("java.lang.ref.Finalizer")) {