git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed the unique id from the provided interface. Now using object
[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 5a09f942cb3c591779fb3bb18e10e61b2e2794c7..7290a790365eda04712f5ffe5ecd74cc692a2fb4 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
@@
-21,14
+21,14
@@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import java.util.UUID;
public class DefaultScope implements Scope {
private List<Scope> _parents;
public class DefaultScope implements Scope {
private List<Scope> _parents;
- private int _count;
private Map<String, Object> _properties;
private Map<String, Object> _runtimes;
private Map<String, Object> _properties;
private Map<String, Object> _runtimes;
- private Map<
String
, ProvidedInterfaceImplementation> _provided;
+ private Map<
ProvidedInterface
, ProvidedInterfaceImplementation> _provided;
private ProvidedInterface[] _externallyProvided;
public DefaultScope(ProvidedInterface[] aExternallyProvided) {
private ProvidedInterface[] _externallyProvided;
public DefaultScope(ProvidedInterface[] aExternallyProvided) {
@@
-42,10
+42,9
@@
public class DefaultScope implements Scope {
public DefaultScope(ProvidedInterface[] aExternallyProvided,
List<Scope> aParent) {
_parents = new ArrayList<Scope>(aParent);
public DefaultScope(ProvidedInterface[] aExternallyProvided,
List<Scope> aParent) {
_parents = new ArrayList<Scope>(aParent);
- _count = 0;
_properties = new HashMap<String, Object>();
_runtimes = new HashMap<String, Object>();
_properties = new HashMap<String, Object>();
_runtimes = new HashMap<String, Object>();
- _provided = new HashMap<
String
, ProvidedInterfaceImplementation>();
+ _provided = new HashMap<
ProvidedInterface
, ProvidedInterfaceImplementation>();
_externallyProvided = aExternallyProvided;
}
_externallyProvided = aExternallyProvided;
}
@@
-82,10
+81,8
@@
public class DefaultScope implements Scope {
@Override
synchronized public void publishInterface(ProvidedInterface aInterface,
Object aImplementation) {
@Override
synchronized public void publishInterface(ProvidedInterface aInterface,
Object aImplementation) {
- String id = "" + _count++;
- _provided.put(id, new ProvidedInterfaceImplementation(aInterface,
+ _provided.put(aInterface, new ProvidedInterfaceImplementation(aInterface,
aImplementation));
aImplementation));
- aInterface.setUniqueId(id);
}
@Override
}
@Override
@@
-93,13
+90,8
@@
public class DefaultScope implements Scope {
Class<T> aType) {
if ( aInterface == null ) {
return null;
Class<T> aType) {
if ( aInterface == null ) {
return null;
- }
- String id = aInterface.getUniqueId();
- if ( id == null ) {
- // optional interface that was not published.
- return null;
- }
- ProvidedInterfaceImplementation provided = _provided.get(id);
+ }
+ ProvidedInterfaceImplementation provided = _provided.get(aInterface);
if (provided == null) {
for (Scope parent : _parents) {
T impl = parent.getInterfaceImplementation(aInterface, aType);
if (provided == null) {
for (Scope parent : _parents) {
T impl = parent.getInterfaceImplementation(aInterface, aType);