Author: davsclaus Date: Thu Feb 26 06:15:47 2009 New Revision: 748032 URL: http://svn.apache.org/viewvc?rev=748032&view=rev Log: Fxied checkstyle.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java camel/trunk/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java Thu Feb 26 06:15:47 2009 @@ -17,14 +17,12 @@ package org.apache.camel.component.seda; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.HashSet; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.Executor; -import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.LinkedBlockingQueue; import org.apache.camel.Component; import org.apache.camel.Consumer; Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java Thu Feb 26 06:15:47 2009 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,10 +16,10 @@ */ package org.apache.camel.component.seda; -import org.apache.camel.Exchange; - import java.util.concurrent.BlockingQueue; +import org.apache.camel.Exchange; + /** * @version $Revision: 1.1 $ */ Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Thu Feb 26 06:15:47 2009 @@ -16,6 +16,17 @@ */ package org.apache.camel.impl; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.Callable; +import javax.naming.Context; + import org.apache.camel.CamelContext; import org.apache.camel.Component; import org.apache.camel.Endpoint; @@ -50,22 +61,12 @@ import org.apache.camel.util.FactoryFinder; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.ReflectionInjector; -import static org.apache.camel.util.ServiceHelper.startServices; -import static org.apache.camel.util.ServiceHelper.stopServices; import org.apache.camel.util.SystemHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.naming.Context; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.Callable; +import static org.apache.camel.util.ServiceHelper.startServices; +import static org.apache.camel.util.ServiceHelper.stopServices; /** * Represents the context used to configure routes and the policies to use. @@ -386,9 +387,9 @@ } synchronized void removeRouteCollection(Collection<Route> routes) { - if (this.routes != null){ - this.routes.removeAll(routes); - } + if (this.routes != null) { + this.routes.removeAll(routes); + } } synchronized void addRouteCollection(Collection<Route> routes) throws Exception { Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java Thu Feb 26 06:15:47 2009 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,6 +16,9 @@ */ package org.apache.camel.impl; +import java.util.Collection; +import java.util.List; + import org.apache.camel.CamelContext; import org.apache.camel.Route; import org.apache.camel.Service; @@ -24,9 +26,6 @@ import org.apache.camel.spi.LifecycleStrategy; import org.apache.camel.spi.RouteContext; -import java.util.Collection; -import java.util.List; - /** * Represents the runtime objects for a given {...@link RouteType} so that it can be stopped independently * of other routes Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java Thu Feb 26 06:15:47 2009 @@ -179,8 +179,8 @@ return answer; } - public Map<Class,TypeConverter> getToClassMappings(Class fromClass) { - Map<Class,TypeConverter> answer = new HashMap<Class,TypeConverter>(); + public Map<Class, TypeConverter> getToClassMappings(Class fromClass) { + Map<Class, TypeConverter> answer = new HashMap<Class, TypeConverter>(); synchronized (typeMappings) { for (Map.Entry<TypeMapping, TypeConverter> entry : typeMappings.entrySet()) { TypeMapping mapping = entry.getKey(); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java Thu Feb 26 06:15:47 2009 @@ -16,8 +16,6 @@ */ package org.apache.camel.processor; -import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException; - import java.util.List; import org.apache.camel.Exchange; @@ -28,6 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException; + /** * Implements try/catch/finally type processing * Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java Thu Feb 26 06:15:47 2009 @@ -17,8 +17,8 @@ package org.apache.camel; import java.io.File; -import java.util.List; import java.util.Collection; +import java.util.List; import junit.framework.TestCase; import org.apache.camel.builder.Builder; Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java?rev=748032&r1=748031&r2=748032&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/StartAndStopRoutesTest.java Thu Feb 26 06:15:47 2009 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,14 +16,14 @@ */ package org.apache.camel.impl; +import java.util.List; + import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.seda.SedaEndpoint; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.model.RouteType; +import org.apache.camel.component.seda.SedaEndpoint; import org.apache.camel.model.FromType; - -import java.util.List; +import org.apache.camel.model.RouteType; /** * This test stops a route, mutates it then restarts it