From 49cffb85b2c6b36796a04c7eb73cadd006ff7b81 Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 12 May 2006 17:54:07 +0000
Subject: [PATCH] More type safety goodness. It all compiles with no warnings
 now. Yay!

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1845 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/java/com/samskivert/jdbc/jora/Table.java        | 7 ++++---
 src/java/com/samskivert/util/SortableArrayList.java | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java/com/samskivert/jdbc/jora/Table.java b/src/java/com/samskivert/jdbc/jora/Table.java
index 4d737b42..59dce85e 100644
--- a/src/java/com/samskivert/jdbc/jora/Table.java
+++ b/src/java/com/samskivert/jdbc/jora/Table.java
@@ -20,6 +20,7 @@
 
 package com.samskivert.jdbc.jora;
 
+import java.io.Serializable;
 import java.util.*;
 import java.sql.*;
 import java.lang.reflect.*;
@@ -505,7 +506,7 @@ public class Table<T>
 	    if ((f[i].getModifiers()&(Modifier.TRANSIENT|Modifier.STATIC))==0)
 	    {
 		String name = f[i].getName();
-		Class fieldClass = f[i].getType();
+		Class<?> fieldClass = f[i].getType();
 		String fullName = prefix + convertName(name);
 		FieldDescriptor fd = new FieldDescriptor(f[i], fullName);
 		int type;
@@ -891,7 +892,7 @@ public class Table<T>
     protected Constructor<T> constructor;
     protected static Method setBypass;
 
-    protected static Class serializableClass;
+    protected static Class<Serializable> serializableClass;
     protected static final Object[] bypassFlag = { new Boolean(true) };
     protected static final Object[] constructorArgs = {};
 
@@ -900,7 +901,7 @@ public class Table<T>
 
     static {
         try {
-	    serializableClass = Class.forName("java.io.Serializable");
+	    serializableClass = Serializable.class;
 	    Class c = Class.forName("java.lang.reflect.AccessibleObject");
 	    Class[] param = { Boolean.TYPE };
 	    setBypass = c.getMethod("setAccessible", param);
diff --git a/src/java/com/samskivert/util/SortableArrayList.java b/src/java/com/samskivert/util/SortableArrayList.java
index b427abe8..0bfc3f00 100644
--- a/src/java/com/samskivert/util/SortableArrayList.java
+++ b/src/java/com/samskivert/util/SortableArrayList.java
@@ -54,6 +54,7 @@ public class SortableArrayList<T> extends BaseArrayList<T>
      *
      * @return the index at which the element was inserted.
      */
+    @SuppressWarnings("unchecked")
     public int insertSorted (T value, Comparator<T> comp)
     {
         int ipos = binarySearch(value, comp);