svn commit: r883341 - /camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java

[da...@apache.org]

Author: davsclaus
Date: Mon Nov 23 13:48:55 2009
New Revision: 883341

URL: http://svn.apache.org/viewvc?rev=883341&view=rev
Log:
Fixed compiler issue on HP-UX

Modified:
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=883341&r1=883340&r2=883341&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Mon Nov 23 13:48:55 2009
@@ -290,7 +290,7 @@
         }
 
         // do special preparation for some concepts such as interceptors and policies
-        // this is needed as JAXB does not build excaclty the same model definition as Spring DSL would do
+        // this is needed as JAXB does not build exactly the same model definition as Spring DSL would do
         // using route builders. So we have here a little custom code to fix the JAXB gaps
         for (RouteDefinition route : routes) {
             // interceptors should be first
@@ -322,7 +322,7 @@
     }
 
     private void initParent(RouteDefinition route) {
-        for (ProcessorDefinition<?> output : route.getOutputs()) {
+        for (ProcessorDefinition output : route.getOutputs()) {
             output.setParent(route);
             if (output.getOutputs() != null) {
                 // recursive the outputs
@@ -331,7 +331,8 @@
         }
     }
 
-    private void initParent(ProcessorDefinition<?> parent) {
+    @SuppressWarnings("unchecked")
+    private void initParent(ProcessorDefinition parent) {
         List<ProcessorDefinition> children = parent.getOutputs();
         for (ProcessorDefinition child : children) {
             child.setParent(parent);
@@ -343,7 +344,7 @@
     }
 
     private void initToAsync(RouteDefinition route) {
-        List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+        List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
         ToDefinition toAsync = null;
 
         for (ProcessorDefinition output : route.getOutputs()) {
@@ -370,8 +371,8 @@
     }
 
     private void initOnExceptions(RouteDefinition route) {
-        List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
-        List<ProcessorDefinition<?>> exceptionHandlers = new ArrayList<ProcessorDefinition<?>>();
+        List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
+        List<ProcessorDefinition> exceptionHandlers = new ArrayList<ProcessorDefinition>();
 
         // add global on exceptions if any
         if (onExceptions != null && !onExceptions.isEmpty()) {
@@ -404,7 +405,7 @@
         // configure intercept
         for (InterceptDefinition intercept : getIntercepts()) {
             intercept.afterPropertiesSet();
-            // add as first output so intercept is handled before the acutal route and that gives
+            // add as first output so intercept is handled before the actual route and that gives
             // us the needed head start to init and be able to intercept all the remaining processing steps
             route.getOutputs().add(0, intercept);
         }
@@ -426,7 +427,7 @@
 
             if (match) {
                 intercept.afterPropertiesSet();
-                // add as first output so intercept is handled before the acutal route and that gives
+                // add as first output so intercept is handled before the actual route and that gives
                 // us the needed head start to init and be able to intercept all the remaining processing steps
                 route.getOutputs().add(0, intercept);
             }
@@ -435,7 +436,7 @@
         // configure intercept send to endpoint
         for (InterceptSendToEndpointDefinition intercept : getInterceptSendToEndpoints()) {
             intercept.afterPropertiesSet();
-            // add as first output so intercept is handled before the acutal route and that gives
+            // add as first output so intercept is handled before the actual route and that gives
             // us the needed head start to init and be able to intercept all the remaining processing steps
             route.getOutputs().add(0, intercept);
         }
@@ -443,7 +444,7 @@
     }
 
     private void initOnCompletions(RouteDefinition route) {
-        // only add global onCompletion if there are no route alredy
+        // only add global onCompletion if there are no route already
         boolean hasRouteScope = false;
         for (ProcessorDefinition out : route.getOutputs()) {
             if (out instanceof OnCompletionDefinition) {
@@ -478,7 +479,7 @@
         TransactedDefinition transacted = null;
 
         // add to correct type
-        for (ProcessorDefinition<?> type : types) {
+        for (ProcessorDefinition type : types) {
             if (type instanceof PolicyDefinition) {
                 policy = (PolicyDefinition) type;
             } else if (type instanceof TransactedDefinition) {