From 22eaf0622e66dc7630e1c03124fdd0df47da2a0b Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 2 Apr 2016 03:03:11 +0000 Subject: [PATCH] some simple cleanups for the script_class_loader.java --- .../game/script/script_class_loader.java | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/script_class_loader.java b/sku.0/sys.server/compiled/game/script/script_class_loader.java index 358fb6dbd..70b734e88 100644 --- a/sku.0/sys.server/compiled/game/script/script_class_loader.java +++ b/sku.0/sys.server/compiled/game/script/script_class_loader.java @@ -54,13 +54,9 @@ public class script_class_loader extends ClassLoader try { myObject = myClass.newInstance(); - if (myObject != null) + if (myObject == null) { -// System.out.println("Created new script_class_loader for class " + name + " (" + myClass.getName() + ")"); - } - else - { - System.out.println("WARNING: Java Error creating object for class " + name); + System.err.println("WARNING: Java Error creating object for class " + name); } } catch ( InstantiationException err ) @@ -88,8 +84,6 @@ public class script_class_loader extends ClassLoader if (test != null) return (script_class_loader)test; -// System.out.println("script_class_loader getClassLoader creating new loader for class " + name); - if (name.indexOf("script.") != 0) { ClassNotFoundException err = new ClassNotFoundException("Class " + name + " does not start with 'script.'"); @@ -147,11 +141,10 @@ public class script_class_loader extends ClassLoader String pathedName = name.replace('.', java.io.File.separatorChar); String fullname = script_entry.getScriptPath() + pathedName + ".class"; File file = new File(fullname); - if (file != null) - { - if (file.exists()) - result = true; + if (file.isFile()) { + result = true; } + } return result; } // unloadClass() @@ -209,8 +202,6 @@ public class script_class_loader extends ClassLoader */ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { -// System.out.println("script_class_loader loadClass " + name); - // filter out classes that will be loaded by the default loader int nameLength = name.length(); if ((nameLength > 5 && name.substring(0, 5).compareTo("java.") == 0) || @@ -218,14 +209,9 @@ public class script_class_loader extends ClassLoader (nameLength > 10 && name.substring(0, 10).compareTo("intuitive.") == 0) || defaultLoad.contains(name)) { -// System.out.println("****script_class_loader calling default loader**** class = " + name); Class cls = super.loadClass(name, resolve); if (myClass == null) myClass = cls; - if (name.equals("java.lang.Throwable")) - { - - } return cls; } @@ -262,13 +248,12 @@ public class script_class_loader extends ClassLoader */ protected Class findClass(String name) throws ClassNotFoundException { -// System.out.println("script_class_loader findClass " + name); if (myClass == null) { try { byte data[] = loadClassData(name); - myClass = defineClass(name, data, 0, data.length); + myClass = defineClass(name, data, 0, data.length); // we need to keep track of all the superclasses of this class, in case one of them is reloaded for (Class superClass = myClass.getSuperclass(); superClass != null; superClass = superClass.getSuperclass()) @@ -295,14 +280,13 @@ public class script_class_loader extends ClassLoader */ private byte[] loadClassData(String name) throws ClassNotFoundException { -// System.out.println("script_class_loader loadClassData enter: " + name); - byte[] data = null; // if the script name has '.' in it, convert them to '\' String pathedName = name.replace('.', java.io.File.separatorChar); String fullname = script_entry.getScriptPath() + pathedName + ".class"; - System.out.println("script_class_loader loadClassData " + fullname); + System.out.println("loadClassData " + fullname); + try { RandomAccessFile file = new RandomAccessFile(fullname, "r");