Return-Path: 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 98037D7AE for ; Thu, 20 Sep 2012 18:30:15 +0000 (UTC) Received: (qmail 40311 invoked by uid 500); 20 Sep 2012 18:30:15 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 40246 invoked by uid 500); 20 Sep 2012 18:30:15 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 40238 invoked by uid 99); 20 Sep 2012 18:30:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Sep 2012 18:30:15 +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; Thu, 20 Sep 2012 18:30:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DDF4723888FE for ; Thu, 20 Sep 2012 18:29:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1388152 - in /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie: KeyAnalyzer.java PatriciaTrieBase.java Date: Thu, 20 Sep 2012 18:29:30 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120920182930.DDF4723888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tn Date: Thu Sep 20 18:29:30 2012 New Revision: 1388152 URL: http://svn.apache.org/viewvc?rev=1388152&view=rev Log: Javadoc formatting. Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java?rev=1388152&r1=1388151&r2=1388152&view=diff ============================================================================== --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java (original) +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/KeyAnalyzer.java Thu Sep 20 18:29:30 2012 @@ -23,8 +23,8 @@ import java.util.Comparator; * Defines the interface to analyze {@link Trie} keys on a bit level. * {@link KeyAnalyzer}'s methods return the length of the key in bits, * whether or not a bit is set, and bits per element in the key. - * - *

Additionally, a method determines if a key is a prefix of another + *

+ * Additionally, a method determines if a key is a prefix of another * key and returns the bit index where one key is different from another * key (if the key and found key are equal than the return value is * {@link #EQUAL_BIT_KEY}). @@ -52,31 +52,34 @@ public interface KeyAnalyzer extends /** * Returns the number of bits per element in the key. * This is only useful for variable-length keys, such as Strings. + * + * @return the number of bits per element */ public int bitsPerElement(); /** - * Returns the length of the Key in bits. + * Returns the length of the Key in bits. + * + * @param key the key + * @return the bit length of the key */ public int lengthInBits(K key); /** - * Returns whether or not a bit is set + * Returns whether or not a bit is set. */ public boolean isBitSet(K key, int bitIndex, int lengthInBits); /** - * Returns the n-th different bit between key and found. - * This starts the comparison in key at 'keyStart' and goes - * for 'keyLength' bits, and compares to the found key - * starting at 'foundStart' and going for 'foundLength' bits. + * Returns the n-th different bit between key and found. This starts the comparison in + * key at 'keyStart' and goes for 'keyLength' bits, and compares to the found key starting + * at 'foundStart' and going for 'foundLength' bits. */ - public int bitIndex(K key, int offsetInBits, int lengthInBits, - K other, int otherOffsetInBits, int otherLengthInBits); + public int bitIndex(K key, int offsetInBits, int lengthInBits, + K other, int otherOffsetInBits, int otherLengthInBits); /** - * Determines whether or not the given prefix (from offset to length) - * is a prefix of the given key. + * Determines whether or not the given prefix (from offset to length) is a prefix of the given key. */ public boolean isPrefix(K prefix, int offsetInBits, int lengthInBits, K key); } Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java?rev=1388152&r1=1388151&r2=1388152&view=diff ============================================================================== --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java (original) +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/trie/PatriciaTrieBase.java Thu Sep 20 18:29:30 2012 @@ -201,8 +201,7 @@ abstract class PatriciaTrieBase ex } } - throw new IndexOutOfBoundsException("Failed to put: " - + key + " -> " + value + ", " + bitIndex); + throw new IndexOutOfBoundsException("Failed to put: " + key + " -> " + value + ", " + bitIndex); } /**