Updated class loading and debugging logs

Author: NatureFreshMeat

src/main/javascript/02_Logger.js

@@ -9,7 +9,8 @@ var Logger = {
 	 */
 	debug : function(msg)
 	{
-		document.write("Debug: " + msg + "<br>");
+		console.log("Debug: " + msg);
+		//document.write("Debug: " + msg + "<br>");
 	}
 
 };

src/main/javascript/03_ClassLoader.js

@@ -12,7 +12,7 @@ var ClassLoader = function(url)
 	this.classes = new Array();
 
 	/**
-	 * Url to load classes from
+	 * Url/function to load classes from
 	 */
 	this.url = url;
 
@@ -21,7 +21,12 @@ var ClassLoader = function(url)
 	 */
 	this.load = function(className, callback)
 	{
-		var classUrl = this.url + className;
+		var classUrl;
+		
+		if (typeof(this.url) == "function")
+			classUrl = this.url(className);
+		else
+			classUrl = this.url + className;
 
 		var bytes = this.classes[className];
 
@@ -34,10 +39,10 @@ var ClassLoader = function(url)
 		else
 		{
 			Logger.debug("Loading from remote: " + classUrl);
-		
+
 			$.getJSON(classUrl, function(data)
 			{
-				Logger.debug("Loaded: " + className);
+				Logger.debug("Loaded: " + className + " size: " + data.bytes.length);
 				//Returns: { name: "", bytes: []}
 				self.classes[data.name] = data.bytes;
 

test/test.html

@@ -6,11 +6,8 @@
 	<script type="text/javascript" src="../target/jsjvm.js"></script>
 	<script type="text/javascript">
 
-	var vm = new jsjvm("classes/");
-	
-	vm.loader.save("ch.ri.jsjvm.JSMain", [1,2,3,4]);
-	
-	vm.start("ch.ri.jsjvm.JSMain", []);
+	var vm = new jsjvm( function(name){ return "classes/" + name + ".json"; } );
+	vm.start("ch.ri.jsjvm.utils.TestClass", []);
 
 	</script>
 </head>