git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now using the new database support functionality.
[utils]
/
system
/
spring
/
src
/
main
/
java
/
org
/
wamblee
/
system
/
spring
/
RequiredServiceBean.java
diff --git
a/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
b/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
index 6c18cc8ce8e776b454eb1a1ea251ecbc3d18ffd1..71ac30857c59c3181cc69cd2cb2c144b27dfe154 100644
(file)
--- a/
system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
+++ b/
system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
@@
-15,8
+15,9
@@
*/
package org.wamblee.system.spring;
*/
package org.wamblee.system.spring;
+import java.util.List;
+
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.FactoryBean;
-import org.wamblee.system.core.ProvidedInterface;
import org.wamblee.system.core.RequiredInterface;
import org.wamblee.system.core.SystemAssemblyException;
import org.wamblee.system.core.RequiredInterface;
import org.wamblee.system.core.SystemAssemblyException;
@@
-35,19
+36,20
@@
class RequiredServiceBean implements FactoryBean {
* @param aId Id of the bean in the service registry.
*/
public RequiredServiceBean(String aId) {
* @param aId Id of the bean in the service registry.
*/
public RequiredServiceBean(String aId) {
-
RequiredInterface[]
required = SpringComponent.THIS.get().getRequiredInterfaces();
+
List<RequiredInterface>
required = SpringComponent.THIS.get().getRequiredInterfaces();
for ( RequiredInterface intf: required) {
if ( intf.getName().equals(aId)) {
_required = intf;
return;
}
}
for ( RequiredInterface intf: required) {
if ( intf.getName().equals(aId)) {
_required = intf;
return;
}
}
- throw new SystemAssemblyException("Cannot resolve
provid
ed component '" + aId + "'");
+ throw new SystemAssemblyException("Cannot resolve
requir
ed component '" + aId + "'");
}
@Override
public Object getObject() throws Exception {
}
@Override
public Object getObject() throws Exception {
- return _required.getImplementation(Object.class);
+ return SpringComponent.SCOPE.get().getInterfaceImplementation(
+ _required.getProvider(), Object.class);
}
@Override
}
@Override