(no commit message)

[utils] / system / general / src / main / java / org / wamblee / system / core / DefaultScope.java

diff --git a/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java b/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
index 8b0c88efe0e4b746a6d92dd5e9a49d1fe1446ddc..5a09f942cb3c591779fb3bb18e10e61b2e2794c7 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
+++ b/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
@@ -17,6 +17,7 @@ package org.wamblee.system.core;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -42,9 +43,9 @@ public class DefaultScope implements Scope {
                        List<Scope> aParent) {
                _parents = new ArrayList<Scope>(aParent);
                _count = 0;
-               _properties = new TreeMap<String, Object>();
-               _runtimes = new TreeMap<String, Object>();
-               _provided = new TreeMap<String, ProvidedInterfaceImplementation>();
+               _properties = new HashMap<String, Object>();
+               _runtimes = new HashMap<String, Object>();
+               _provided = new HashMap<String, ProvidedInterfaceImplementation>();
                _externallyProvided = aExternallyProvided;
        }
 
@@ -65,12 +66,17 @@ public class DefaultScope implements Scope {
 
        @Override
        public void addRuntime(Component aComponent, Object aRuntime) {
-               _runtimes.put(aComponent.getQualifiedName(), aRuntime);
+               _runtimes.put(aComponent.getName(), aRuntime);
        }
 
        @Override
        public Object getRuntime(Component aComponent) {
-               return _runtimes.get(aComponent.getQualifiedName());
+               return _runtimes.get(aComponent.getName());
+       }
+       
+       @Override
+       public Object getRuntime(String aName) {
+           return _runtimes.get(aName);
        }
 
        @Override
@@ -83,7 +89,7 @@ public class DefaultScope implements Scope {
        }
 
        @Override
-       public <T> T retrieveInterfaceImplementation(ProvidedInterface aInterface,
+       public <T> T getInterfaceImplementation(ProvidedInterface aInterface,
                        Class<T> aType) {
                if ( aInterface == null ) { 
                        return null; 
@@ -96,7 +102,7 @@ public class DefaultScope implements Scope {
                ProvidedInterfaceImplementation provided = _provided.get(id);
                if (provided == null) {
                        for (Scope parent : _parents) {
-                               T impl = parent.retrieveInterfaceImplementation(aInterface, aType);
+                               T impl = parent.getInterfaceImplementation(aInterface, aType);
                                if ( impl != null ) { 
                                        return impl; 
                                }