diff options
author | Paul Phillips <paulp@improving.org> | 2011-10-01 05:16:22 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-10-01 05:16:22 +0000 |
commit | 55109d0d253c7e89660f1b61d17408648c0c53a4 (patch) | |
tree | db44f381515b79a575562cb2eacaaa8b7b590b7d /test | |
parent | ff5619e1f0d1653642e93e2c6a051c88231c95fb (diff) | |
download | scala-55109d0d253c7e89660f1b61d17408648c0c53a4.tar.gz scala-55109d0d253c7e89660f1b61d17408648c0c53a4.tar.bz2 scala-55109d0d253c7e89660f1b61d17408648c0c53a4.zip |
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.)
Diffstat (limited to 'test')
-rw-r--r-- | test/files/jvm/annotations.scala | 12 | ||||
-rw-r--r-- | test/files/pos/annotations.scala | 12 | ||||
-rw-r--r-- | test/files/pos/spec-annotations.scala | 2 | ||||
-rw-r--r-- | test/files/pos/t1070.scala | 2 | ||||
-rw-r--r-- | test/files/pos/t1782/Test_1.scala | 2 | ||||
-rw-r--r-- | test/files/presentation/akka/src/akka/actor/Actor.scala | 2 | ||||
-rw-r--r-- | test/files/presentation/akka/src/akka/actor/ActorRef.scala | 2 | ||||
-rw-r--r-- | test/files/presentation/akka/src/akka/remoteinterface/RemoteInterface.scala | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/test/files/jvm/annotations.scala b/test/files/jvm/annotations.scala index 740a74226e..a0b087a8db 100644 --- a/test/files/jvm/annotations.scala +++ b/test/files/jvm/annotations.scala @@ -94,8 +94,8 @@ object Test4 { } class Foo8(@SourceAnnotation("constructor val") val n: Int) {} class Foo9 { - import scala.annotation.target._ - import scala.reflect.BeanProperty + import scala.beans.meta._ + import scala.beans.BeanProperty @(SourceAnnotation @getter)("http://apple.com") val x = 0 @BeanProperty @(SourceAnnotation @beanSetter)("http://uppla.com") var y = 0 @@ -103,8 +103,8 @@ object Test4 { @BeanProperty @myAnn("http://eppli.com") var z = 0 } class Foo10(@SourceAnnotation("on param 1") val name: String) - class Foo11(@(SourceAnnotation @scala.annotation.target.field)("on param 2") val name: String) - class Foo12(@(SourceAnnotation @scala.annotation.target.setter)("on param 3") var name: String) + class Foo11(@(SourceAnnotation @scala.beans.meta.field)("on param 2") val name: String) + class Foo12(@(SourceAnnotation @scala.beans.meta.setter)("on param 3") var name: String) def run { import java.lang.annotation.Annotation import java.lang.reflect.AnnotatedElement @@ -157,7 +157,7 @@ object Test4 { } object Test5 { - import scala.reflect.BeanProperty + import scala.beans.BeanProperty import java.lang.Integer class Count { @@ -182,7 +182,7 @@ object Test5 { } object Test6 { - import scala.reflect.BeanProperty + import scala.beans.BeanProperty import scala.reflect.BooleanBeanProperty class C(@BeanProperty var text: String) class D(@BooleanBeanProperty var prop: Boolean) { diff --git a/test/files/pos/annotations.scala b/test/files/pos/annotations.scala index 0819379d86..1cae262bb0 100644 --- a/test/files/pos/annotations.scala +++ b/test/files/pos/annotations.scala @@ -25,7 +25,7 @@ object Test { //bug #1214 val y = new (Integer @ann(0))(2) - import scala.reflect.BeanProperty + import scala.beans.BeanProperty // bug #637 trait S { def getField(): Int } @@ -44,7 +44,7 @@ object Test { // test forward references to getters / setters class BeanPropertyTests { - @scala.reflect.BeanProperty lazy val lv1 = 0 + @scala.beans.BeanProperty lazy val lv1 = 0 def foo() { val bp1 = new BeanPropertyTests1 @@ -58,13 +58,13 @@ class BeanPropertyTests { bp1.setV2(100) } - @scala.reflect.BeanProperty var v1 = 0 + @scala.beans.BeanProperty var v1 = 0 } class BeanPropertyTests1 { - @scala.reflect.BeanProperty lazy val lv2 = "0" - @scala.reflect.BeanProperty var v2 = 0 + @scala.beans.BeanProperty lazy val lv2 = "0" + @scala.beans.BeanProperty var v2 = 0 } // test mixin of getters / setters, and implementing abstract @@ -78,7 +78,7 @@ class C extends T with BeanF { } trait T { - @scala.reflect.BeanProperty var f = "nei" + @scala.beans.BeanProperty var f = "nei" @scala.reflect.BooleanBeanProperty var g = false } diff --git a/test/files/pos/spec-annotations.scala b/test/files/pos/spec-annotations.scala index 215f00da50..35cab6de09 100644 --- a/test/files/pos/spec-annotations.scala +++ b/test/files/pos/spec-annotations.scala @@ -23,7 +23,7 @@ object Test { //bug #1214 val y = new (Integer @ann(0))(2) - import scala.reflect.BeanProperty + import scala.beans.BeanProperty // bug #637 trait S { def getField(): Int } diff --git a/test/files/pos/t1070.scala b/test/files/pos/t1070.scala index 95b77184d7..1622043a85 100644 --- a/test/files/pos/t1070.scala +++ b/test/files/pos/t1070.scala @@ -1,4 +1,4 @@ -import scala.reflect.BeanProperty; +import scala.beans.BeanProperty; trait beanpropertytrait { @BeanProperty var myVariable: Long = -1l; } diff --git a/test/files/pos/t1782/Test_1.scala b/test/files/pos/t1782/Test_1.scala index e61ef8eaf5..6467a74c29 100644 --- a/test/files/pos/t1782/Test_1.scala +++ b/test/files/pos/t1782/Test_1.scala @@ -10,7 +10,7 @@ class Provider @Ann(Days.Friday) def someMethod() = () // #2103 - @scala.reflect.BeanProperty + @scala.beans.BeanProperty @Ann(value = Days.Sunday) val t2103 = "test" } 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 |