svn commit: r1437239 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/client/admin/ proxy/src/main/java/org/apache/accumulo/proxy/

[ctubbsii]

Author: ctubbsii
Date: Tue Jan 22 23:57:07 2013
New Revision: 1437239

URL: http://svn.apache.org/viewvc?rev=1437239&view=rev
Log:
ACCUMULO-973 Removed unused import warnings.
ACCUMULO-971 Fixed minor javadoc errors on return tags.

Modified:
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
    
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java?rev=1437239&r1=1437238&r2=1437239&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
 Tue Jan 22 23:57:07 2013
@@ -163,14 +163,13 @@ public class ActiveScan {
   /**
    * @return the authorizations being used for this scan
    */
-    
+  
   public Authorizations getAuthorizations() {
     return authorizations;
   }
   
   /**
    * @return the time this scan has been idle in the tablet server
-   * @return
    */
   public long getIdleTime() {
     return idle;

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java?rev=1437239&r1=1437238&r2=1437239&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
 Tue Jan 22 23:57:07 2013
@@ -82,13 +82,13 @@ public interface InstanceOperations {
    * 
    * @param tserver
    *          The tablet server address should be of the form <ip 
address>:<port>
-   * @return
+   * @return the list of active compactions
    * @throws AccumuloException
    * @throws AccumuloSecurityException
    */
-
+  
   public List<ActiveCompaction> getActiveCompactions(String tserver) throws 
AccumuloException, AccumuloSecurityException;
-
+  
   /**
    * Throws an exception if a tablet server can not be contacted.
    * 

Modified: 
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java?rev=1437239&r1=1437238&r2=1437239&view=diff
==============================================================================
--- 
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
 (original)
+++ 
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
 Tue Jan 22 23:57:07 2013
@@ -20,10 +20,8 @@ import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.iterators.user.RegExFilter;
@@ -31,7 +29,6 @@ import org.apache.accumulo.proxy.thrift.
 import org.apache.accumulo.proxy.thrift.PColumnUpdate;
 import org.apache.accumulo.proxy.thrift.PKey;
 import org.apache.accumulo.proxy.thrift.PScanResult;
-import org.apache.accumulo.proxy.thrift.PTablePermission;
 import org.apache.accumulo.proxy.thrift.PTimeType;
 import org.apache.accumulo.proxy.thrift.UserPass;
 import org.apache.thrift.protocol.TCompactProtocol;