From 55109d0d253c7e89660f1b61d17408648c0c53a4 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
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/pos/annotations.scala | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/files/pos/annotations.scala')

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
 }
 
-- 
cgit v1.2.3