svn commit: r432316 - in /geronimo/xbean/branches/colossus/xbean-naming/src: main/java/org/apache/xbean/naming/context/ test/java/org/apache/xbean/naming/context/

[da...@apache.org]

Author: dain
Date: Thu Aug 17 11:17:04 2006
New Revision: 432316

URL: http://svn.apache.org/viewvc?rev=432316&view=rev
Log:
Renamed GeronimoGlobalContext to WritableContextTest

Added:
    geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java
      - copied, changed from r432313, geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/GeronimoGlobalContext.java
Removed:
    geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/GeronimoGlobalContext.java
Modified:
    geronimo/xbean/branches/colossus/xbean-naming/src/test/java/org/apache/xbean/naming/context/WritableContextTest.java

Copied: geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java (from r432313, geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/GeronimoGlobalContext.java)
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java?p2=geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java&p1=geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/GeronimoGlobalContext.java&r1=432313&r2=432316&rev=432316&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/GeronimoGlobalContext.java (original)
+++ geronimo/xbean/branches/colossus/xbean-naming/src/main/java/org/apache/xbean/naming/context/WritableContext.java Thu Aug 17 11:17:04 2006
@@ -28,30 +28,30 @@
 /**
  * @version $Rev$ $Date$
  */
-public class GeronimoGlobalContext extends AbstractContext {
+public class WritableContext extends AbstractContext {
     protected Map bindings;
 
-    public GeronimoGlobalContext() {
+    public WritableContext() {
         bindings = new HashMap();
     }
 
-    public GeronimoGlobalContext(AbstractContext parent, Hashtable environment, Name contextAtomicName) {
+    public WritableContext(AbstractContext parent, Hashtable environment, Name contextAtomicName) {
         super(parent, environment, contextAtomicName);
         bindings = new HashMap();
     }
 
-    public GeronimoGlobalContext(Hashtable env) {
+    public WritableContext(Hashtable env) {
         super(env);
         bindings = new HashMap();
     }
 
-    public GeronimoGlobalContext(GeronimoGlobalContext clone, Hashtable env) {
+    public WritableContext(WritableContext clone, Hashtable env) {
         super(env);
         bindings = clone.bindings;
     }
 
     protected AbstractContext newSubcontext(Name name) {
-        return new GeronimoGlobalContext(this, this.env, name);
+        return new WritableContext(this, this.env, name);
     }
 
     protected void removeBindings(Name name) throws NamingException {
@@ -75,7 +75,7 @@
                             " An object that is not a context is already bound at element "
                                     + segment + "of name " + name);
                 } else {
-                    bindings = ((GeronimoGlobalContext) terminalContext).bindings;
+                    bindings = ((WritableContext) terminalContext).bindings;
                 }
             }
             segment = name.get(lastIndex);
@@ -113,7 +113,7 @@
                                     + segment
                                     + " refer to an object that is not a context");
                 } else {
-                    bindings = ((GeronimoGlobalContext) terminalContext).bindings;
+                    bindings = ((WritableContext) terminalContext).bindings;
                 }
             }
             segment = name.get(lastIndex);
@@ -155,7 +155,7 @@
                             " An object that is not a context is already bound at element "
                                     + segment + "of name " + name);
                 } else {
-                    bindings = ((GeronimoGlobalContext) terminalContext).bindings;
+                    bindings = ((WritableContext) terminalContext).bindings;
                 }
             }
             segment = name.get(lastIndex);

Modified: geronimo/xbean/branches/colossus/xbean-naming/src/test/java/org/apache/xbean/naming/context/WritableContextTest.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/branches/colossus/xbean-naming/src/test/java/org/apache/xbean/naming/context/WritableContextTest.java?rev=432316&r1=432315&r2=432316&view=diff
==============================================================================
--- geronimo/xbean/branches/colossus/xbean-naming/src/test/java/org/apache/xbean/naming/context/WritableContextTest.java (original)
+++ geronimo/xbean/branches/colossus/xbean-naming/src/test/java/org/apache/xbean/naming/context/WritableContextTest.java Thu Aug 17 11:17:04 2006
@@ -38,7 +38,7 @@
         map.put("a/b/c/d/e/two", new Integer(2));
         map.put("a/b/c/d/e/three", new Integer(3));
 
-        Context context = new GeronimoGlobalContext();
+        Context context = new WritableContext();
         bind(context, map);
 
         assertEq(map, context);
@@ -53,7 +53,7 @@
         map.put("a/b/c/d/e/two", new Integer(2));
         map.put("a/b/c/d/e/three", new Integer(3));
 
-        Context context = new GeronimoGlobalContext();
+        Context context = new WritableContext();
         bind(context, map);
 
         assertEq(map, context);
@@ -76,7 +76,7 @@
         map.put("a/b/c/d/e/two", new Integer(2));
         map.put("a/b/c/d/e/three", new Integer(3));
 
-        Context context = new GeronimoGlobalContext();
+        Context context = new WritableContext();
         bind(context, map);
 
         assertEq(map, context);