diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-03 09:54:02 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-03 12:47:12 -0800 |
| commit | c5871a974aeaed8d90794c44629bde61f516dfaa (patch) | |
| tree | 329bdbaa60aa69d12cdaf5654705ae845027d6e4 /src/detach | |
| parent | 7ec4ba5ea921eafb092b05f580ba7381edcd8427 (diff) | |
| download | scala-c5871a974aeaed8d90794c44629bde61f516dfaa.tar.gz scala-c5871a974aeaed8d90794c44629bde61f516dfaa.tar.bz2 scala-c5871a974aeaed8d90794c44629bde61f516dfaa.zip | |
Mostly eliminated ScalaObject.
Diffstat (limited to 'src/detach')
| -rw-r--r-- | src/detach/plugin/scala/tools/detach/Detach.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/detach/plugin/scala/tools/detach/Detach.scala b/src/detach/plugin/scala/tools/detach/Detach.scala index fee2c5a273..546041844e 100644 --- a/src/detach/plugin/scala/tools/detach/Detach.scala +++ b/src/detach/plugin/scala/tools/detach/Detach.scala @@ -734,7 +734,7 @@ abstract class Detach extends PluginComponent proxyOwner.newClass(clazz.pos, encode(clazz.name.decode + PROXY_SUFFIX)) iface.sourceFile = clazz.sourceFile iface setFlag (ABSTRACT | TRAIT | INTERFACE) // Java interface - val iparents = List(ObjectClass.tpe, RemoteClass.tpe, ScalaObjectClass.tpe) + val iparents = List(ObjectClass.tpe, RemoteClass.tpe) iface setInfo ClassInfoType(iparents, newScope, iface) // methods must throw RemoteException iface addAnnotation remoteAnnotationInfo @@ -744,8 +744,7 @@ abstract class Detach extends PluginComponent iclaz.sourceFile = clazz.sourceFile iclaz setFlag (SYNTHETIC | FINAL) // Variant 1: rebind/unbind - val cparents = List(UnicastRemoteObjectClass.tpe, iface.tpe, - UnreferencedClass.tpe, ScalaObjectClass.tpe) + val cparents = List(UnicastRemoteObjectClass.tpe, iface.tpe, UnreferencedClass.tpe) // Variant 2: un-/exportObject //val cparents = List(ObjectClass.tpe, iface.tpe, // UnreferencedClass.tpe, ScalaObjectClass.tpe) |