svn commit: r1382985 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ lucene/ solr/ solr/core/src/java/org/apache/solr/cloud/ solr/core/src/java/org/apache/solr/core/ solr/core/src/java/org/apache/solr/spelling/

[sa...@apache.org]

Author: sarowe
Date: Mon Sep 10 17:05:17 2012
New Revision: 1382985

URL: http://svn.apache.org/viewvc?rev=1382985&view=rev
Log:
Remove useless javadocs that trigger warnings and build failures for some people (merge trunk r1382976)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java?rev=1382985&r1=1382984&r2=1382985&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java Mon Sep 10 17:05:17 2012
@@ -161,9 +161,6 @@ public  class LeaderElector {
   
   /**
    * Returns int given String of form n_0000000001 or n_0000000003, etc.
-   * 
-   * @param nStringSequence
-   * @return
    */
   private int getSeq(String nStringSequence) {
     int seq = 0;
@@ -191,9 +188,6 @@ public  class LeaderElector {
   
   /**
    * Returns int list given list of form n_0000000001, n_0000000003, etc.
-   * 
-   * @param seqs
-   * @return
    */
   private List<Integer> getSeqs(List<String> seqs) {
     List<Integer> intSeqs = new ArrayList<Integer>(seqs.size());

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1382985&r1=1382984&r2=1382985&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Mon Sep 10 17:05:17 2012
@@ -657,12 +657,6 @@ public final class ZkController {
   
   /**
    * Get leader props directly from zk nodes.
-   * 
-   * @param collection
-   * @param slice
-   * @return
-   * @throws KeeperException
-   * @throws InterruptedException
    */
   private ZkCoreNodeProps getLeaderProps(final String collection,
       final String slice) throws InterruptedException {

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java?rev=1382985&r1=1382984&r2=1382985&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java Mon Sep 10 17:05:17 2012
@@ -245,13 +245,6 @@ public abstract class CachingDirectoryFa
     close(directory);
   }
   
-  /**
-   * @param dir
-   * @param lockPath
-   * @param rawLockType
-   * @return
-   * @throws IOException
-   */
   private static Directory injectLockFactory(Directory dir, String lockPath,
       String rawLockType) throws IOException {
     if (null == rawLockType) {

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java?rev=1382985&r1=1382984&r2=1382985&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java Mon Sep 10 17:05:17 2012
@@ -177,8 +177,6 @@ public class PossibilityIterator impleme
    * Rank here is the sum of each selected term's position in its respective
    * LinkedHashMap.
    * </p>
-   * 
-   * @return
    */
   private RankedSpellPossibility internalNext() {
     if (nextOnes != null && nextOnes.hasNext()) {