You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/08/21 08:35:53 UTC
svn commit: r433173 - in /incubator/tuscany/java/sca:
containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/
containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/
core/src/main/java/org/apache/tu...
Author: jmarino
Date: Sun Aug 20 23:35:52 2006
New Revision: 433173
URL: http://svn.apache.org/viewvc?rev=433173&view=rev
Log:
more compiler warnings cleanup
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
Modified: incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java?rev=433173&r1=433172&r2=433173&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java (original)
+++ incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java Sun Aug 20 23:35:52 2006
@@ -96,9 +96,10 @@
}
public GroovyObject getTargetInstance() throws TargetException {
- return scopeContainer.getInstance(this);
+ return (GroovyObject) scopeContainer.getInstance(this);
}
+ @SuppressWarnings("unchecked")
public T getServiceInstance() throws TargetException {
//TODO this should return a default service from a wire
return (T) scopeContainer.getInstance(this);
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java?rev=433173&r1=433172&r2=433173&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java Sun Aug 20 23:35:52 2006
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.tuscany.container.javascript.rhino.RhinoScript;
-import org.apache.tuscany.container.javascript.rhino.RhinoScriptInstance;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -36,6 +34,9 @@
import org.apache.tuscany.spi.wire.TargetInvoker;
import org.apache.tuscany.spi.wire.WireService;
+import org.apache.tuscany.container.javascript.rhino.RhinoScript;
+import org.apache.tuscany.container.javascript.rhino.RhinoScriptInstance;
+
/**
* The JavaScript component implementation.
*/
@@ -48,7 +49,8 @@
private RhinoScript rhinoScript;
public JavaScriptComponent(String name, RhinoScript rhinoScript, List<Class<?>> services,
- CompositeComponent parent, ScopeContainer scopeContainer, WireService wireService, WorkContext workContext) {
+ CompositeComponent parent, ScopeContainer scopeContainer, WireService wireService,
+ WorkContext workContext) {
super(name, parent, scopeContainer, wireService, workContext, null, 0);
this.rhinoScript = rhinoScript;
@@ -77,7 +79,7 @@
}
// TODO: move all the following up to AtomicComponentExtension?
-
+
public List<Class<?>> getServiceInterfaces() {
return services;
}
@@ -87,7 +89,7 @@
}
public RhinoScriptInstance getTargetInstance() throws TargetException {
- return scopeContainer.getInstance(this);
+ return (RhinoScriptInstance) scopeContainer.getInstance(this);
}
public T getServiceInstance() throws TargetException {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java?rev=433173&r1=433172&r2=433173&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java Sun Aug 20 23:35:52 2006
@@ -49,17 +49,17 @@
public SystemService build(CompositeComponent parent,
BoundServiceDefinition<SystemBinding> boundServiceDefinition,
DeploymentContext deploymentContext) {
- Class<?> interfaze = boundServiceDefinition.getServiceContract().getInterfaceClass();
+ Class<Object> interfaze = boundServiceDefinition.getServiceContract().getInterfaceClass();
QualifiedName targetName = new QualifiedName(boundServiceDefinition.getTarget().getPath());
Component target = (Component) parent.getChild(targetName.getPartName());
if (target == null) {
throw new BuilderConfigException("Target not found: [" + targetName + ']');
}
- SystemInboundWire<?> inboundWire =
- new SystemInboundWireImpl(boundServiceDefinition.getName(), interfaze, target);
- SystemOutboundWire<?> outboundWire =
- new SystemOutboundWireImpl(boundServiceDefinition.getName(), targetName, interfaze);
- SystemService service = new SystemServiceImpl(boundServiceDefinition.getName(), parent);
+ SystemInboundWire<Object> inboundWire =
+ new SystemInboundWireImpl<Object>(boundServiceDefinition.getName(), interfaze, target);
+ SystemOutboundWire<Object> outboundWire =
+ new SystemOutboundWireImpl<Object>(boundServiceDefinition.getName(), targetName, interfaze);
+ SystemService<Object> service = new SystemServiceImpl<Object>(boundServiceDefinition.getName(), parent);
service.setInboundWire(inboundWire);
service.setOutboundWire(outboundWire);
return service;
Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java?rev=433173&r1=433172&r2=433173&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainer.java Sun Aug 20 23:35:52 2006
@@ -51,6 +51,6 @@
*
* @throws TargetException
*/
- <T> T getInstance(AtomicComponent component) throws TargetException;
+ Object getInstance(AtomicComponent component) throws TargetException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org