You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/20 05:09:25 UTC
svn commit: r719156 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/impl/ main/java/org/apache/camel/model/ main/java/org/apache/camel/processor/ main/java/org/apache/camel/spi/ test/java/org/apache/camel/component/seda/ test/java...

Author: ningjiang
Date: Wed Nov 19 20:09:22 2008
New Revision: 719156

URL: http://svn.apache.org/viewvc?rev=719156&view=rev
Log:
Fixed the CS errors in camel-core

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java?rev=719156&r1=719155&r2=719156&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterLoader.java Wed Nov 19 20:09:22 2008
@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.apache.camel.TypeConverter;
-import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
+import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.util.ObjectHelper;
 
 /**

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java?rev=719156&r1=719155&r2=719156&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ReportingTypeConverterRegistry.java Wed Nov 19 20:09:22 2008
@@ -20,8 +20,8 @@
 import java.util.List;
 
 import org.apache.camel.TypeConverter;
-import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.spi.Injector;
+import org.apache.camel.spi.TypeConverterRegistry;
 
 /**
  * Registry for reporting type converters.

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=719156&r1=719155&r2=719156&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java Wed Nov 19 20:09:22 2008
@@ -83,8 +83,8 @@
     private Expression createAbsoluteTimeDelayExpression(RouteContext routeContext) {
         ExpressionType expr = getExpression();
         if (expr != null) {
-            if (ObjectHelper.isNotNullAndNonEmpty(expr.getExpression()) || 
-                expr.getExpressionValue() != null) {
+            if (ObjectHelper.isNotNullAndNonEmpty(expr.getExpression())
+                || expr.getExpressionValue() != null) {
                 return expr.createExpression(routeContext);
             } 
         } 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java?rev=719156&r1=719155&r2=719156&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThroughputLogger.java Wed Nov 19 20:09:22 2008
@@ -126,7 +126,7 @@
         long duration = time - groupStartTime;
         groupStartTime = time;
 
-        return getAction() + ": " + receivedCount + " messages so far. Last group took: " + (duration)
+        return getAction() + ": " + receivedCount + " messages so far. Last group took: " + duration
                 + " millis which is: " + numberFormat.format(rate)
                 + " messages per second. average: " + numberFormat.format(average);
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java?rev=719156&r1=719155&r2=719156&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java Wed Nov 19 20:09:22 2008
@@ -17,7 +17,6 @@
 package org.apache.camel.spi;
 
 import org.apache.camel.TypeConverter;
-import org.apache.camel.spi.Injector;
 
 /**
  * Registry for type converters.

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java?rev=719156&r1=719155&r2=719156&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java Wed Nov 19 20:09:22 2008
@@ -74,7 +74,7 @@
             if (i == 10) {
                 // stop while sending, and then start again to pickup what is left in the queue
                 consumer.stop();
-                Thread.sleep(1000);
+                Thread.sleep(900);
                 consumer.start();
             }
             // use 1000 as timeout otherwise we might get null if the consumer hasn't been started again

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java?rev=719156&r1=719155&r2=719156&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThroughPutLoggerTest.java Wed Nov 19 20:09:22 2008
@@ -22,7 +22,7 @@
 public class ThroughPutLoggerTest extends TestCase {
     public void testLogStringDurationIsNotZero() throws Exception {
         ThroughputLogger underTest = new ThroughputLogger(10);
-        for (int i=0; i<25; i++) {
+        for (int i = 0; i < 25; i++) {
             underTest.process(null);
         }
         String message = (String) underTest.logMessage(null);