- Changed as into asInstanceOf

- Changed is into isInstanceOf

2 files changed, 9 insertions, 9 deletions

diff --git a/sources/scala/xml/Generic.scala b/sources/scala/xml/Generic.scala
index 22355cf226..bf91e6d12c 100644
--- a/sources/scala/xml/Generic.scala
+++ b/sources/scala/xml/Generic.scala
@@ -9,7 +9,7 @@ object Generic {
 
   def load( filename:String ):Labelled = {
     val b = new GenericFactoryAdapter().loadXML( filename );
-    b as Labelled
+    b.asInstanceOf[Labelled]
   };
 
   class GenericFactoryAdapter extends dtd2scala.FactoryAdapter()  {
@@ -21,7 +21,7 @@ object Generic {
         if( !iter.hasNext() )
             Nil
         else
-            (iter.next() as a )::iterToList( iter ) ;
+            (iter.next().asInstanceOf[a])::iterToList( iter ) ;
 
     def   elementContainsText( name:java.lang.String ):boolean = true;
 
@@ -33,12 +33,12 @@ object Generic {
                          children:java.util.Iterator ):scala.Object = {
 
           val el = Labelled( Symbol( elemName), iterToList[ Any ]( children ));
-	  val el_cache = cache.get( el as scala.All ) as scala.Object;
+	  val el_cache = cache.get( el.asInstanceOf[scala.All]).asInstanceOf[scala.Object];
 	  if ( el_cache != null ) {
 	    System.err.println("[using cached elem!]");
 	    el_cache
 	  } else {
-	    cache.put( el as scala.All, el as scala.All );
+	    cache.put( el.asInstanceOf[scala.All], el.asInstanceOf[scala.All] );
 	    el
 	  }
 
diff --git a/sources/scala/xml/ScalaFactoryAdapter.scala b/sources/scala/xml/ScalaFactoryAdapter.scala
index cb38c85860..4652bd9d60 100644
--- a/sources/scala/xml/ScalaFactoryAdapter.scala
+++ b/sources/scala/xml/ScalaFactoryAdapter.scala
@@ -16,7 +16,7 @@ abstract class ScalaFactoryAdapter
         if( !iter.hasNext() )
             Nil
         else
-            (iter.next() as a )::iterToList( iter ) ;
+            (iter.next().asInstanceOf[a])::iterToList( iter ) ;
 
 
     def mapToMap[a,b]( map:java.util.Map ):Map[a,b] = {
@@ -27,8 +27,8 @@ abstract class ScalaFactoryAdapter
          def iterToMap:Unit =
          if( keys.hasNext() ) {
               val key   = keys.next();
-              val value = map.get( key ) as b ;
-              res.put( key as a , value as b );
+              val value = map.get( key ).asInstanceOf[b] ;
+              res.put( key.asInstanceOf[a] , value.asInstanceOf[b] );
               iterToMap
          } else
               () ;
@@ -66,14 +66,14 @@ abstract class ScalaFactoryAdapter
 	  } else { // do hash-consing
 
 	    val h = Element.hashValue( elemName, attribs, _children );
-	    val el_cache = cache.get( h as scala.All ) as scala.Object;
+	    val el_cache = cache.get( h.asInstanceOf[scala.All] ).asInstanceOf[scala.Object];
 	    if ( el_cache != null ) {  // return cached elem
 	      el_cache
 	    } else {
 	      val c = f.get( elemName ); // get constructor
               val el = c( _children );
               el.setAttribs( mapToMap[String,String]( attribs ) );
-	      cache.put( h as scala.All, el as scala.All );
+	      cache.put( h.asInstanceOf[scala.All], el.asInstanceOf[scala.All] );
 	      el
 	    }
 	  }