From 9884b80330e99970f5500b21c7062fc089016816 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Wed, 13 Jan 2016 13:33:37 +0000 Subject: [PATCH] 8146735: Move sun.misc.PerformanceLogger to sun.awt.util Reviewed-by: alanb, mchung, rriggs --- jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java | 2 +- .../share/classes/sun/awt/util}/PerformanceLogger.java | 2 +- .../java.desktop/share/classes/sun/java2d/SunGraphics2D.java | 2 +- jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java | 1 + .../java.desktop/windows/classes/sun/awt/windows/WToolkit.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename jdk/src/{java.base/share/classes/sun/misc => java.desktop/share/classes/sun/awt/util}/PerformanceLogger.java (99%) diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java index 2283e2fe8ec..7ef9e111171 100644 --- a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java +++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java @@ -43,8 +43,8 @@ import sun.awt.AWTAccessor; import sun.awt.AppContext; import sun.awt.EmbeddedFrame; import sun.awt.SunToolkit; +import sun.awt.util.PerformanceLogger; import sun.misc.ManagedLocalsThread; -import sun.misc.PerformanceLogger; import sun.security.util.SecurityConstants; /** diff --git a/jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java b/jdk/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java similarity index 99% rename from jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java rename to jdk/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java index 6e8917b4545..b35727f4627 100644 --- a/jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/util/PerformanceLogger.java @@ -25,7 +25,7 @@ -package sun.misc; +package sun.awt.util; import java.util.Vector; import java.io.FileWriter; diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java index c7facaf62b6..3cb7207ad2b 100644 --- a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java +++ b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java @@ -88,9 +88,9 @@ import java.awt.font.FontRenderContext; import sun.java2d.loops.XORComposite; import sun.awt.ConstrainableGraphics; import sun.awt.SunHints; +import sun.awt.util.PerformanceLogger; import java.util.Map; import java.util.Iterator; -import sun.misc.PerformanceLogger; import java.lang.annotation.Native; import java.awt.image.MultiResolutionImage; diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java index 3852193bd4a..7297ef72287 100644 --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java +++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java @@ -52,6 +52,7 @@ import sun.awt.datatransfer.DataTransferer; import sun.font.FontConfigManager; import sun.java2d.SunGraphicsEnvironment; import sun.misc.*; +import sun.awt.util.PerformanceLogger; import sun.awt.util.ThreadGroupUtils; import sun.print.PrintJob2D; import sun.security.action.GetPropertyAction; diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java index 970ab07f843..fed3e231731 100644 --- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java +++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WToolkit.java @@ -67,10 +67,10 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; +import sun.awt.util.PerformanceLogger; import sun.font.FontManager; import sun.font.FontManagerFactory; import sun.font.SunFontManager; -import sun.misc.PerformanceLogger; import sun.util.logging.PlatformLogger; public final class WToolkit extends SunToolkit implements Runnable {