From 55109d0d253c7e89660f1b61d17408648c0c53a4 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sat, 1 Oct 2011 05:16:22 +0000 Subject: Shuffling classes around. Old Man Reflection is coming home and he's not going to like finding out a bunch of beans have moved into his reflecting room. We had better evict those guys before he blows his stack. scala.reflect.*Bean* --> scala.beans.* scala.beans, that's kind of a fancy package name for some beans. I figure it's time to start fishing or cutting bait on this kind of thing. I don't even know what beans are, but if we're going to have them in the mainline, the least surprising place to find them is scala.beans. If we don't want to put them in scala.beans for whatever reason, then I say they don't belong in trunk at all. Bonus round: scala.annotation.target --> scala.beans.meta I don't know if there is any more unfortunate name for a package possible than "target". Maybe ".svn" or ".git" if you could have dots in package names. Package CVS wouldn't hit too hard these days. Package lib_managed? I'll try to come up with something. In any case this golden opportunity could not be squandered. There is a new starr included, because GenJVM contains all kinds of shooting-from-the-hip Bean-related name hardcoding. (Yes, still. I ran out of stones. So a few birds escape with their lives... this time.) --- test/files/presentation/akka/src/akka/actor/Actor.scala | 2 +- test/files/presentation/akka/src/akka/actor/ActorRef.scala | 2 +- .../presentation/akka/src/akka/remoteinterface/RemoteInterface.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/files/presentation/akka') diff --git a/test/files/presentation/akka/src/akka/actor/Actor.scala b/test/files/presentation/akka/src/akka/actor/Actor.scala index 85026e8301..b955c4c38b 100644 --- a/test/files/presentation/akka/src/akka/actor/Actor.scala +++ b/test/files/presentation/akka/src/akka/actor/Actor.scala @@ -9,7 +9,7 @@ import akka.util.Helpers.{ narrow, narrowSilently } import akka.util.ListenerManagement import akka.AkkaException -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import akka.util.{ ReflectiveAccess, Duration } import akka.remoteinterface.RemoteSupport import akka.japi.{ Creator, Procedure } diff --git a/test/files/presentation/akka/src/akka/actor/ActorRef.scala b/test/files/presentation/akka/src/akka/actor/ActorRef.scala index 4ce14512b8..07fa358744 100644 --- a/test/files/presentation/akka/src/akka/actor/ActorRef.scala +++ b/test/files/presentation/akka/src/akka/actor/ActorRef.scala @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.{ ScheduledFuture, ConcurrentHashMap, TimeUnit } import java.util.{ Map => JMap } -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import scala.collection.immutable.Stack import scala.annotation.tailrec diff --git a/test/files/presentation/akka/src/akka/remoteinterface/RemoteInterface.scala b/test/files/presentation/akka/src/akka/remoteinterface/RemoteInterface.scala index 6366a4158c..0c5da82294 100644 --- a/test/files/presentation/akka/src/akka/remoteinterface/RemoteInterface.scala +++ b/test/files/presentation/akka/src/akka/remoteinterface/RemoteInterface.scala @@ -10,7 +10,7 @@ import akka.util._ import akka.dispatch.CompletableFuture import akka.AkkaException -import scala.reflect.BeanProperty +import scala.beans.BeanProperty import java.net.InetSocketAddress import java.util.concurrent.ConcurrentHashMap -- cgit v1.2.3