Author: ningjiang
Date: Sun Oct 26 20:06:59 2008
New Revision: 708078
URL: http://svn.apache.org/viewvc?rev=708078&view=rev
Log:
Fixed the CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
Sun Oct 26 20:06:59 2008
@@ -24,14 +24,12 @@
import org.apache.camel.model.FromType;
import org.apache.camel.model.InterceptorRef;
import org.apache.camel.model.MulticastType;
+import org.apache.camel.model.PipelineType;
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.RouteType;
-import org.apache.camel.model.PipelineType;
import org.apache.camel.model.ToType;
import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
-
-
/**
* A <a href="http://www.graphviz.org/";>DOT</a> file creator plugin which
* creates a DOT file showing the current routes
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
Sun Oct 26 20:06:59 2008
@@ -16,9 +16,14 @@
*/
package org.apache.camel.guice;
+import java.util.Hashtable;
+
+import javax.naming.InitialContext;
+
+import junit.framework.TestCase;
import com.google.inject.Injector;
import com.google.inject.Provides;
-import junit.framework.TestCase;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
@@ -27,12 +32,10 @@
import org.guiceyfruit.Injectors;
import org.guiceyfruit.jndi.GuiceInitialContextFactory;
import org.guiceyfruit.jndi.JndiBind;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import javax.naming.InitialContext;
-import java.util.Hashtable;
-
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
*
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
Sun Oct 26 20:06:59 2008
@@ -16,11 +16,10 @@
*/
package org.apache.camel.guice;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
import junit.framework.TestCase;
-
+import com.google.inject.Guice;
+import com.google.inject.Injector;
/**
* Lets use a RouteBuilder to bind instances of routes to the CamelContext
*
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
Sun Oct 26 20:06:59 2008
@@ -16,17 +16,21 @@
*/
package org.apache.camel.guice;
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
import com.google.common.collect.Lists;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.name.Named;
-import junit.framework.TestCase;
+
import org.apache.camel.EndpointInject;
import org.apache.camel.Routes;
import org.apache.camel.component.mock.MockEndpoint;
-import java.util.Collection;
+
/**
* Create a collection of routes via a provider method
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
Sun Oct 26 20:06:59 2008
@@ -16,6 +16,10 @@
*/
package org.apache.camel.guice;
+import java.util.Collection;
+
+import junit.framework.TestCase;
+
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -23,12 +27,10 @@
import com.google.inject.matcher.Matchers;
import com.google.inject.name.Named;
import com.google.inject.name.Names;
-import junit.framework.TestCase;
+
import org.apache.camel.builder.RouteBuilder;
import org.guiceyfruit.Injectors;
-import java.util.Collection;
-
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
*
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
Sun Oct 26 20:06:59 2008
@@ -16,11 +16,13 @@
*/
package org.apache.camel.guice;
+import junit.framework.TestCase;
+
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.spi.CloseFailedException;
-import junit.framework.TestCase;
+
import org.apache.camel.CamelContext;
/**
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
Sun Oct 26 20:06:59 2008
@@ -16,13 +16,13 @@
*/
package org.apache.camel.guice;
+import java.util.List;
+
import junit.framework.TestCase;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import java.util.List;
-
/**
* @version $Revision$
*/
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
Sun Oct 26 20:06:59 2008
@@ -16,9 +16,9 @@
*/
package org.apache.camel.guice;
+import junit.framework.TestCase;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import junit.framework.TestCase;
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java
Sun Oct 26 20:06:59 2008
@@ -27,11 +27,11 @@
public void testExample() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedBodiesReceived("<employee
id=\"James\"><name><firstName>James</firstName>" +
-
"<lastName>Strachan</lastName></name><location><city>London</city></location></employee>");
+ mock.expectedBodiesReceived("<employee
id=\"James\"><name><firstName>James</firstName>"
+ +
"<lastName>Strachan</lastName></name><location><city>London</city></location></employee>");
- template.sendBody("direct:start", "<person
user='James'><firstName>James</firstName>" +
- "<lastName>Strachan</lastName><city>London</city></person>");
+ template.sendBody("direct:start", "<person
user='James'><firstName>James</firstName>"
+ +
"<lastName>Strachan</lastName><city>London</city></person>");
assertMockEndpointsSatisfied();
}
Modified:
activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java?rev=708078&r1=708077&r2=708078&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
(original)
+++
activemq/camel/trunk/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
Sun Oct 26 20:06:59 2008
@@ -45,6 +45,13 @@
private XStream xstream;
private StaxConverter staxConverter;
+
+ public XStreamDataFormat() {
+ }
+
+ public XStreamDataFormat(XStream xstream) {
+ setXStream(xstream);
+ }
/**
* A factory method which takes a collection of types to be annotated
@@ -70,13 +77,6 @@
return answer;
}
- public XStreamDataFormat() {
- }
-
- public XStreamDataFormat(XStream xstream) {
- setXStream(xstream);
- }
-
public void marshal(Exchange exchange, Object body, OutputStream stream)
throws Exception {
HierarchicalStreamWriter writer =
createHierarchicalStreamWriter(exchange, body, stream);
try {
