Author: ningjiang
Date: Tue Jul 15 01:04:18 2008
New Revision: 676826
URL: http://svn.apache.org/viewvc?rev=676826&view=rev
Log:
Fixed more CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/MessageSupport.java
Tue Jul 15 01:04:18 2008
@@ -16,10 +16,10 @@
*/
package org.apache.camel.impl;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.TypeConverter;
-import org.apache.camel.CamelContext;
import org.apache.camel.util.UuidGenerator;
/**
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileHeaderFileNameProducedTest.java
Tue Jul 15 01:04:18 2008
@@ -17,8 +17,8 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* Unit test that tests that the header contains the absolute path to the
filename it used.
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileMEPInOutTest.java
Tue Jul 15 01:04:18 2008
@@ -19,8 +19,8 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
/**
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
Tue Jul 15 01:04:18 2008
@@ -19,10 +19,10 @@
import java.util.Random;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Processor;
import org.apache.camel.Exchange;
-import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
/**
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
Tue Jul 15 01:04:18 2008
@@ -24,10 +24,11 @@
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.jndi.JndiContext;
+import static org.apache.camel.language.simple.SimpleLanguage.simple;
+
/**
* @version $Revision$
*/
@@ -86,5 +87,5 @@
return "Bye said " + value;
}
}
-
+
}
\ No newline at end of file
Modified:
activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java
(original)
+++
activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/processor/juel/SimulatorTest.java
Tue Jul 15 01:04:18 2008
@@ -24,10 +24,11 @@
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import static org.apache.camel.language.juel.JuelExpression.el;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.jndi.JndiContext;
+import static org.apache.camel.language.juel.JuelExpression.el;
+
/**
* @version $Revision$
*/
Modified:
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Tue Jul 15 01:04:18 2008
@@ -31,6 +31,7 @@
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
+
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMResult;
@@ -38,6 +39,15 @@
import org.w3c.dom.Node;
+import net.sf.saxon.Configuration;
+import net.sf.saxon.om.DocumentInfo;
+import net.sf.saxon.om.Item;
+import net.sf.saxon.om.SequenceIterator;
+import net.sf.saxon.query.DynamicQueryContext;
+import net.sf.saxon.query.StaticQueryContext;
+import net.sf.saxon.query.XQueryExpression;
+import net.sf.saxon.trans.XPathException;
+
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
@@ -53,14 +63,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import net.sf.saxon.Configuration;
-import net.sf.saxon.om.DocumentInfo;
-import net.sf.saxon.om.Item;
-import net.sf.saxon.om.SequenceIterator;
-import net.sf.saxon.query.DynamicQueryContext;
-import net.sf.saxon.query.StaticQueryContext;
-import net.sf.saxon.query.XQueryExpression;
-import net.sf.saxon.trans.XPathException;
+
/**
@@ -175,7 +178,7 @@
public String evaluateAsString(Exchange exchange) throws Exception {
initialize();
-
+
StringWriter buffer = new StringWriter();
SequenceIterator iter =
getExpression().iterator(createDynamicContext(exchange));
for (Item item = iter.next(); item != null; item = iter.next()) {
@@ -442,7 +445,7 @@
* Initializes this builder - <b>Must be invoked before evaluation</b>.
*/
protected synchronized void initialize() throws XPathException,
IOException {
- // must use synchronized for concurrency issues and only let it
intialize once
+ // must use synchronized for concurrency issues and only let it
initialize once
if (!initialized.get()) {
if (LOG.isDebugEnabled()) {
LOG.debug("Initializing XQueryBuilder " + this);
Modified:
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
(original)
+++
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
Tue Jul 15 01:04:18 2008
@@ -20,9 +20,9 @@
import org.apache.camel.impl.DefaultProducer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jivesoftware.smackx.muc.MultiUserChat;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smackx.muc.MultiUserChat;
/**
* @version $Revision$
@@ -63,9 +63,9 @@
protected void doStart() throws Exception {
super.doStart();
if (chat == null) {
- chat = new MultiUserChat(endpoint.getConnection(), room);
- String nickname = this.endpoint.getNickname();
- chat.join(nickname != null ? nickname :
this.endpoint.getUser());
+ chat = new MultiUserChat(endpoint.getConnection(), room);
+ String nickname = this.endpoint.getNickname();
+ chat.join(nickname != null ? nickname : this.endpoint.getUser());
}
}
Modified:
activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java?rev=676826&r1=676825&r2=676826&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
(original)
+++
activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/UriConfigurationTest.java
Tue Jul 15 01:04:18 2008
@@ -54,7 +54,7 @@
assertEquals("secret", xmppEndpoint.getPassword());
assertEquals("incognito", xmppEndpoint.getNickname());
}
-
+
// Changes in default resource name may break
// clients program assuming the default "Camel" resource name
// so it is better to avoid changing it.
@@ -64,6 +64,5 @@
XmppEndpoint xmppEndpoint = (XmppEndpoint) endpoint;
assertEquals("Camel", xmppEndpoint.getResource());
-
}
}
