svn commit: r885283 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/processor/ camel-core/src/test/java/org/apache/camel/processor/ components/camel-jms/src/test/java/org/apache/camel/component/jms/

[hadrian]

Author: hadrian
Date: Sun Nov 29 22:40:56 2009
New Revision: 885283

URL: http://svn.apache.org/viewvc?rev=885283&view=rev
Log:
Preparing release.  Checkstyle fixes

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java?rev=885283&r1=885282&r2=885283&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
 Sun Nov 29 22:40:56 2009
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.processor;
 
-import static java.lang.String.format;
-
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.Exchange;
@@ -117,12 +115,12 @@
         }
 
         String getSampledLog() {
-            return format("Sampled %d of %d total exchanges", totalSampled, 
totalSampled + totalDropped);
+            return String.format("Sampled %d of %d total exchanges", 
totalSampled, totalSampled + totalDropped);
         }
 
         String getDroppedLog() {
-            return format("Dropped %d of %d exchanges in this period, 
totalling %d dropped of %d exchanges overall.",
-                          droppedThisPeriod, totalThisPeriod, totalDropped, 
totalSampled + totalDropped);
+            return String.format("Dropped %d of %d exchanges in this period, 
totalling %d dropped of %d exchanges overall.",
+                droppedThisPeriod, totalThisPeriod, totalDropped, totalSampled 
+ totalDropped);
         }
     }
 

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java?rev=885283&r1=885282&r2=885283&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListReturnValueTest.java
 Sun Nov 29 22:40:56 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.processor;
 
-import org.apache.camel.*;
+import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.JndiRegistry;

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java?rev=885283&r1=885282&r2=885283&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
 Sun Nov 29 22:40:56 2009
@@ -76,7 +76,9 @@
                 public void run() {
                     try {
                         sendExchangesThroughDroppingThrottler(sentExchanges, 
35);
-                    } catch (InterruptedException e) {}
+                    } catch (InterruptedException e) {
+                        // ignore
+                    }
                 }
             });
         }

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java?rev=885283&r1=885282&r2=885283&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
 Sun Nov 29 22:40:56 2009
@@ -24,7 +24,6 @@
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jms.JmsComponent;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.CamelTestSupport;