Return-Path: 
 <accumulo-commits-return-1021-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 AEB339B1C
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Thu,  9 Feb 2012 20:52:01 +0000 (UTC)
Received: (qmail 67713 invoked by uid 500); 9 Feb 2012 20:52:01 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 67678 invoked by uid 500); 9 Feb 2012 20:52:01 -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 67670 invoked by uid 99); 9 Feb 2012 20:52:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Feb 2012 20:52:01 +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, 09 Feb 2012 20:52:00 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3613F2388860;
	Thu,  9 Feb 2012 20:51:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1242520 -
 /incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Date: Thu, 09 Feb 2012 20:51:40 -0000
To: accumulo-commits@incubator.apache.org
From: kturner@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120209205140.3613F2388860@eris.apache.org>

Author: kturner
Date: Thu Feb  9 20:51:39 2012
New Revision: 1242520

URL: http://svn.apache.org/viewvc?rev=1242520&view=rev
Log:
ACCUMULO-303 Committing some parts of per table formatter patch I missed.  

Modified:
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1242520&r1=1242519&r2=1242520&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Thu Feb  9 20:51:39 2012
@@ -461,14 +461,6 @@ public class Shell {
     else
       sb.append("- Authorization timeout: ").append(String.format("%.2fs\n", authTimeout / 1000.0));
     sb.append("- Debug: ").append(isDebuggingEnabled() ? "on" : "off").append("\n");
-    if (!tableFormatters.isEmpty()) {
-      sb.append("- Active Formatters");
-      for (Entry<String,Class<? extends Formatter>> entry : tableFormatters.entrySet()) {
-        if (null != entry.getValue()) {
-          sb.append("-    Table: ").append(entry.getKey()).append(", ").append(entry.getValue().getName()).append("\n");
-        }
-      }
-    }
     if (!scanIteratorOptions.isEmpty()) {
       for (Entry<String,List<IteratorSetting>> entry : scanIteratorOptions.entrySet()) {
         sb.append("- Session scan iterators for table ").append(entry.getKey()).append(":\n");
@@ -1002,10 +994,6 @@ public class Shell {
   public AuthInfo getCredentials() {
     return credentials;
   }
-  
-  public void setFormatterClass(String tableName, Class<? extends Formatter> formatter) {
-    this.tableFormatters.put(tableName, formatter);
-  }
 
   /**
    * Return the formatter for this table, .