X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FDefaultScope.java;h=3e15ea9c8f5a6eec5a9695545d12fdd1c172c6b4;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=50c6cc3b2ad6ebd682b0f57336963e019b34c1be;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils

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 50c6cc3b..3e15ea9c 100644
--- a/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
+++ b/system/general/src/main/java/org/wamblee/system/core/DefaultScope.java
@@ -24,11 +24,11 @@ import java.util.Map;
 
 public class DefaultScope implements Scope {
 
-	private List<Scope> _parents;
-	private Map<String, Object> _properties;
-	private Map<String, Object> _runtimes;
-	private Map<ProvidedInterface, ProvidedInterfaceImplementation> _provided;
-	private List<ProvidedInterface> _externallyProvided;
+	private List<Scope> parents;
+	private Map<String, Object> properties;
+	private Map<String, Object> runtimes;
+	private Map<ProvidedInterface, ProvidedInterfaceImplementation> provided;
+	private List<ProvidedInterface> externallyProvided;
 	
 	public DefaultScope(List<ProvidedInterface>aExternallyProvided) { 
 	    this(aExternallyProvided.toArray(new ProvidedInterface[0]));
@@ -44,48 +44,48 @@ public class DefaultScope implements Scope {
 
 	public DefaultScope(ProvidedInterface[] aExternallyProvided,
 			List<Scope> aParent) {
-		_parents = new ArrayList<Scope>(aParent);
-		_properties = new HashMap<String, Object>();
-		_runtimes = new HashMap<String, Object>();
-		_provided = new HashMap<ProvidedInterface, ProvidedInterfaceImplementation>();
-		_externallyProvided = new ArrayList<ProvidedInterface>(); 
-		_externallyProvided.addAll(Arrays.asList(aExternallyProvided));
+		parents = new ArrayList<Scope>(aParent);
+		properties = new HashMap<String, Object>();
+		runtimes = new HashMap<String, Object>();
+		provided = new HashMap<ProvidedInterface, ProvidedInterfaceImplementation>();
+		externallyProvided = new ArrayList<ProvidedInterface>(); 
+		externallyProvided.addAll(Arrays.asList(aExternallyProvided));
 	}
 
 	@Override
 	public List<ProvidedInterface> getProvidedInterfaces() {
-		return Collections.unmodifiableList(_externallyProvided);
+		return Collections.unmodifiableList(externallyProvided);
 	}
 
 	@Override
 	public Object get(String aKey) {
-		return _properties.get(aKey);
+		return properties.get(aKey);
 	}
 
 	@Override
 	public void put(String aKey, Object aValue) {
-		_properties.put(aKey, aValue);
+		properties.put(aKey, aValue);
 	}
 
 	@Override
 	public void addRuntime(Component aComponent, Object aRuntime) {
-		_runtimes.put(aComponent.getName(), aRuntime);
+		runtimes.put(aComponent.getName(), aRuntime);
 	}
 
 	@Override
 	public Object getRuntime(Component aComponent) {
-		return _runtimes.get(aComponent.getName());
+		return runtimes.get(aComponent.getName());
 	}
 	
 	@Override
 	public Object getRuntime(String aName) {
-	    return _runtimes.get(aName);
+	    return runtimes.get(aName);
 	}
 
 	@Override
 	synchronized public void publishInterface(ProvidedInterface aInterface,
 			Object aImplementation) {
-		_provided.put(aInterface, new ProvidedInterfaceImplementation(aInterface,
+		provided.put(aInterface, new ProvidedInterfaceImplementation(aInterface,
 				aImplementation));
 	}
 
@@ -95,9 +95,9 @@ public class DefaultScope implements Scope {
 		if ( aInterface == null ) { 
 			return null; 
 		} 
-		ProvidedInterfaceImplementation provided = _provided.get(aInterface);
-		if (provided == null) {
-			for (Scope parent : _parents) {
+		ProvidedInterfaceImplementation providedIntf = provided.get(aInterface);
+		if (providedIntf == null) {
+			for (Scope parent : parents) {
 				T impl = parent.getInterfaceImplementation(aInterface, aType);
 				if ( impl != null ) { 
 					return impl; 
@@ -105,7 +105,7 @@ public class DefaultScope implements Scope {
 			}
 			return null; 
 		} else {
-			return provided.getImplementation(aType);
+			return providedIntf.getImplementation(aType);
 		}
 	}
 }