tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r572482 - in /incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml: ComponentTypeModelResolver.java CompositeModelResolver.java ConstrainingTypeModelResolver.java
Date Tue, 04 Sep 2007 01:28:32 GMT
Author: jsdelfino
Date: Mon Sep  3 18:28:31 2007
New Revision: 572482

URL: http://svn.apache.org/viewvc?rev=572482&view=rev
Log:
Fixed compile warnings.

Modified:
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
    incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java?rev=572482&r1=572481&r2=572482&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
Mon Sep  3 18:28:31 2007
@@ -54,7 +54,7 @@
         String uri = ((ComponentType)unresolved).getURI();
         ComponentType resolved = (ComponentType) map.get(uri);
         if (resolved != null) {
-            return (T)resolved;
+            return modelClass.cast(resolved);
         } else {
             return (T)unresolved;
         }

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java?rev=572482&r1=572481&r2=572482&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
Mon Sep  3 18:28:31 2007
@@ -60,7 +60,7 @@
         QName qname = ((Composite)unresolved).getName();
         Composite resolved = (Composite) map.get(qname);
         if (resolved != null) {
-            return (T)resolved;
+            return modelClass.cast(resolved);
         }
         
         // No definition found, delegate the resolution to the imports
@@ -72,7 +72,7 @@
                     // Delegate the resolution to the import resolver
                     resolved = namespaceImport.getModelResolver().resolveModel(Composite.class,
(Composite)unresolved);
                     if (!resolved.isUnresolved()) {
-                        return (T)resolved;
+                        return modelClass.cast(resolved);
                     }
                 }
             }

Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java?rev=572482&r1=572481&r2=572482&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
(original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
Mon Sep  3 18:28:31 2007
@@ -60,7 +60,7 @@
         QName qname = ((ConstrainingType)unresolved).getName();
         ConstrainingType resolved = (ConstrainingType) map.get(qname);
         if (resolved != null) {
-            return (T)resolved;
+            return modelClass.cast(resolved);
         }
         
         // No definition found, delegate the resolution to the imports
@@ -72,7 +72,7 @@
                     // Delegate the resolution to the import resolver
                     resolved = namespaceImport.getModelResolver().resolveModel(ConstrainingType.class,
(ConstrainingType)unresolved);
                     if (!resolved.isUnresolved()) {
-                        return (T)resolved;
+                        return modelClass.cast(resolved);
                     }
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message