Return-Path: 
 <accumulo-commits-return-1288-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-accumulo-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 BF9DC90F6
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Wed, 21 Mar 2012 16:00:57 +0000 (UTC)
Received: (qmail 5626 invoked by uid 500); 21 Mar 2012 16:00:57 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 5594 invoked by uid 500); 21 Mar 2012 16:00:57 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 5586 invoked by uid 99); 21 Mar 2012 16:00:57 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2012 16:00:57 +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; Wed, 21 Mar 2012 16:00:56 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8C5842388B9B;
	Wed, 21 Mar 2012 16:00:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1303454 -
 /incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
Date: Wed, 21 Mar 2012 16:00:36 -0000
To: accumulo-commits@incubator.apache.org
From: ecn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120321160036.8C5842388B9B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ecn
Date: Wed Mar 21 16:00:36 2012
New Revision: 1303454

URL: http://svn.apache.org/viewvc?rev=1303454&view=rev
Log:
ACCUMULO-477 fix javadocs

Modified:
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1303454&r1=1303453&r2=1303454&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java Wed Mar 21 16:00:36 2012
@@ -112,7 +112,7 @@ public class IteratorSetting {
    * Get the configuration parameters for this iterator.
    * 
    * @return the properties
-   * @deprecated Since 1.4.1, see {@link IteratorSetting.getOptions}
+   * @deprecated Since 1.4.1, see {@link #getOptions()}
    */
   public Map<String,String> getProperties() {
     return properties;
@@ -123,7 +123,7 @@ public class IteratorSetting {
    * 
    * @param properties
    *          the properties to set
-   * @deprecated Since 1.4.1, see {@link IteratorSetting.clearOptions} and {@link IteratorSetting.setOptions}
+   * @deprecated Since 1.4.1, see {@link #clearOptions()} and {@link #addOptions(Map)}
    */
   public void setProperties(Map<String,String> properties) {
     this.properties.clear();
@@ -132,7 +132,7 @@ public class IteratorSetting {
   
   /**
    * @return <tt>true</tt> if this iterator has configuration parameters.
-   * @deprecated Since 1.4.1, see {@link IteratorSetting.getOptions} and test {@link Map.isEmpty}
+   * @deprecated Since 1.4.1, see {@link #getOptions()} and test {@link Map#isEmpty()}
    */
   public boolean hasProperties() {
     return !properties.isEmpty();
@@ -169,7 +169,7 @@ public class IteratorSetting {
     setName(name);
     setIteratorClass(iteratorClass);
     this.properties = new HashMap<String,String>();
-    setProperties(properties);
+    addOptions(properties);
   }
   
   /**