From c5c02cf4ff257bfb23386048ef9b3129eab2baf2 Mon Sep 17 00:00:00 2001
From: michelou <michelou@epfl.ch>
Date: Thu, 18 Nov 2010 17:46:38 +0000
Subject: removed duplicated error message for bad compil...

removed duplicated error message for bad compiler options made some
cleanups in detach plugin code
---
 src/detach/library/scala/remoting/Channel.scala   | 6 ++----
 src/detach/library/scala/remoting/Debug.scala     | 2 +-
 src/detach/library/scala/remoting/detach.scala    | 2 +-
 src/detach/plugin/scala/tools/detach/Detach.scala | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/detach')

diff --git a/src/detach/library/scala/remoting/Channel.scala b/src/detach/library/scala/remoting/Channel.scala
index 6b1fbcee4e..8e8b79dea1 100644
--- a/src/detach/library/scala/remoting/Channel.scala
+++ b/src/detach/library/scala/remoting/Channel.scala
@@ -74,7 +74,7 @@ class Channel protected (socket: Socket) {
             super.resolveClass(desc)
         }
   }
-/*
+
   // lazy modifier is required!
   private lazy val in =
     try {
@@ -94,7 +94,7 @@ class Channel protected (socket: Socket) {
         error("Output stream undefined: "+e.getMessage+" ("+this+")")
         null
     }
-*/
+
   /** <code>receive&lt;primtype&gt;</code> methods may throw an
    *  <code>IOException</code>.
    */
@@ -117,7 +117,6 @@ class Channel protected (socket: Socket) {
    */
   @throws(classOf[ChannelException])
   def receive[T](implicit expected: reflect.Manifest[T]): T = {
-    val in = new CustomObjectInputStream(socket.getInputStream)
     val found = in.readObject().asInstanceOf[reflect.Manifest[_]]
     info("receive: found="+found+", expected="+expected)
     import scala.reflect.Manifest
@@ -150,7 +149,6 @@ class Channel protected (socket: Socket) {
   /** <code>send</code> method may throw an <code>IOException</code>.
    */
   def send[T](x: T)(implicit m: reflect.Manifest[T]) {
-    val out = new ObjectOutputStream(socket.getOutputStream)
     out writeObject m
     x match {
       case x: Unit    => // nop
diff --git a/src/detach/library/scala/remoting/Debug.scala b/src/detach/library/scala/remoting/Debug.scala
index 6a63b8a25d..7a3f0dd91e 100644
--- a/src/detach/library/scala/remoting/Debug.scala
+++ b/src/detach/library/scala/remoting/Debug.scala
@@ -22,6 +22,6 @@ object Debug extends runtime.remoting.Debug {
 
   def getLocation(obj: AnyRef): String = {
     val s = obj.getClass().getClassLoader().toString()
-    s.substring(s.indexOf('['))
+    s substring s.indexOf('[')
   }
 }
diff --git a/src/detach/library/scala/remoting/detach.scala b/src/detach/library/scala/remoting/detach.scala
index d0fb694af5..5bb53da708 100644
--- a/src/detach/library/scala/remoting/detach.scala
+++ b/src/detach/library/scala/remoting/detach.scala
@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
+**    / __/ __// _ | / /  / _ |    (c) 2002-2010, LAMP/EPFL             **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://www.scala-lang.org/           **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
diff --git a/src/detach/plugin/scala/tools/detach/Detach.scala b/src/detach/plugin/scala/tools/detach/Detach.scala
index f0b0a2a18d..f3116d033c 100644
--- a/src/detach/plugin/scala/tools/detach/Detach.scala
+++ b/src/detach/plugin/scala/tools/detach/Detach.scala
@@ -25,7 +25,7 @@ abstract class Detach extends PluginComponent
     new DetachTransformer(unit)
 
   // set with the `-P:detach:enable` plugin option (see DetachPlugin) */
-  var isEnabled = false
+  protected[detach] var isEnabled = false
 
   private class DetachTransformer(unit: CompilationUnit)
   extends TypingTransformer(unit) {
-- 
cgit v1.2.3