moved test, added classloading url

thomasrudin · thomasrudin · commit 6111074ff110 · 2012-05-09T09:57:53.000+02:00
diff --git a/src/main/javascript/01_jsjvm.js b/src/main/javascript/01_jsjvm.js
@@ -5,5 +5,5 @@
 */
 
 
-var jsjvm = function(mainClass){this.init(mainClass)};
+var jsjvm = function(mainClass, url){this.init(mainClass, url)};
 
diff --git a/src/main/javascript/02_Logger.js b/src/main/javascript/02_Logger.js
@@ -5,11 +5,11 @@
 var Logger ={
 	
 	/**
-	 * Log a message
+	 * Log a debug message
 	 */
-	log : function(msg)
+	debug : function(msg)
 	{
-		alert(msg); //TODO
+		document.write("Debug: " + msg);
 	}
 
 };
diff --git a/src/main/javascript/03_ClassLoader.js b/src/main/javascript/03_ClassLoader.js
@@ -8,13 +8,18 @@ var ClassLoader ={
 	 * Array of classes [{name: "java.lang.String", bytes: [0,1,2,3]},{...} ]
 	 */
 	classes : new Array(),
+	
+	/**
+	 * Url to load classes from
+	 */
+	url : "/classloaderUrlNotDefined",
 
 	/**
 	 * Load class as json representation via jquery
 	 */
-	load : function(className)
+	load : function(className, callback)
 	{
-		
+		Logger.debug("Loading: " + className + " from " + ClassLoader.url);
 	}
 
 };
diff --git a/src/main/javascript/90_Init.js b/src/main/javascript/90_Init.js
@@ -2,7 +2,9 @@
 * @init
 */
 
-jsjvm.prototype.init = function(mainClass)
+jsjvm.prototype.init = function(mainClass, classLoadingUrl)
{
-	alert(mainClass);
+	ClassLoader.url = classLoadingUrl;
+	ClassLoader.load(mainClass, function(){});
 }
+
diff --git a/test.html b/test.html
diff --git a/test/jquery-1.7.2.min.js b/test/jquery-1.7.2.min.js
diff --git a/test/test.html b/test/test.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<title>JSJVM Testpage</title>
+	<script type="text/javascript" src="jquery-1.7.2.min.js"></script>
+	<script type="text/javascript" src="../target/jsjvm.js"></script>
+	<script type="text/javascript">
+	
+	var vm = new jsjvm("ch.ri.jsjvm.JSMain", "/classes");
+	
+	</script>
+</head>
+
+<body>
+
+</body>
+
+</html>

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`
`8`		`-varjsjvm=function(mainClass){this.init(mainClass);};`
	`8`	`+varjsjvm=function(mainClass,url){this.init(mainClass,url);};`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@`
`5`	`5`	`varLogger={`
`6`	`6`
`7`	`7`	`/**`
`8`		`- * Log a message`
	`8`	`+ * Log a debug message`
`9`	`9`	`*/`
`10`		`-log : function(msg)`
	`10`	`+debug : function(msg)`
`11`	`11`	`{`
`12`		`-alert(msg);//TODO`
	`12`	`+document.write("Debug: "+msg);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`};`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`	`* @init`
`3`	`3`	`*/`
`4`	`4`
`5`		`-jsjvm.prototype.init=function(mainClass)`
	`5`	`+jsjvm.prototype.init=function(mainClass,classLoadingUrl)`
`6`	`6`	`{`
`7`		`-alert(mainClass);`
	`7`	`+ClassLoader.url=classLoadingUrl;`
	`8`	`+ClassLoader.load(mainClass,function(){});`
`8`	`9`	`}`
	`10`	`+`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,18 @@ @@
 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 +<html>
 +<head>
 +<title>JSJVM Testpage</title>
 +<scripttype="text/javascript" src="jquery-1.7.2.min.js"></script>
 +<scripttype="text/javascript" src="../target/jsjvm.js"></script>
 +<scripttype="text/javascript">
++
 +varvm=newjsjvm("ch.ri.jsjvm.JSMain","/classes");
++
 +</script>
 +</head>
++
 +<body>
++
 +</body>
++
 +</html>