From fa3afc7c7444b3f6ba78ae41a0697746d4ebba2f Mon Sep 17 00:00:00 2001 From: nathan Date: Sat, 15 Jul 2017 18:25:10 +0200 Subject: [PATCH] Moved Classloader utility methods into their own class. --- .../systemTray/util/SystemTrayFixes.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dorkbox/systemTray/util/SystemTrayFixes.java b/src/dorkbox/systemTray/util/SystemTrayFixes.java index 7628af0..26566bc 100644 --- a/src/dorkbox/systemTray/util/SystemTrayFixes.java +++ b/src/dorkbox/systemTray/util/SystemTrayFixes.java @@ -22,7 +22,7 @@ import java.awt.AWTException; import java.util.Locale; import dorkbox.systemTray.SystemTray; -import dorkbox.util.BootStrapClassLoader; +import dorkbox.util.ClassLoaderUtil; import dorkbox.util.OS; import javassist.ClassPool; import javassist.CtBehavior; @@ -231,8 +231,8 @@ class SystemTrayFixes { } // whoosh, past the classloader and directly into memory. - BootStrapClassLoader.defineClass(trayBytes); - BootStrapClassLoader.defineClass(trayIconBytes); + ClassLoaderUtil.Bootstrap.defineClass(trayBytes); + ClassLoaderUtil.Bootstrap.defineClass(trayIconBytes); if (SystemTray.DEBUG) { logger.debug("Successfully changed tray icon size to: {}", trayIconSize); @@ -412,7 +412,7 @@ class SystemTrayFixes { mouseEventBytes = trayClass.toBytecode(); // whoosh, past the classloader and directly into memory. - BootStrapClassLoader.defineClass(mouseEventBytes); + ClassLoaderUtil.Bootstrap.defineClass(mouseEventBytes); if (SystemTray.DEBUG) { logger.debug("Successfully changed mouse trigger for MacOSX"); @@ -691,11 +691,11 @@ class SystemTrayFixes { } // whoosh, past the classloader and directly into memory. - BootStrapClassLoader.defineClass(runnableBytes); - BootStrapClassLoader.defineClass(eFrameBytes); - BootStrapClassLoader.defineClass(iconCanvasBytes); - BootStrapClassLoader.defineClass(trayIconBytes); - BootStrapClassLoader.defineClass(trayPeerBytes); + ClassLoaderUtil.Bootstrap.defineClass(runnableBytes); + ClassLoaderUtil.Bootstrap.defineClass(eFrameBytes); + ClassLoaderUtil.Bootstrap.defineClass(iconCanvasBytes); + ClassLoaderUtil.Bootstrap.defineClass(trayIconBytes); + ClassLoaderUtil.Bootstrap.defineClass(trayPeerBytes); if (SystemTray.DEBUG) { logger.debug("Successfully changed tray icon background color");