Updates to JDK1.

Author: Ian Hopkins

src/main/c/classpath/java-lang/Object.c

@@ -1,7 +1,16 @@
 #include "Object.h"
 
+// public Class java.lang.Object.getClass()
 JNIEXPORT jobject JNICALL Java_alt_java_lang_Object2_getClass2
-  (JNIEnv *, jobject) {
+  (JNIEnv *env, jobject thisObj) {
 
+	// Ask JNI what class this object is
+	return (*env)->GetObjectClass(env, thisObj);
+}
 
+JNIEXPORT jint JNICALL Java_alt_java_lang_Object2_hashCode
+  (JNIEnv *env, jobject thisObj) {
+	// Cast the object pointer to an int
+	// This only works if the garbage collector never moves objects (it does though)
+	return (jint) thisObj;
 }

src/main/c/classpath/java-lang/System.c

@@ -1,13 +1,95 @@
 #include "System.h"
+#include <sys/time.h>
 
+// public static long currentTimeMillis();
 JNIEXPORT jlong JNICALL Java_alt_java_lang_System_currentTimeMillis
 		(JNIEnv *env, jclass classObj) {
 
+	// Get a timeval struct of time since EPOCH
+	struct timeval currentTime;
+	gettimeofday(&timeval, NULL);
 
+	// Convert the timeval struct to a jlong milliseconds
+	jlong rv = ((jlong) currentTime.tv_sec) * 1000;
+	rv += (jlong) (currentTime.tv_usec / 1000);
+	return rv;
 }
 
+// public static void arraycopy(Object src, int srcOffset, Object dst, int dstOffset, int length);
 JNIEXPORT void JNICALL Java_alt_java_lang_System_arraycopy
-  (JNIEnv *, jclass, jobject, jint, jobject, jint, jint) {
+  (JNIEnv *env, jclass systemClass, jobject src, jint srcOffset, jobject dst, jint dstOffset, jint length) {
 
 
+	if (dst == null) {
+		jclass toThrowClass = (*env)->FindClass(env, "java.lang.NullPointerException");
+		(*env)->ThrowNew(env, toThrowClass, "dst cannot be null");
+		return;
+	}
+	if (src == null) {
+		jclass toThrowClass = (*env)->FindClass(env, "java.lang.NullPointerException");
+		(*env)->ThrowNew(env, toThrowClass, "src cannot be null");
+		return;
+	}
+
+	// Figure out the classes of each array
+	jclass srcClass = (*env)->GetObjectClass(env, src);
+	jclass dstClass = (*env)->GetObjectClass(env, dst);
+
+	if (srcClass)
+
+	jsize srcLength = (*env)->GetArrayLength(env, src);
+	jsize dstLength = (*env)->GetArrayLength(env, dst);
+
+	if (srcOffset < 0) {
+		jclass toThrowClass = (*env)->FindClass(env, "java.lang.IndexOutOfBoundsException");
+		(*env)->ThrowNew(env, toThrowClass, "srcOffset cannot be negative");
+		return;
+	}
+	if (dstOffset < 0) {
+		jclass toThrowClass = (*env)->FindClass(env, "java.lang.IndexOutOfBoundsException");
+		(*env)->ThrowNew(env, toThrowClass, "dstOffset cannot be negative");
+		return;
+	}
+	if (length < 0) {
+		jclass toThrowClass = (*env)->FindClass(env, "java.lang.IndexOutOfBoundsException");
+		(*env)->ThrowNew(env, toThrowClass, "length cannot be negative");
+		return;
+	}
+	if (srcOffset+length > srcLength) {
+		jclass toThrowClass = (*env)->FindClass(env, "java.lang.IndexOutOfBoundsException");
+		(*env)->ThrowNew(env, toThrowClass, "srcOffset+length exceeds src.length");
+		return;
+	}
+	if (dstOffset+length > dstLength) {
+		jclass toThrowClass = (*env)->FindClass(env, "java.lang.IndexOutOfBoundsException");
+		(*env)->ThrowNew(env, toThrowClass, "dstOffset+length exceeds dst.length");
+		return;
+	}
+
+	int elementWidth = 4;
+	/*
+	switch (type) {
+	case "jlong":
+	case "jdouble":
+		elementWidth = sizeof(jlong);
+		break;
+	case "jchar":
+	case "jshort":
+		elementWidth = sizeof(jchar);
+		break
+	case "jbyte":
+	case "jboolean":
+		elementWidth = sizeof(jbyte);
+		break;
+	case "jint":
+	case "jfloat":
+	case "jobject":
+	default:
+		elementWidth = sizeof(jint);
+		break;
+	}
+	*/
+
+	memcpy(src, dst, length * elementWidth);
+
 }

src/main/java/alt/java/io/File.java

@@ -11,19 +11,16 @@ public class File {
 	private String name;
 
 	public File(String name) throws NullPointerException {
-		init(null, name);
+		this((File) null, name);
 	}
 	public File(String dirname, String name) throws NullPointerException {
-		init(dirname, name);
+		this(new File(dirname), name);
 	}
 	public File(File dir, String name) throws NullPointerException {
-		init(dir.getName(), name);
-	}
-	
-	private void init(String dirname, String name) throws NullPointerException {
 		if (name == null) {
 			throw new NullPointerException("name cannot be null");
 		}
+		this.parent = dir;
 		this.name = name;
 	}
 
@@ -92,27 +89,29 @@ private void checkDelete() throws SecurityException {
 
 	public boolean exists() throws SecurityException {
 		checkRead();
-		
-		return false;
+		return exists0();
 	}
+	private native boolean exists0();
 
 	public boolean canRead() throws SecurityException {
 		checkRead();
-		
-		return false;
+		return canRead0();
 	}
+	private native boolean canRead0();
 
 	public boolean isFile() throws SecurityException {
 		checkRead();
 
-		return false;
+		return isFile0();
 	}
+	private native boolean isFile0();
 
 	public boolean isDirectory() throws SecurityException {
 		checkRead();
 
-		return false;
+		return isDirectory0();
 	}
+	private native boolean isDirectory0();
 
 	public long lastModified() throws SecurityException {
 		checkRead();
@@ -134,8 +133,15 @@ public boolean mkdir() throws SecurityException {
 
 	public boolean mkdirs() throws SecurityException {
 		checkWrite();
-		
-		return false;
+	
+		String parent = getParent();
+		if (parent != null) {
+			File parentFile = new File(parent);
+			if (!parentFile.mkdirs()) {
+				return false;
+			}
+		}
+		return mkdir();
 	}
 
 	public String[] list() throws SecurityException {
@@ -146,9 +152,27 @@ public String[] list() throws SecurityException {
 	}
 
 	public String[] list(FilenameFilter filter) {
-		checkRead();
+		String[] list = list();
 
-		return new String[] {};
+		// How many files match?
+		int matches = 0;
+		for(int i = 0; i < list.length; i++) {
+			if (filter.accept(this, list[i])) {
+				matches++;
+			}
+		}
+		
+		// Build the array of matches
+		String[] rv = new String[matches];
+		int pos = 0;
+		for(int i = 0; i < list.length; i++) {
+			if (filter.accept(this, list[i])) {
+				rv[pos] = list[i];
+				pos++;
+			}
+		}
+		
+		return rv;
 	}
 
 	public boolean renameTo(File dest) throws SecurityException {