swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-07-13 22:01:04 -04:00
Code Issues Projects Releases Wiki Activity

some simple cleanups for the script_class_loader.java

Browse Source
This commit is contained in:
DarthArgus
2016-04-02 03:03:11 +00:00
parent 3dd02392a3
commit b74d58722c
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/script_class_loader.java
+8 -24
View File
@@ -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");