You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/01/20 23:05:11 UTC
svn commit: r1234173 - in /camel/branches/camel-2.9.x: ./
components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java
components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java
Author: hadrian
Date: Fri Jan 20 22:05:11 2012
New Revision: 1234173
URL: http://svn.apache.org/viewvc?rev=1234173&view=rev
Log:
Merged revisions 1231101 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1231101 | iocanel | 2012-01-13 09:48:53 -0500 (Fri, 13 Jan 2012) | 1 line
[CAMEL-4889] Checkstyle fixes
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java
camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java?rev=1234173&r1=1234172&r2=1234173&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java (original)
+++ camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/KeyObject.java Fri Jan 20 22:05:11 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.krati;
import java.io.Serializable;
@@ -29,12 +28,18 @@ public class KeyObject implements Serial
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
KeyObject keyObject = (KeyObject) o;
- if (id != null ? !id.equals(keyObject.id) : keyObject.id != null) return false;
+ if (id != null ? !id.equals(keyObject.id) : keyObject.id != null) {
+ return false;
+ }
return true;
}
Modified: camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java?rev=1234173&r1=1234172&r2=1234173&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java (original)
+++ camel/branches/camel-2.9.x/components/camel-krati/src/test/java/org/apache/camel/component/krati/ValueObject.java Fri Jan 20 22:05:11 2012
@@ -29,13 +29,18 @@ public class ValueObject implements Seri
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
ValueObject that = (ValueObject) o;
- if (value != null ? !value.equals(that.value) : that.value != null) return false;
-
+ if (value != null ? !value.equals(that.value) : that.value != null) {
+ return false;
+ }
return true;
}