Return-Path: 
 <commits-return-27787-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
X-Original-To: apmail-commons-commits-archive@minotaur.apache.org
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 71A54D06C
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Sun, 15 Jul 2012 16:14:09 +0000 (UTC)
Received: (qmail 10970 invoked by uid 500); 15 Jul 2012 16:14:09 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 10891 invoked by uid 500); 15 Jul 2012 16:14:09 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 10884 invoked by uid 99); 15 Jul 2012 16:14:09 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jul 2012 16:14:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jul 2012 16:14:06 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 488D923888D2
	for <commits@commons.apache.org>; Sun, 15 Jul 2012 16:13:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1361728 -
 /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
Date: Sun, 15 Jul 2012 16:13:46 -0000
To: commits@commons.apache.org
From: tn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120715161346.488D923888D2@eris.apache.org>

Author: tn
Date: Sun Jul 15 16:13:45 2012
New Revision: 1361728

URL: http://svn.apache.org/viewvc?rev=1361728&view=rev
Log:
checkstyle fixes

Modified:
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java?rev=1361728&r1=1361727&r2=1361728&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java Sun Jul 15 16:13:45 2012
@@ -953,8 +953,8 @@ public class TreeBidiMap<K extends Compa
                 swapPosition(nextGreater(deletedNode, dataElement), deletedNode, dataElement);
             }
 
-            Node<K, V> replacement =
-                ((deletedNode.getLeft(dataElement) != null) ? deletedNode.getLeft(dataElement) : deletedNode.getRight(dataElement));
+            Node<K, V> replacement = ((deletedNode.getLeft(dataElement) != null) ?
+                    deletedNode.getLeft(dataElement) : deletedNode.getRight(dataElement));
 
             if (replacement != null) {
                 replacement.setParent(deletedNode.getParent(dataElement), dataElement);
@@ -1103,8 +1103,10 @@ public class TreeBidiMap<K extends Compa
         Node<K, V> yFormerParent = y.getParent(dataElement);
         Node<K, V> yFormerLeftChild = y.getLeft(dataElement);
         Node<K, V> yFormerRightChild = y.getRight(dataElement);
-        boolean xWasLeftChild = (x.getParent(dataElement) != null) && (x == x.getParent(dataElement).getLeft(dataElement));
-        boolean yWasLeftChild = (y.getParent(dataElement) != null) && (y == y.getParent(dataElement).getLeft(dataElement));
+        boolean xWasLeftChild =
+                (x.getParent(dataElement) != null) && (x == x.getParent(dataElement).getLeft(dataElement));
+        boolean yWasLeftChild =
+                (y.getParent(dataElement) != null) && (y == y.getParent(dataElement).getLeft(dataElement));
 
         // Swap, handling special cases of one being the other's parent.
         if (x == yFormerParent) { // x was y's parent
@@ -1674,14 +1676,16 @@ public class TreeBidiMap<K extends Compa
 
         public K getKey() {
             if (lastReturnedNode == null) {
-                throw new IllegalStateException("Iterator getKey() can only be called after next() and before remove()");
+                throw new IllegalStateException(
+                        "Iterator getKey() can only be called after next() and before remove()");
             }
             return lastReturnedNode.getKey();
         }
 
         public V getValue() {
             if (lastReturnedNode == null) {
-                throw new IllegalStateException("Iterator getValue() can only be called after next() and before remove()");
+                throw new IllegalStateException(
+                        "Iterator getValue() can only be called after next() and before remove()");
             }
             return lastReturnedNode.getValue();
         }
@@ -1713,14 +1717,16 @@ public class TreeBidiMap<K extends Compa
 
         public V getKey() {
             if (lastReturnedNode == null) {
-                throw new IllegalStateException("Iterator getKey() can only be called after next() and before remove()");
+                throw new IllegalStateException(
+                        "Iterator getKey() can only be called after next() and before remove()");
             }
             return lastReturnedNode.getValue();
         }
 
         public K getValue() {
             if (lastReturnedNode == null) {
-                throw new IllegalStateException("Iterator getValue() can only be called after next() and before remove()");
+                throw new IllegalStateException(
+                        "Iterator getValue() can only be called after next() and before remove()");
             }
             return lastReturnedNode.getKey();
         }