Author: mcombellack
Date: Thu Dec 4 04:49:38 2008
New Revision: 723301
URL: http://svn.apache.org/viewvc?rev=723301&view=rev
Log:
Fixed generics raw type compiler warnings
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java?rev=723301&r1=723300&r2=723301&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
(original)
+++
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
Thu Dec 4 04:49:38 2008
@@ -59,7 +59,7 @@
public ObjectFactory createValueFactory(Property property, Object
propertyValue, JavaElementImpl javaElement) {
isSimpleType = isSimpleType(property);
Document doc = (Document)propertyValue;
- Class javaType =
JavaIntrospectionHelper.getBaseType(javaElement.getType(),
javaElement.getGenericType());
+ Class<?> javaType =
JavaIntrospectionHelper.getBaseType(javaElement.getType(),
javaElement.getGenericType());
Element rootElement = doc.getDocumentElement();
if (property.isMany()) {
if (isSimpleType) {
@@ -148,7 +148,7 @@
return false;
}
- private List<String> getSimplePropertyValues(String concatenatedValue,
Class javaType) {
+ private List<String> getSimplePropertyValues(String concatenatedValue,
Class<?> javaType) {
List<String> propValues = new ArrayList<String>();
StringTokenizer st = null;
if (javaType.getName().equals("java.lang.String")) {
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java?rev=723301&r1=723300&r2=723301&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
(original)
+++
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
Thu Dec 4 04:49:38 2008
@@ -131,7 +131,7 @@
createPropertyValueFactory(configuredProperty,
configuredProperty.getValue(), element);
instanceFactoryProvider.setObjectFactory(element,
propertyObjectFactory);
- JavaConstructorImpl constructor =
instanceFactoryProvider.getImplementation().getConstructor();
+ JavaConstructorImpl<?> constructor =
instanceFactoryProvider.getImplementation().getConstructor();
for(JavaElementImpl p: constructor.getParameters()){
if(element.getName().equals(p.getName())) {
instanceFactoryProvider.setObjectFactory(p,
propertyObjectFactory);
@@ -228,7 +228,7 @@
factories.add(factory);
}
instanceFactoryProvider.setObjectFactories(element,
factories);
- JavaConstructorImpl constructor =
instanceFactoryProvider.getImplementation().getConstructor();
+ JavaConstructorImpl<?> constructor =
instanceFactoryProvider.getImplementation().getConstructor();
for(JavaElementImpl p: constructor.getParameters()){
if(element.getName().equals(p.getName())) {
instanceFactoryProvider.setObjectFactories(p,
factories);
@@ -251,7 +251,7 @@
factory = createObjectFactory(element.getType(),
wireList.get(0));
}
instanceFactoryProvider.setObjectFactory(element,
factory);
- JavaConstructorImpl constructor =
instanceFactoryProvider.getImplementation().getConstructor();
+ JavaConstructorImpl<?> constructor =
instanceFactoryProvider.getImplementation().getConstructor();
for(JavaElementImpl p: constructor.getParameters()){
if(element.getName().equals(p.getName())) {
instanceFactoryProvider.setObjectFactory(p,
factory);
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?rev=723301&r1=723300&r2=723301&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
(original)
+++
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
Thu Dec 4 04:49:38 2008
@@ -186,7 +186,7 @@
componentContextProvider.stop();
}
- public InstanceWrapper createInstanceWrapper() {
+ public InstanceWrapper<?> createInstanceWrapper() {
return componentContextProvider.createInstanceWrapper();
}
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java?rev=723301&r1=723300&r2=723301&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
(original)
+++
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
Thu Dec 4 04:49:38 2008
@@ -92,7 +92,7 @@
@Test
public void testDefaultConstructor() throws Exception {
- Constructor ctr =
JavaIntrospectionHelper.getDefaultConstructor(Bean2.class);
+ Constructor<Bean2> ctr =
JavaIntrospectionHelper.getDefaultConstructor(Bean2.class);
assertEquals(ctr, Bean2.class.getConstructor());
assertTrue(Bean2.class == ctr.newInstance((Object[]) null).getClass());
}
