Refactored portability support

5 files changed, 7 insertions, 5 deletions

diff --git a/src/dbc/scala/dbc/datatype/Unknown.scala b/src/dbc/scala/dbc/datatype/Unknown.scala
index 4ab1db59f8..66da0b6a95 100644
--- a/src/dbc/scala/dbc/datatype/Unknown.scala
+++ b/src/dbc/scala/dbc/datatype/Unknown.scala
@@ -24,7 +24,7 @@ class Unknown extends DataType {
 
   def isSubtypeOf(datatype: DataType) = true;
 
-  type NativeType = Object;
+  type NativeType = AnyRef;
   val nativeTypeId = DataType.OBJECT;
 
   /** A SQL-99 compliant string representation of the type. */
diff --git a/src/dbc/scala/dbc/result/Relation.scala b/src/dbc/scala/dbc/result/Relation.scala
index aaefdf095c..5ffc387a87 100644
--- a/src/dbc/scala/dbc/result/Relation.scala
+++ b/src/dbc/scala/dbc/result/Relation.scala
@@ -14,7 +14,7 @@ package scala.dbc.result;
 
 /** An ISO-9075:2003 (SQL) table. This is equivalent to a relation in the
  * relational model. */
-abstract class Relation extends Object with Iterable[Tuple] {
+abstract class Relation extends AnyRef with Iterable[Tuple] {
 
   /** The statement that generated this relation. */
   def statement: scala.dbc.statement.Relation;
diff --git a/src/dbc/scala/dbc/value/Factory.scala b/src/dbc/scala/dbc/value/Factory.scala
index b0d8c22570..f3a479fefc 100644
--- a/src/dbc/scala/dbc/value/Factory.scala
+++ b/src/dbc/scala/dbc/value/Factory.scala
@@ -22,7 +22,7 @@ object Factory {
       case DataType.OBJECT =>
         new value.Unknown {
           val dataType = expectedDataType.asInstanceOf[datatype.Unknown];
-          val nativeValue: Object = result.getObject(index);
+          val nativeValue: AnyRef = result.getObject(index);
         }
       case DataType.STRING => {
         expectedDataType match {
diff --git a/src/dbc/scala/dbc/value/Unknown.scala b/src/dbc/scala/dbc/value/Unknown.scala
index 6fe4773e94..8d6874da20 100644
--- a/src/dbc/scala/dbc/value/Unknown.scala
+++ b/src/dbc/scala/dbc/value/Unknown.scala
@@ -22,6 +22,6 @@ abstract class Unknown extends Value {
 
 object UnknownType {
 
-  def view (obj:value.Unknown): Object = obj.nativeValue;
+  def view (obj:value.Unknown): AnyRef = obj.nativeValue;
 
 }
diff --git a/src/dbc/scala/dbc/vendor/PostgreSQL.scala b/src/dbc/scala/dbc/vendor/PostgreSQL.scala
index 41886aea58..75c5064a71 100644
--- a/src/dbc/scala/dbc/vendor/PostgreSQL.scala
+++ b/src/dbc/scala/dbc/vendor/PostgreSQL.scala
@@ -12,6 +12,8 @@
 package scala.dbc.vendor;
 
 
+import compat.Platform
+
 abstract class PostgreSQL extends Vendor {
 
   def uri:java.net.URI;
@@ -20,7 +22,7 @@ abstract class PostgreSQL extends Vendor {
 
   val retainedConnections = 5;
 
-  val nativeDriverClass = Class.forName("org.postgresql.Driver");
+  val nativeDriverClass = Platform.getClassForName("org.postgresql.Driver");
 
   val urlProtocolString = "jdbc:postgresql:"