incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1189806 [16/46] - in /incubator/accumulo: branches/1.3/contrib/ branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/ branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/ branches/1.3/src/core/src/main/...
Date Thu, 27 Oct 2011 15:25:17 GMT
Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java Thu Oct 27 15:24:51 2011
@@ -5,24 +5,22 @@
  */
 package org.apache.accumulo.core.master.thrift;
 
-
-
 import org.apache.thrift.*;
 import org.apache.thrift.meta_data.*;
 import org.apache.thrift.protocol.*;
 
 @SuppressWarnings("serial")
-public class TabletServerStatus implements TBase<TabletServerStatus, TabletServerStatus._Fields>, java.io.Serializable, Cloneable {
+public class TabletServerStatus implements TBase<TabletServerStatus,TabletServerStatus._Fields>, java.io.Serializable, Cloneable {
   private static final TStruct STRUCT_DESC = new TStruct("TabletServerStatus");
-
-  private static final TField TABLE_MAP_FIELD_DESC = new TField("tableMap", TType.MAP, (short)1);
-  private static final TField LAST_CONTACT_FIELD_DESC = new TField("lastContact", TType.I64, (short)2);
-  private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)3);
-  private static final TField OS_LOAD_FIELD_DESC = new TField("osLoad", TType.DOUBLE, (short)5);
-  private static final TField HOLD_TIME_FIELD_DESC = new TField("holdTime", TType.I64, (short)7);
-  private static final TField LOOKUPS_FIELD_DESC = new TField("lookups", TType.I64, (short)8);
-  private static final TField LOGGERS_FIELD_DESC = new TField("loggers", TType.SET, (short)9);
-
+  
+  private static final TField TABLE_MAP_FIELD_DESC = new TField("tableMap", TType.MAP, (short) 1);
+  private static final TField LAST_CONTACT_FIELD_DESC = new TField("lastContact", TType.I64, (short) 2);
+  private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short) 3);
+  private static final TField OS_LOAD_FIELD_DESC = new TField("osLoad", TType.DOUBLE, (short) 5);
+  private static final TField HOLD_TIME_FIELD_DESC = new TField("holdTime", TType.I64, (short) 7);
+  private static final TField LOOKUPS_FIELD_DESC = new TField("lookups", TType.I64, (short) 8);
+  private static final TField LOGGERS_FIELD_DESC = new TField("loggers", TType.SET, (short) 9);
+  
   public java.util.Map<String,TableInfo> tableMap;
   public long lastContact;
   public String name;
@@ -30,30 +28,25 @@ public class TabletServerStatus implemen
   public long holdTime;
   public long lookups;
   public java.util.Set<String> loggers;
-
+  
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements TFieldIdEnum {
-    TABLE_MAP((short)1, "tableMap"),
-    LAST_CONTACT((short)2, "lastContact"),
-    NAME((short)3, "name"),
-    OS_LOAD((short)5, "osLoad"),
-    HOLD_TIME((short)7, "holdTime"),
-    LOOKUPS((short)8, "lookups"),
-    LOGGERS((short)9, "loggers");
-
-    private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+    TABLE_MAP((short) 1, "tableMap"), LAST_CONTACT((short) 2, "lastContact"), NAME((short) 3, "name"), OS_LOAD((short) 5, "osLoad"), HOLD_TIME((short) 7,
+        "holdTime"), LOOKUPS((short) 8, "lookups"), LOGGERS((short) 9, "loggers");
+    
+    private static final java.util.Map<String,_Fields> byName = new java.util.HashMap<String,_Fields>();
+    
     static {
       for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
-
+    
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
     public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
+      switch (fieldId) {
         case 1: // TABLE_MAP
           return TABLE_MAP;
         case 2: // LAST_CONTACT
@@ -72,84 +65,67 @@ public class TabletServerStatus implemen
           return null;
       }
     }
-
+    
     /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
+     * Find the _Fields constant that matches fieldId, throwing an exception if it is not found.
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null)
+        throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
-
+    
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
     public static _Fields findByName(String name) {
       return byName.get(name);
     }
-
+    
     private final short _thriftId;
     private final String _fieldName;
-
+    
     _Fields(short thriftId, String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
-
+    
     public short getThriftFieldId() {
       return _thriftId;
     }
-
+    
     public String getFieldName() {
       return _fieldName;
     }
   }
-
+  
   // isset id assignments
   private static final int __LASTCONTACT_ISSET_ID = 0;
   private static final int __OSLOAD_ISSET_ID = 1;
   private static final int __HOLDTIME_ISSET_ID = 2;
   private static final int __LOOKUPS_ISSET_ID = 3;
   private java.util.BitSet __isset_bit_vector = new java.util.BitSet(4);
-
-  public static final java.util.Map<_Fields, FieldMetaData> metaDataMap;
+  
+  public static final java.util.Map<_Fields,FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.TABLE_MAP, new FieldMetaData("tableMap", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new StructMetaData(TType.STRUCT, TableInfo.class))));
-    tmpMap.put(_Fields.LAST_CONTACT, new FieldMetaData("lastContact", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-    tmpMap.put(_Fields.NAME, new FieldMetaData("name", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.OS_LOAD, new FieldMetaData("osLoad", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.DOUBLE)));
-    tmpMap.put(_Fields.HOLD_TIME, new FieldMetaData("holdTime", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-    tmpMap.put(_Fields.LOOKUPS, new FieldMetaData("lookups", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I64)));
-    tmpMap.put(_Fields.LOGGERS, new FieldMetaData("loggers", TFieldRequirementType.DEFAULT, 
-        new SetMetaData(TType.SET, 
-            new FieldValueMetaData(TType.STRING))));
+    java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.TABLE_MAP, new FieldMetaData("tableMap", TFieldRequirementType.DEFAULT, new MapMetaData(TType.MAP, new FieldValueMetaData(TType.STRING),
+        new StructMetaData(TType.STRUCT, TableInfo.class))));
+    tmpMap.put(_Fields.LAST_CONTACT, new FieldMetaData("lastContact", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+    tmpMap.put(_Fields.NAME, new FieldMetaData("name", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRING)));
+    tmpMap.put(_Fields.OS_LOAD, new FieldMetaData("osLoad", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.DOUBLE)));
+    tmpMap.put(_Fields.HOLD_TIME, new FieldMetaData("holdTime", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+    tmpMap.put(_Fields.LOOKUPS, new FieldMetaData("lookups", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.I64)));
+    tmpMap.put(_Fields.LOGGERS, new FieldMetaData("loggers", TFieldRequirementType.DEFAULT, new SetMetaData(TType.SET, new FieldValueMetaData(TType.STRING))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     FieldMetaData.addStructMetaDataMap(TabletServerStatus.class, metaDataMap);
   }
-
-  public TabletServerStatus() {
-  }
-
-  public TabletServerStatus(
-    java.util.Map<String,TableInfo> tableMap,
-    long lastContact,
-    String name,
-    double osLoad,
-    long holdTime,
-    long lookups,
-    java.util.Set<String> loggers)
-  {
+  
+  public TabletServerStatus() {}
+  
+  public TabletServerStatus(java.util.Map<String,TableInfo> tableMap, long lastContact, String name, double osLoad, long holdTime, long lookups,
+      java.util.Set<String> loggers) {
     this();
     this.tableMap = tableMap;
     this.lastContact = lastContact;
@@ -163,7 +139,7 @@ public class TabletServerStatus implemen
     setLookupsIsSet(true);
     this.loggers = loggers;
   }
-
+  
   /**
    * Performs a deep copy on <i>other</i>.
    */
@@ -172,15 +148,15 @@ public class TabletServerStatus implemen
     __isset_bit_vector.or(other.__isset_bit_vector);
     if (other.isSetTableMap()) {
       java.util.Map<String,TableInfo> __this__tableMap = new java.util.HashMap<String,TableInfo>();
-      for (java.util.Map.Entry<String, TableInfo> other_element : other.tableMap.entrySet()) {
-
+      for (java.util.Map.Entry<String,TableInfo> other_element : other.tableMap.entrySet()) {
+        
         String other_element_key = other_element.getKey();
         TableInfo other_element_value = other_element.getValue();
-
+        
         String __this__tableMap_copy_key = other_element_key;
-
+        
         TableInfo __this__tableMap_copy_value = new TableInfo(other_element_value);
-
+        
         __this__tableMap.put(__this__tableMap_copy_key, __this__tableMap_copy_value);
       }
       this.tableMap = __this__tableMap;
@@ -200,341 +176,341 @@ public class TabletServerStatus implemen
       this.loggers = __this__loggers;
     }
   }
-
+  
   public TabletServerStatus deepCopy() {
     return new TabletServerStatus(this);
   }
-
+  
   @Deprecated
   public TabletServerStatus clone() {
     return new TabletServerStatus(this);
   }
-
+  
   public int getTableMapSize() {
     return (this.tableMap == null) ? 0 : this.tableMap.size();
   }
-
+  
   public void putToTableMap(String key, TableInfo val) {
     if (this.tableMap == null) {
       this.tableMap = new java.util.HashMap<String,TableInfo>();
     }
     this.tableMap.put(key, val);
   }
-
+  
   public java.util.Map<String,TableInfo> getTableMap() {
     return this.tableMap;
   }
-
+  
   public TabletServerStatus setTableMap(java.util.Map<String,TableInfo> tableMap) {
     this.tableMap = tableMap;
     return this;
   }
-
+  
   public void unsetTableMap() {
     this.tableMap = null;
   }
-
+  
   /** Returns true if field tableMap is set (has been asigned a value) and false otherwise */
   public boolean isSetTableMap() {
     return this.tableMap != null;
   }
-
+  
   public void setTableMapIsSet(boolean value) {
     if (!value) {
       this.tableMap = null;
     }
   }
-
+  
   public long getLastContact() {
     return this.lastContact;
   }
-
+  
   public TabletServerStatus setLastContact(long lastContact) {
     this.lastContact = lastContact;
     setLastContactIsSet(true);
     return this;
   }
-
+  
   public void unsetLastContact() {
     __isset_bit_vector.clear(__LASTCONTACT_ISSET_ID);
   }
-
+  
   /** Returns true if field lastContact is set (has been asigned a value) and false otherwise */
   public boolean isSetLastContact() {
     return __isset_bit_vector.get(__LASTCONTACT_ISSET_ID);
   }
-
+  
   public void setLastContactIsSet(boolean value) {
     __isset_bit_vector.set(__LASTCONTACT_ISSET_ID, value);
   }
-
+  
   public String getName() {
     return this.name;
   }
-
+  
   public TabletServerStatus setName(String name) {
     this.name = name;
     return this;
   }
-
+  
   public void unsetName() {
     this.name = null;
   }
-
+  
   /** Returns true if field name is set (has been asigned a value) and false otherwise */
   public boolean isSetName() {
     return this.name != null;
   }
-
+  
   public void setNameIsSet(boolean value) {
     if (!value) {
       this.name = null;
     }
   }
-
+  
   public double getOsLoad() {
     return this.osLoad;
   }
-
+  
   public TabletServerStatus setOsLoad(double osLoad) {
     this.osLoad = osLoad;
     setOsLoadIsSet(true);
     return this;
   }
-
+  
   public void unsetOsLoad() {
     __isset_bit_vector.clear(__OSLOAD_ISSET_ID);
   }
-
+  
   /** Returns true if field osLoad is set (has been asigned a value) and false otherwise */
   public boolean isSetOsLoad() {
     return __isset_bit_vector.get(__OSLOAD_ISSET_ID);
   }
-
+  
   public void setOsLoadIsSet(boolean value) {
     __isset_bit_vector.set(__OSLOAD_ISSET_ID, value);
   }
-
+  
   public long getHoldTime() {
     return this.holdTime;
   }
-
+  
   public TabletServerStatus setHoldTime(long holdTime) {
     this.holdTime = holdTime;
     setHoldTimeIsSet(true);
     return this;
   }
-
+  
   public void unsetHoldTime() {
     __isset_bit_vector.clear(__HOLDTIME_ISSET_ID);
   }
-
+  
   /** Returns true if field holdTime is set (has been asigned a value) and false otherwise */
   public boolean isSetHoldTime() {
     return __isset_bit_vector.get(__HOLDTIME_ISSET_ID);
   }
-
+  
   public void setHoldTimeIsSet(boolean value) {
     __isset_bit_vector.set(__HOLDTIME_ISSET_ID, value);
   }
-
+  
   public long getLookups() {
     return this.lookups;
   }
-
+  
   public TabletServerStatus setLookups(long lookups) {
     this.lookups = lookups;
     setLookupsIsSet(true);
     return this;
   }
-
+  
   public void unsetLookups() {
     __isset_bit_vector.clear(__LOOKUPS_ISSET_ID);
   }
-
+  
   /** Returns true if field lookups is set (has been asigned a value) and false otherwise */
   public boolean isSetLookups() {
     return __isset_bit_vector.get(__LOOKUPS_ISSET_ID);
   }
-
+  
   public void setLookupsIsSet(boolean value) {
     __isset_bit_vector.set(__LOOKUPS_ISSET_ID, value);
   }
-
+  
   public int getLoggersSize() {
     return (this.loggers == null) ? 0 : this.loggers.size();
   }
-
+  
   public java.util.Iterator<String> getLoggersIterator() {
     return (this.loggers == null) ? null : this.loggers.iterator();
   }
-
+  
   public void addToLoggers(String elem) {
     if (this.loggers == null) {
       this.loggers = new java.util.HashSet<String>();
     }
     this.loggers.add(elem);
   }
-
+  
   public java.util.Set<String> getLoggers() {
     return this.loggers;
   }
-
+  
   public TabletServerStatus setLoggers(java.util.Set<String> loggers) {
     this.loggers = loggers;
     return this;
   }
-
+  
   public void unsetLoggers() {
     this.loggers = null;
   }
-
+  
   /** Returns true if field loggers is set (has been asigned a value) and false otherwise */
   public boolean isSetLoggers() {
     return this.loggers != null;
   }
-
+  
   public void setLoggersIsSet(boolean value) {
     if (!value) {
       this.loggers = null;
     }
   }
-
+  
   @SuppressWarnings("unchecked")
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case TABLE_MAP:
-      if (value == null) {
-        unsetTableMap();
-      } else {
-        setTableMap((java.util.Map<String,TableInfo>)value);
-      }
-      break;
-
-    case LAST_CONTACT:
-      if (value == null) {
-        unsetLastContact();
-      } else {
-        setLastContact((Long)value);
-      }
-      break;
-
-    case NAME:
-      if (value == null) {
-        unsetName();
-      } else {
-        setName((String)value);
-      }
-      break;
-
-    case OS_LOAD:
-      if (value == null) {
-        unsetOsLoad();
-      } else {
-        setOsLoad((Double)value);
-      }
-      break;
-
-    case HOLD_TIME:
-      if (value == null) {
-        unsetHoldTime();
-      } else {
-        setHoldTime((Long)value);
-      }
-      break;
-
-    case LOOKUPS:
-      if (value == null) {
-        unsetLookups();
-      } else {
-        setLookups((Long)value);
-      }
-      break;
-
-    case LOGGERS:
-      if (value == null) {
-        unsetLoggers();
-      } else {
-        setLoggers((java.util.Set<String>)value);
-      }
-      break;
-
+      case TABLE_MAP:
+        if (value == null) {
+          unsetTableMap();
+        } else {
+          setTableMap((java.util.Map<String,TableInfo>) value);
+        }
+        break;
+      
+      case LAST_CONTACT:
+        if (value == null) {
+          unsetLastContact();
+        } else {
+          setLastContact((Long) value);
+        }
+        break;
+      
+      case NAME:
+        if (value == null) {
+          unsetName();
+        } else {
+          setName((String) value);
+        }
+        break;
+      
+      case OS_LOAD:
+        if (value == null) {
+          unsetOsLoad();
+        } else {
+          setOsLoad((Double) value);
+        }
+        break;
+      
+      case HOLD_TIME:
+        if (value == null) {
+          unsetHoldTime();
+        } else {
+          setHoldTime((Long) value);
+        }
+        break;
+      
+      case LOOKUPS:
+        if (value == null) {
+          unsetLookups();
+        } else {
+          setLookups((Long) value);
+        }
+        break;
+      
+      case LOGGERS:
+        if (value == null) {
+          unsetLoggers();
+        } else {
+          setLoggers((java.util.Set<String>) value);
+        }
+        break;
+    
     }
   }
-
+  
   public void setFieldValue(int fieldID, Object value) {
     setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
   }
-
+  
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case TABLE_MAP:
-      return getTableMap();
-
-    case LAST_CONTACT:
-      return new Long(getLastContact());
-
-    case NAME:
-      return getName();
-
-    case OS_LOAD:
-      return new Double(getOsLoad());
-
-    case HOLD_TIME:
-      return new Long(getHoldTime());
-
-    case LOOKUPS:
-      return new Long(getLookups());
-
-    case LOGGERS:
-      return getLoggers();
-
+      case TABLE_MAP:
+        return getTableMap();
+        
+      case LAST_CONTACT:
+        return new Long(getLastContact());
+        
+      case NAME:
+        return getName();
+        
+      case OS_LOAD:
+        return new Double(getOsLoad());
+        
+      case HOLD_TIME:
+        return new Long(getHoldTime());
+        
+      case LOOKUPS:
+        return new Long(getLookups());
+        
+      case LOGGERS:
+        return getLoggers();
+        
     }
     throw new IllegalStateException();
   }
-
+  
   public Object getFieldValue(int fieldId) {
     return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
   }
-
+  
   /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     switch (field) {
-    case TABLE_MAP:
-      return isSetTableMap();
-    case LAST_CONTACT:
-      return isSetLastContact();
-    case NAME:
-      return isSetName();
-    case OS_LOAD:
-      return isSetOsLoad();
-    case HOLD_TIME:
-      return isSetHoldTime();
-    case LOOKUPS:
-      return isSetLookups();
-    case LOGGERS:
-      return isSetLoggers();
+      case TABLE_MAP:
+        return isSetTableMap();
+      case LAST_CONTACT:
+        return isSetLastContact();
+      case NAME:
+        return isSetName();
+      case OS_LOAD:
+        return isSetOsLoad();
+      case HOLD_TIME:
+        return isSetHoldTime();
+      case LOOKUPS:
+        return isSetLookups();
+      case LOGGERS:
+        return isSetLoggers();
     }
     throw new IllegalStateException();
   }
-
+  
   public boolean isSet(int fieldID) {
     return isSet(_Fields.findByThriftIdOrThrow(fieldID));
   }
-
+  
   @Override
   public boolean equals(Object that) {
     if (that == null)
       return false;
     if (that instanceof TabletServerStatus)
-      return this.equals((TabletServerStatus)that);
+      return this.equals((TabletServerStatus) that);
     return false;
   }
-
+  
   public boolean equals(TabletServerStatus that) {
     if (that == null)
       return false;
-
+    
     boolean this_present_tableMap = true && this.isSetTableMap();
     boolean that_present_tableMap = true && that.isSetTableMap();
     if (this_present_tableMap || that_present_tableMap) {
@@ -543,7 +519,7 @@ public class TabletServerStatus implemen
       if (!this.tableMap.equals(that.tableMap))
         return false;
     }
-
+    
     boolean this_present_lastContact = true;
     boolean that_present_lastContact = true;
     if (this_present_lastContact || that_present_lastContact) {
@@ -552,7 +528,7 @@ public class TabletServerStatus implemen
       if (this.lastContact != that.lastContact)
         return false;
     }
-
+    
     boolean this_present_name = true && this.isSetName();
     boolean that_present_name = true && that.isSetName();
     if (this_present_name || that_present_name) {
@@ -561,7 +537,7 @@ public class TabletServerStatus implemen
       if (!this.name.equals(that.name))
         return false;
     }
-
+    
     boolean this_present_osLoad = true;
     boolean that_present_osLoad = true;
     if (this_present_osLoad || that_present_osLoad) {
@@ -570,7 +546,7 @@ public class TabletServerStatus implemen
       if (this.osLoad != that.osLoad)
         return false;
     }
-
+    
     boolean this_present_holdTime = true;
     boolean that_present_holdTime = true;
     if (this_present_holdTime || that_present_holdTime) {
@@ -579,7 +555,7 @@ public class TabletServerStatus implemen
       if (this.holdTime != that.holdTime)
         return false;
     }
-
+    
     boolean this_present_lookups = true;
     boolean that_present_lookups = true;
     if (this_present_lookups || that_present_lookups) {
@@ -588,7 +564,7 @@ public class TabletServerStatus implemen
       if (this.lookups != that.lookups)
         return false;
     }
-
+    
     boolean this_present_loggers = true && this.isSetLoggers();
     boolean that_present_loggers = true && that.isSetLoggers();
     if (this_present_loggers || that_present_loggers) {
@@ -597,28 +573,29 @@ public class TabletServerStatus implemen
       if (!this.loggers.equals(that.loggers))
         return false;
     }
-
+    
     return true;
   }
-
+  
   @Override
   public int hashCode() {
     return 0;
   }
-
+  
   public int compareTo(TabletServerStatus other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
-
+    
     int lastComparison = 0;
-    TabletServerStatus typedOther = (TabletServerStatus)other;
-
+    TabletServerStatus typedOther = (TabletServerStatus) other;
+    
     lastComparison = Boolean.valueOf(isSetTableMap()).compareTo(typedOther.isSetTableMap());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetTableMap()) {      lastComparison = TBaseHelper.compareTo(this.tableMap, typedOther.tableMap);
+    if (isSetTableMap()) {
+      lastComparison = TBaseHelper.compareTo(this.tableMap, typedOther.tableMap);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -627,7 +604,8 @@ public class TabletServerStatus implemen
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetLastContact()) {      lastComparison = TBaseHelper.compareTo(this.lastContact, typedOther.lastContact);
+    if (isSetLastContact()) {
+      lastComparison = TBaseHelper.compareTo(this.lastContact, typedOther.lastContact);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -636,7 +614,8 @@ public class TabletServerStatus implemen
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetName()) {      lastComparison = TBaseHelper.compareTo(this.name, typedOther.name);
+    if (isSetName()) {
+      lastComparison = TBaseHelper.compareTo(this.name, typedOther.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -645,7 +624,8 @@ public class TabletServerStatus implemen
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetOsLoad()) {      lastComparison = TBaseHelper.compareTo(this.osLoad, typedOther.osLoad);
+    if (isSetOsLoad()) {
+      lastComparison = TBaseHelper.compareTo(this.osLoad, typedOther.osLoad);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -654,7 +634,8 @@ public class TabletServerStatus implemen
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetHoldTime()) {      lastComparison = TBaseHelper.compareTo(this.holdTime, typedOther.holdTime);
+    if (isSetHoldTime()) {
+      lastComparison = TBaseHelper.compareTo(this.holdTime, typedOther.holdTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -663,7 +644,8 @@ public class TabletServerStatus implemen
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetLookups()) {      lastComparison = TBaseHelper.compareTo(this.lookups, typedOther.lookups);
+    if (isSetLookups()) {
+      lastComparison = TBaseHelper.compareTo(this.lookups, typedOther.lookups);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -672,21 +654,21 @@ public class TabletServerStatus implemen
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetLoggers()) {      lastComparison = TBaseHelper.compareTo(this.loggers, typedOther.loggers);
+    if (isSetLoggers()) {
+      lastComparison = TBaseHelper.compareTo(this.loggers, typedOther.loggers);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
     return 0;
   }
-
+  
   public void read(TProtocol iprot) throws TException {
     TField field;
     iprot.readStructBegin();
-    while (true)
-    {
+    while (true) {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == TType.STOP) {
         break;
       }
       switch (field.id) {
@@ -694,9 +676,8 @@ public class TabletServerStatus implemen
           if (field.type == TType.MAP) {
             {
               TMap _map0 = iprot.readMapBegin();
-              this.tableMap = new java.util.HashMap<String,TableInfo>(2*_map0.size);
-              for (int _i1 = 0; _i1 < _map0.size; ++_i1)
-              {
+              this.tableMap = new java.util.HashMap<String,TableInfo>(2 * _map0.size);
+              for (int _i1 = 0; _i1 < _map0.size; ++_i1) {
                 String _key2;
                 TableInfo _val3;
                 _key2 = iprot.readString();
@@ -706,7 +687,7 @@ public class TabletServerStatus implemen
               }
               iprot.readMapEnd();
             }
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -714,14 +695,14 @@ public class TabletServerStatus implemen
           if (field.type == TType.I64) {
             this.lastContact = iprot.readI64();
             setLastContactIsSet(true);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // NAME
           if (field.type == TType.STRING) {
             this.name = iprot.readString();
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -729,7 +710,7 @@ public class TabletServerStatus implemen
           if (field.type == TType.DOUBLE) {
             this.osLoad = iprot.readDouble();
             setOsLoadIsSet(true);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -737,7 +718,7 @@ public class TabletServerStatus implemen
           if (field.type == TType.I64) {
             this.holdTime = iprot.readI64();
             setHoldTimeIsSet(true);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -745,7 +726,7 @@ public class TabletServerStatus implemen
           if (field.type == TType.I64) {
             this.lookups = iprot.readI64();
             setLookupsIsSet(true);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -753,16 +734,15 @@ public class TabletServerStatus implemen
           if (field.type == TType.SET) {
             {
               TSet _set4 = iprot.readSetBegin();
-              this.loggers = new java.util.HashSet<String>(2*_set4.size);
-              for (int _i5 = 0; _i5 < _set4.size; ++_i5)
-              {
+              this.loggers = new java.util.HashSet<String>(2 * _set4.size);
+              for (int _i5 = 0; _i5 < _set4.size; ++_i5) {
                 String _elem6;
                 _elem6 = iprot.readString();
                 this.loggers.add(_elem6);
               }
               iprot.readSetEnd();
             }
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -772,21 +752,20 @@ public class TabletServerStatus implemen
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
-
+    
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
-
+  
   public void write(TProtocol oprot) throws TException {
     validate();
-
+    
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.tableMap != null) {
       oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC);
       {
         oprot.writeMapBegin(new TMap(TType.STRING, TType.STRUCT, this.tableMap.size()));
-        for (java.util.Map.Entry<String, TableInfo> _iter7 : this.tableMap.entrySet())
-        {
+        for (java.util.Map.Entry<String,TableInfo> _iter7 : this.tableMap.entrySet()) {
           oprot.writeString(_iter7.getKey());
           _iter7.getValue().write(oprot);
         }
@@ -815,8 +794,7 @@ public class TabletServerStatus implemen
       oprot.writeFieldBegin(LOGGERS_FIELD_DESC);
       {
         oprot.writeSetBegin(new TSet(TType.STRING, this.loggers.size()));
-        for (String _iter8 : this.loggers)
-        {
+        for (String _iter8 : this.loggers) {
           oprot.writeString(_iter8);
         }
         oprot.writeSetEnd();
@@ -826,7 +804,7 @@ public class TabletServerStatus implemen
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
-
+  
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder("TabletServerStatus(");
@@ -865,10 +843,9 @@ public class TabletServerStatus implemen
     sb.append(")");
     return sb.toString();
   }
-
+  
   public void validate() throws TException {
     // check for required fields
   }
-
+  
 }
-

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java Thu Oct 27 15:24:51 2011
@@ -5,40 +5,37 @@
  */
 package org.apache.accumulo.core.master.thrift;
 
-
-
 import org.apache.thrift.*;
 import org.apache.thrift.meta_data.*;
 import org.apache.thrift.protocol.*;
 
 @SuppressWarnings("serial")
-public class TabletSplit implements TBase<TabletSplit, TabletSplit._Fields>, java.io.Serializable, Cloneable {
+public class TabletSplit implements TBase<TabletSplit,TabletSplit._Fields>, java.io.Serializable, Cloneable {
   private static final TStruct STRUCT_DESC = new TStruct("TabletSplit");
-
-  private static final TField OLD_TABLET_FIELD_DESC = new TField("oldTablet", TType.STRUCT, (short)1);
-  private static final TField NEW_TABLETS_FIELD_DESC = new TField("newTablets", TType.LIST, (short)2);
-
+  
+  private static final TField OLD_TABLET_FIELD_DESC = new TField("oldTablet", TType.STRUCT, (short) 1);
+  private static final TField NEW_TABLETS_FIELD_DESC = new TField("newTablets", TType.LIST, (short) 2);
+  
   public org.apache.accumulo.core.data.thrift.TKeyExtent oldTablet;
   public java.util.List<org.apache.accumulo.core.data.thrift.TKeyExtent> newTablets;
-
+  
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements TFieldIdEnum {
-    OLD_TABLET((short)1, "oldTablet"),
-    NEW_TABLETS((short)2, "newTablets");
-
-    private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+    OLD_TABLET((short) 1, "oldTablet"), NEW_TABLETS((short) 2, "newTablets");
+    
+    private static final java.util.Map<String,_Fields> byName = new java.util.HashMap<String,_Fields>();
+    
     static {
       for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
-
+    
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
     public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
+      switch (fieldId) {
         case 1: // OLD_TABLET
           return OLD_TABLET;
         case 2: // NEW_TABLETS
@@ -47,67 +44,62 @@ public class TabletSplit implements TBas
           return null;
       }
     }
-
+    
     /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
+     * Find the _Fields constant that matches fieldId, throwing an exception if it is not found.
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null)
+        throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
-
+    
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
     public static _Fields findByName(String name) {
       return byName.get(name);
     }
-
+    
     private final short _thriftId;
     private final String _fieldName;
-
+    
     _Fields(short thriftId, String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
-
+    
     public short getThriftFieldId() {
       return _thriftId;
     }
-
+    
     public String getFieldName() {
       return _fieldName;
     }
   }
-
+  
   // isset id assignments
-
-  public static final java.util.Map<_Fields, FieldMetaData> metaDataMap;
+  
+  public static final java.util.Map<_Fields,FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.OLD_TABLET, new FieldMetaData("oldTablet", TFieldRequirementType.DEFAULT, 
-        new StructMetaData(TType.STRUCT, org.apache.accumulo.core.data.thrift.TKeyExtent.class)));
-    tmpMap.put(_Fields.NEW_TABLETS, new FieldMetaData("newTablets", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, org.apache.accumulo.core.data.thrift.TKeyExtent.class))));
+    java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.OLD_TABLET, new FieldMetaData("oldTablet", TFieldRequirementType.DEFAULT, new StructMetaData(TType.STRUCT,
+        org.apache.accumulo.core.data.thrift.TKeyExtent.class)));
+    tmpMap.put(_Fields.NEW_TABLETS, new FieldMetaData("newTablets", TFieldRequirementType.DEFAULT, new ListMetaData(TType.LIST, new StructMetaData(
+        TType.STRUCT, org.apache.accumulo.core.data.thrift.TKeyExtent.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     FieldMetaData.addStructMetaDataMap(TabletSplit.class, metaDataMap);
   }
-
-  public TabletSplit() {
-  }
-
-  public TabletSplit(
-    org.apache.accumulo.core.data.thrift.TKeyExtent oldTablet,
-    java.util.List<org.apache.accumulo.core.data.thrift.TKeyExtent> newTablets)
-  {
+  
+  public TabletSplit() {}
+  
+  public TabletSplit(org.apache.accumulo.core.data.thrift.TKeyExtent oldTablet, java.util.List<org.apache.accumulo.core.data.thrift.TKeyExtent> newTablets) {
     this();
     this.oldTablet = oldTablet;
     this.newTablets = newTablets;
   }
-
+  
   /**
    * Performs a deep copy on <i>other</i>.
    */
@@ -123,149 +115,149 @@ public class TabletSplit implements TBas
       this.newTablets = __this__newTablets;
     }
   }
-
+  
   public TabletSplit deepCopy() {
     return new TabletSplit(this);
   }
-
+  
   @Deprecated
   public TabletSplit clone() {
     return new TabletSplit(this);
   }
-
+  
   public org.apache.accumulo.core.data.thrift.TKeyExtent getOldTablet() {
     return this.oldTablet;
   }
-
+  
   public TabletSplit setOldTablet(org.apache.accumulo.core.data.thrift.TKeyExtent oldTablet) {
     this.oldTablet = oldTablet;
     return this;
   }
-
+  
   public void unsetOldTablet() {
     this.oldTablet = null;
   }
-
+  
   /** Returns true if field oldTablet is set (has been asigned a value) and false otherwise */
   public boolean isSetOldTablet() {
     return this.oldTablet != null;
   }
-
+  
   public void setOldTabletIsSet(boolean value) {
     if (!value) {
       this.oldTablet = null;
     }
   }
-
+  
   public int getNewTabletsSize() {
     return (this.newTablets == null) ? 0 : this.newTablets.size();
   }
-
+  
   public java.util.Iterator<org.apache.accumulo.core.data.thrift.TKeyExtent> getNewTabletsIterator() {
     return (this.newTablets == null) ? null : this.newTablets.iterator();
   }
-
+  
   public void addToNewTablets(org.apache.accumulo.core.data.thrift.TKeyExtent elem) {
     if (this.newTablets == null) {
       this.newTablets = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>();
     }
     this.newTablets.add(elem);
   }
-
+  
   public java.util.List<org.apache.accumulo.core.data.thrift.TKeyExtent> getNewTablets() {
     return this.newTablets;
   }
-
+  
   public TabletSplit setNewTablets(java.util.List<org.apache.accumulo.core.data.thrift.TKeyExtent> newTablets) {
     this.newTablets = newTablets;
     return this;
   }
-
+  
   public void unsetNewTablets() {
     this.newTablets = null;
   }
-
+  
   /** Returns true if field newTablets is set (has been asigned a value) and false otherwise */
   public boolean isSetNewTablets() {
     return this.newTablets != null;
   }
-
+  
   public void setNewTabletsIsSet(boolean value) {
     if (!value) {
       this.newTablets = null;
     }
   }
-
+  
   @SuppressWarnings("unchecked")
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case OLD_TABLET:
-      if (value == null) {
-        unsetOldTablet();
-      } else {
-        setOldTablet((org.apache.accumulo.core.data.thrift.TKeyExtent)value);
-      }
-      break;
-
-    case NEW_TABLETS:
-      if (value == null) {
-        unsetNewTablets();
-      } else {
-        setNewTablets((java.util.List<org.apache.accumulo.core.data.thrift.TKeyExtent>)value);
-      }
-      break;
-
+      case OLD_TABLET:
+        if (value == null) {
+          unsetOldTablet();
+        } else {
+          setOldTablet((org.apache.accumulo.core.data.thrift.TKeyExtent) value);
+        }
+        break;
+      
+      case NEW_TABLETS:
+        if (value == null) {
+          unsetNewTablets();
+        } else {
+          setNewTablets((java.util.List<org.apache.accumulo.core.data.thrift.TKeyExtent>) value);
+        }
+        break;
+    
     }
   }
-
+  
   public void setFieldValue(int fieldID, Object value) {
     setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
   }
-
+  
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case OLD_TABLET:
-      return getOldTablet();
-
-    case NEW_TABLETS:
-      return getNewTablets();
-
+      case OLD_TABLET:
+        return getOldTablet();
+        
+      case NEW_TABLETS:
+        return getNewTablets();
+        
     }
     throw new IllegalStateException();
   }
-
+  
   public Object getFieldValue(int fieldId) {
     return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
   }
-
+  
   /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     switch (field) {
-    case OLD_TABLET:
-      return isSetOldTablet();
-    case NEW_TABLETS:
-      return isSetNewTablets();
+      case OLD_TABLET:
+        return isSetOldTablet();
+      case NEW_TABLETS:
+        return isSetNewTablets();
     }
     throw new IllegalStateException();
   }
-
+  
   public boolean isSet(int fieldID) {
     return isSet(_Fields.findByThriftIdOrThrow(fieldID));
   }
-
+  
   @Override
   public boolean equals(Object that) {
     if (that == null)
       return false;
     if (that instanceof TabletSplit)
-      return this.equals((TabletSplit)that);
+      return this.equals((TabletSplit) that);
     return false;
   }
-
+  
   public boolean equals(TabletSplit that) {
     if (that == null)
       return false;
-
+    
     boolean this_present_oldTablet = true && this.isSetOldTablet();
     boolean that_present_oldTablet = true && that.isSetOldTablet();
     if (this_present_oldTablet || that_present_oldTablet) {
@@ -274,7 +266,7 @@ public class TabletSplit implements TBas
       if (!this.oldTablet.equals(that.oldTablet))
         return false;
     }
-
+    
     boolean this_present_newTablets = true && this.isSetNewTablets();
     boolean that_present_newTablets = true && that.isSetNewTablets();
     if (this_present_newTablets || that_present_newTablets) {
@@ -283,28 +275,29 @@ public class TabletSplit implements TBas
       if (!this.newTablets.equals(that.newTablets))
         return false;
     }
-
+    
     return true;
   }
-
+  
   @Override
   public int hashCode() {
     return 0;
   }
-
+  
   public int compareTo(TabletSplit other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
-
+    
     int lastComparison = 0;
-    TabletSplit typedOther = (TabletSplit)other;
-
+    TabletSplit typedOther = (TabletSplit) other;
+    
     lastComparison = Boolean.valueOf(isSetOldTablet()).compareTo(typedOther.isSetOldTablet());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetOldTablet()) {      lastComparison = TBaseHelper.compareTo(this.oldTablet, typedOther.oldTablet);
+    if (isSetOldTablet()) {
+      lastComparison = TBaseHelper.compareTo(this.oldTablet, typedOther.oldTablet);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -313,21 +306,21 @@ public class TabletSplit implements TBas
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetNewTablets()) {      lastComparison = TBaseHelper.compareTo(this.newTablets, typedOther.newTablets);
+    if (isSetNewTablets()) {
+      lastComparison = TBaseHelper.compareTo(this.newTablets, typedOther.newTablets);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
     return 0;
   }
-
+  
   public void read(TProtocol iprot) throws TException {
     TField field;
     iprot.readStructBegin();
-    while (true)
-    {
+    while (true) {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == TType.STOP) {
         break;
       }
       switch (field.id) {
@@ -335,7 +328,7 @@ public class TabletSplit implements TBas
           if (field.type == TType.STRUCT) {
             this.oldTablet = new org.apache.accumulo.core.data.thrift.TKeyExtent();
             this.oldTablet.read(iprot);
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -344,8 +337,7 @@ public class TabletSplit implements TBas
             {
               TList _list35 = iprot.readListBegin();
               this.newTablets = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list35.size);
-              for (int _i36 = 0; _i36 < _list35.size; ++_i36)
-              {
+              for (int _i36 = 0; _i36 < _list35.size; ++_i36) {
                 org.apache.accumulo.core.data.thrift.TKeyExtent _elem37;
                 _elem37 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
                 _elem37.read(iprot);
@@ -353,7 +345,7 @@ public class TabletSplit implements TBas
               }
               iprot.readListEnd();
             }
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -363,14 +355,14 @@ public class TabletSplit implements TBas
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
-
+    
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
-
+  
   public void write(TProtocol oprot) throws TException {
     validate();
-
+    
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.oldTablet != null) {
       oprot.writeFieldBegin(OLD_TABLET_FIELD_DESC);
@@ -381,8 +373,7 @@ public class TabletSplit implements TBas
       oprot.writeFieldBegin(NEW_TABLETS_FIELD_DESC);
       {
         oprot.writeListBegin(new TList(TType.STRUCT, this.newTablets.size()));
-        for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter38 : this.newTablets)
-        {
+        for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter38 : this.newTablets) {
           _iter38.write(oprot);
         }
         oprot.writeListEnd();
@@ -392,7 +383,7 @@ public class TabletSplit implements TBas
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
-
+  
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder("TabletSplit(");
@@ -412,10 +403,9 @@ public class TabletSplit implements TBas
     sb.append(")");
     return sb.toString();
   }
-
+  
   public void validate() throws TException {
     // check for required fields
   }
-
+  
 }
-

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TimeType.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TimeType.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TimeType.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/master/thrift/TimeType.java Thu Oct 27 15:24:51 2011
@@ -5,31 +5,30 @@
  */
 package org.apache.accumulo.core.master.thrift;
 
-
 import org.apache.thrift.TEnum;
 
 public enum TimeType implements TEnum {
-  LOGICAL(0),
-  MILLIS(1);
-
+  LOGICAL(0), MILLIS(1);
+  
   private final int value;
-
+  
   private TimeType(int value) {
     this.value = value;
   }
-
+  
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
   public int getValue() {
     return value;
   }
-
+  
   /**
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
+   * 
    * @return null if the value is not found.
    */
-  public static TimeType findByValue(int value) { 
+  public static TimeType findByValue(int value) {
     switch (value) {
       case 0:
         return LOGICAL;

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java Thu Oct 27 15:24:51 2011
@@ -87,7 +87,8 @@ public class Authorizations implements I
   
   public Authorizations(byte[] authorizations) {
     ArgumentChecker.notNull(authorizations);
-    if (authorizations.length > 0) setAuthorizations(new String(authorizations).split(","));
+    if (authorizations.length > 0)
+      setAuthorizations(new String(authorizations).split(","));
   }
   
   public Authorizations() {}

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ByteArrayTrie.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ByteArrayTrie.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ByteArrayTrie.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ByteArrayTrie.java Thu Oct 27 15:24:51 2011
@@ -97,8 +97,10 @@ public class ByteArrayTrie {
     int entryPosition = objectTree.size();
     // add space for the header
     objectTree.add((byte) numTransitions);
-    if (accept) objectTree.add((byte) 0x1);
-    else objectTree.add((byte) 0x0);
+    if (accept)
+      objectTree.add((byte) 0x1);
+    else
+      objectTree.add((byte) 0x0);
     // add space for the transitions
     for (int i = 0; i < numTransitions * (1 + indexBytes); i++) {
       objectTree.add((byte) 0x0);
@@ -153,7 +155,8 @@ public class ByteArrayTrie {
   }
   
   private void transitionState(byte val, State s) {
-    if (s.failed) return;
+    if (s.failed)
+      return;
     int i = 0;
     int j = s.size - 1;
     while (i <= j) {

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java Thu Oct 27 15:24:51 2011
@@ -101,17 +101,20 @@ public class ColumnVisibility {
     @Override
     public int compare(Node a, Node b) {
       int diff = a.type.ordinal() - b.type.ordinal();
-      if (diff != 0) return diff;
+      if (diff != 0)
+        return diff;
       switch (a.type) {
         case TERM:
           return WritableComparator.compareBytes(text, a.start, a.end - a.start, text, b.start, b.end - b.start);
         case OR:
         case AND:
           diff = a.children.length - b.children.length;
-          if (diff != 0) return diff;
+          if (diff != 0)
+            return diff;
           for (int i = 0; i < a.children.length; i++) {
             diff = compare(a.children[i], b.children[i]);
-            if (diff != 0) return diff;
+            if (diff != 0)
+              return diff;
           }
       }
       return 0;
@@ -119,16 +122,19 @@ public class ColumnVisibility {
   }
   
   static private void flatten(Node root, byte[] expression, StringBuilder out) {
-    if (root.type == NodeType.TERM) out.append(new String(expression, root.start, root.end - root.start));
+    if (root.type == NodeType.TERM)
+      out.append(new String(expression, root.start, root.end - root.start));
     else {
       String sep = "";
       Arrays.sort(root.children, new NodeComparator(expression));
       for (Node c : root.children) {
         out.append(sep);
         boolean parens = (c.type != NodeType.TERM && root.type != c.type);
-        if (parens) out.append("(");
+        if (parens)
+          out.append("(");
         flatten(c, expression, out);
-        if (parens) out.append(")");
+        if (parens)
+          out.append(")");
         sep = root.type == NodeType.AND ? "&" : "|";
       }
     }
@@ -162,10 +168,12 @@ public class ColumnVisibility {
     
     Node processTerm(int start, int end, Node expr, byte[] expression) {
       if (start != end) {
-        if (expr != null) throw new BadArgumentException("expression needs | or &", new String(expression), start);
+        if (expr != null)
+          throw new BadArgumentException("expression needs | or &", new String(expression), start);
         return new Node(start, end);
       }
-      if (expr == null) throw new BadArgumentException("empty term", new String(expression), start);
+      if (expr == null)
+        throw new BadArgumentException("empty term", new String(expression), start);
       return expr;
     }
     
@@ -178,7 +186,8 @@ public class ColumnVisibility {
           case '&': {
             expr = processTerm(termStart, index - 1, expr, expression);
             if (result != null) {
-              if (!result.type.equals(NodeType.AND)) throw new BadArgumentException("cannot mix & and |", new String(expression), index - 1);
+              if (!result.type.equals(NodeType.AND))
+                throw new BadArgumentException("cannot mix & and |", new String(expression), index - 1);
             } else {
               result = new Node(NodeType.AND);
             }
@@ -190,7 +199,8 @@ public class ColumnVisibility {
           case '|': {
             expr = processTerm(termStart, index - 1, expr, expression);
             if (result != null) {
-              if (!result.type.equals(NodeType.OR)) throw new BadArgumentException("cannot mix | and &", new String(expression), index - 1);
+              if (!result.type.equals(NodeType.OR))
+                throw new BadArgumentException("cannot mix | and &", new String(expression), index - 1);
             } else {
               result = new Node(NodeType.OR);
             }
@@ -201,7 +211,8 @@ public class ColumnVisibility {
           }
           case '(': {
             parens++;
-            if (termStart != index - 1 || expr != null) throw new BadArgumentException("expression needs & or |", new String(expression), index - 1);
+            if (termStart != index - 1 || expr != null)
+              throw new BadArgumentException("expression needs & or |", new String(expression), index - 1);
             expr = parse_(expression);
             termStart = index;
             break;
@@ -209,24 +220,33 @@ public class ColumnVisibility {
           case ')': {
             parens--;
             Node child = processTerm(termStart, index - 1, expr, expression);
-            if (child == null && result == null) throw new BadArgumentException("empty expression not allowed", new String(expression), index);
-            if (result == null) return child;
-            if (result.type == child.type) for (Node c : child.children)
-              result.add(c);
-            else result.add(child);
+            if (child == null && result == null)
+              throw new BadArgumentException("empty expression not allowed", new String(expression), index);
+            if (result == null)
+              return child;
+            if (result.type == child.type)
+              for (Node c : child.children)
+                result.add(c);
+            else
+              result.add(child);
             result.end = index - 1;
             return result;
           }
           default: {
             byte c = expression[index - 1];
-            if (!Authorizations.isValidAuthChar(c)) throw new BadArgumentException("bad character (" + c + ")", new String(expression), index - 1);
+            if (!Authorizations.isValidAuthChar(c))
+              throw new BadArgumentException("bad character (" + c + ")", new String(expression), index - 1);
           }
         }
       }
       Node child = processTerm(termStart, index, expr, expression);
-      if (result != null) result.add(child);
-      else result = child;
-      if (result.type != NodeType.TERM) if (result.children.length < 2) throw new BadArgumentException("missing term", new String(expression), index);
+      if (result != null)
+        result.add(child);
+      else
+        result = child;
+      if (result.type != NodeType.TERM)
+        if (result.children.length < 2)
+          throw new BadArgumentException("missing term", new String(expression), index);
       return result;
     }
   }
@@ -301,7 +321,8 @@ public class ColumnVisibility {
    */
   @Override
   public boolean equals(Object obj) {
-    if (obj instanceof ColumnVisibility) return equals((ColumnVisibility) obj);
+    if (obj instanceof ColumnVisibility)
+      return equals((ColumnVisibility) obj);
     return false;
   }
   

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/SystemPermission.java Thu Oct 27 15:24:51 2011
@@ -60,7 +60,8 @@ public enum SystemPermission {
   }
   
   public static SystemPermission getPermissionById(byte id) {
-    if (mapping.containsKey(id)) return mapping.get(id);
+    if (mapping.containsKey(id))
+      return mapping.get(id);
     throw new IndexOutOfBoundsException("No such permission");
   }
 }

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/TablePermission.java Thu Oct 27 15:24:51 2011
@@ -59,7 +59,8 @@ public enum TablePermission {
   
   public static TablePermission getPermissionById(byte id) {
     TablePermission result = mapping[id];
-    if (result != null) return result;
+    if (result != null)
+      return result;
     throw new IndexOutOfBoundsException("No such permission");
   }
   

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java Thu Oct 27 15:24:51 2011
@@ -46,15 +46,19 @@ public class VisibilityEvaluator {
           trie.transition(expression[i]);
         return trie.check();
       case AND:
-        if (root.children == null || root.children.length < 2) throw new VisibilityParseException("AND has less than 2 children", expression, root.start);
+        if (root.children == null || root.children.length < 2)
+          throw new VisibilityParseException("AND has less than 2 children", expression, root.start);
         for (Node child : root.children) {
-          if (!evaluate(expression, child)) return false;
+          if (!evaluate(expression, child))
+            return false;
         }
         return true;
       case OR:
-        if (root.children == null || root.children.length < 2) throw new VisibilityParseException("OR has less than 2 children", expression, root.start);
+        if (root.children == null || root.children.length < 2)
+          throw new VisibilityParseException("OR has less than 2 children", expression, root.start);
         for (Node child : root.children) {
-          if (evaluate(expression, child)) return true;
+          if (evaluate(expression, child))
+            return true;
         }
         return false;
       default:

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java Thu Oct 27 15:24:51 2011
@@ -5,43 +5,39 @@
  */
 package org.apache.accumulo.core.security.thrift;
 
-
-
 import org.apache.thrift.*;
 import org.apache.thrift.meta_data.*;
 import org.apache.thrift.protocol.*;
 
 @SuppressWarnings("serial")
-public class AuthInfo implements TBase<AuthInfo, AuthInfo._Fields>, java.io.Serializable, Cloneable {
+public class AuthInfo implements TBase<AuthInfo,AuthInfo._Fields>, java.io.Serializable, Cloneable {
   private static final TStruct STRUCT_DESC = new TStruct("AuthInfo");
-
-  private static final TField USER_FIELD_DESC = new TField("user", TType.STRING, (short)1);
-  private static final TField PASSWORD_FIELD_DESC = new TField("password", TType.STRING, (short)2);
-  private static final TField INSTANCE_ID_FIELD_DESC = new TField("instanceId", TType.STRING, (short)3);
-
+  
+  private static final TField USER_FIELD_DESC = new TField("user", TType.STRING, (short) 1);
+  private static final TField PASSWORD_FIELD_DESC = new TField("password", TType.STRING, (short) 2);
+  private static final TField INSTANCE_ID_FIELD_DESC = new TField("instanceId", TType.STRING, (short) 3);
+  
   public String user;
   public byte[] password;
   public String instanceId;
-
+  
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements TFieldIdEnum {
-    USER((short)1, "user"),
-    PASSWORD((short)2, "password"),
-    INSTANCE_ID((short)3, "instanceId");
-
-    private static final java.util.Map<String, _Fields> byName = new java.util.HashMap<String, _Fields>();
-
+    USER((short) 1, "user"), PASSWORD((short) 2, "password"), INSTANCE_ID((short) 3, "instanceId");
+    
+    private static final java.util.Map<String,_Fields> byName = new java.util.HashMap<String,_Fields>();
+    
     static {
       for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
-
+    
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
     public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
+      switch (fieldId) {
         case 1: // USER
           return USER;
         case 2: // PASSWORD
@@ -52,70 +48,62 @@ public class AuthInfo implements TBase<A
           return null;
       }
     }
-
+    
     /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
+     * Find the _Fields constant that matches fieldId, throwing an exception if it is not found.
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null)
+        throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
-
+    
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
     public static _Fields findByName(String name) {
       return byName.get(name);
     }
-
+    
     private final short _thriftId;
     private final String _fieldName;
-
+    
     _Fields(short thriftId, String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
-
+    
     public short getThriftFieldId() {
       return _thriftId;
     }
-
+    
     public String getFieldName() {
       return _fieldName;
     }
   }
-
+  
   // isset id assignments
-
-  public static final java.util.Map<_Fields, FieldMetaData> metaDataMap;
+  
+  public static final java.util.Map<_Fields,FieldMetaData> metaDataMap;
   static {
-    java.util.Map<_Fields, FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.USER, new FieldMetaData("user", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.PASSWORD, new FieldMetaData("password", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.INSTANCE_ID, new FieldMetaData("instanceId", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
+    java.util.Map<_Fields,FieldMetaData> tmpMap = new java.util.EnumMap<_Fields,FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.USER, new FieldMetaData("user", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRING)));
+    tmpMap.put(_Fields.PASSWORD, new FieldMetaData("password", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRING)));
+    tmpMap.put(_Fields.INSTANCE_ID, new FieldMetaData("instanceId", TFieldRequirementType.DEFAULT, new FieldValueMetaData(TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     FieldMetaData.addStructMetaDataMap(AuthInfo.class, metaDataMap);
   }
-
-  public AuthInfo() {
-  }
-
-  public AuthInfo(
-    String user,
-    byte[] password,
-    String instanceId)
-  {
+  
+  public AuthInfo() {}
+  
+  public AuthInfo(String user, byte[] password, String instanceId) {
     this();
     this.user = user;
     this.password = password;
     this.instanceId = instanceId;
   }
-
+  
   /**
    * Performs a deep copy on <i>other</i>.
    */
@@ -131,170 +119,170 @@ public class AuthInfo implements TBase<A
       this.instanceId = other.instanceId;
     }
   }
-
+  
   public AuthInfo deepCopy() {
     return new AuthInfo(this);
   }
-
+  
   @Deprecated
   public AuthInfo clone() {
     return new AuthInfo(this);
   }
-
+  
   public String getUser() {
     return this.user;
   }
-
+  
   public AuthInfo setUser(String user) {
     this.user = user;
     return this;
   }
-
+  
   public void unsetUser() {
     this.user = null;
   }
-
+  
   /** Returns true if field user is set (has been asigned a value) and false otherwise */
   public boolean isSetUser() {
     return this.user != null;
   }
-
+  
   public void setUserIsSet(boolean value) {
     if (!value) {
       this.user = null;
     }
   }
-
+  
   public byte[] getPassword() {
     return this.password;
   }
-
+  
   public AuthInfo setPassword(byte[] password) {
     this.password = password;
     return this;
   }
-
+  
   public void unsetPassword() {
     this.password = null;
   }
-
+  
   /** Returns true if field password is set (has been asigned a value) and false otherwise */
   public boolean isSetPassword() {
     return this.password != null;
   }
-
+  
   public void setPasswordIsSet(boolean value) {
     if (!value) {
       this.password = null;
     }
   }
-
+  
   public String getInstanceId() {
     return this.instanceId;
   }
-
+  
   public AuthInfo setInstanceId(String instanceId) {
     this.instanceId = instanceId;
     return this;
   }
-
+  
   public void unsetInstanceId() {
     this.instanceId = null;
   }
-
+  
   /** Returns true if field instanceId is set (has been asigned a value) and false otherwise */
   public boolean isSetInstanceId() {
     return this.instanceId != null;
   }
-
+  
   public void setInstanceIdIsSet(boolean value) {
     if (!value) {
       this.instanceId = null;
     }
   }
-
+  
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case USER:
-      if (value == null) {
-        unsetUser();
-      } else {
-        setUser((String)value);
-      }
-      break;
-
-    case PASSWORD:
-      if (value == null) {
-        unsetPassword();
-      } else {
-        setPassword((byte[])value);
-      }
-      break;
-
-    case INSTANCE_ID:
-      if (value == null) {
-        unsetInstanceId();
-      } else {
-        setInstanceId((String)value);
-      }
-      break;
-
+      case USER:
+        if (value == null) {
+          unsetUser();
+        } else {
+          setUser((String) value);
+        }
+        break;
+      
+      case PASSWORD:
+        if (value == null) {
+          unsetPassword();
+        } else {
+          setPassword((byte[]) value);
+        }
+        break;
+      
+      case INSTANCE_ID:
+        if (value == null) {
+          unsetInstanceId();
+        } else {
+          setInstanceId((String) value);
+        }
+        break;
+    
     }
   }
-
+  
   public void setFieldValue(int fieldID, Object value) {
     setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value);
   }
-
+  
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case USER:
-      return getUser();
-
-    case PASSWORD:
-      return getPassword();
-
-    case INSTANCE_ID:
-      return getInstanceId();
-
+      case USER:
+        return getUser();
+        
+      case PASSWORD:
+        return getPassword();
+        
+      case INSTANCE_ID:
+        return getInstanceId();
+        
     }
     throw new IllegalStateException();
   }
-
+  
   public Object getFieldValue(int fieldId) {
     return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId));
   }
-
+  
   /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     switch (field) {
-    case USER:
-      return isSetUser();
-    case PASSWORD:
-      return isSetPassword();
-    case INSTANCE_ID:
-      return isSetInstanceId();
+      case USER:
+        return isSetUser();
+      case PASSWORD:
+        return isSetPassword();
+      case INSTANCE_ID:
+        return isSetInstanceId();
     }
     throw new IllegalStateException();
   }
-
+  
   public boolean isSet(int fieldID) {
     return isSet(_Fields.findByThriftIdOrThrow(fieldID));
   }
-
+  
   @Override
   public boolean equals(Object that) {
     if (that == null)
       return false;
     if (that instanceof AuthInfo)
-      return this.equals((AuthInfo)that);
+      return this.equals((AuthInfo) that);
     return false;
   }
-
+  
   public boolean equals(AuthInfo that) {
     if (that == null)
       return false;
-
+    
     boolean this_present_user = true && this.isSetUser();
     boolean that_present_user = true && that.isSetUser();
     if (this_present_user || that_present_user) {
@@ -303,7 +291,7 @@ public class AuthInfo implements TBase<A
       if (!this.user.equals(that.user))
         return false;
     }
-
+    
     boolean this_present_password = true && this.isSetPassword();
     boolean that_present_password = true && that.isSetPassword();
     if (this_present_password || that_present_password) {
@@ -312,7 +300,7 @@ public class AuthInfo implements TBase<A
       if (!java.util.Arrays.equals(this.password, that.password))
         return false;
     }
-
+    
     boolean this_present_instanceId = true && this.isSetInstanceId();
     boolean that_present_instanceId = true && that.isSetInstanceId();
     if (this_present_instanceId || that_present_instanceId) {
@@ -321,28 +309,29 @@ public class AuthInfo implements TBase<A
       if (!this.instanceId.equals(that.instanceId))
         return false;
     }
-
+    
     return true;
   }
-
+  
   @Override
   public int hashCode() {
     return 0;
   }
-
+  
   public int compareTo(AuthInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
-
+    
     int lastComparison = 0;
-    AuthInfo typedOther = (AuthInfo)other;
-
+    AuthInfo typedOther = (AuthInfo) other;
+    
     lastComparison = Boolean.valueOf(isSetUser()).compareTo(typedOther.isSetUser());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetUser()) {      lastComparison = TBaseHelper.compareTo(this.user, typedOther.user);
+    if (isSetUser()) {
+      lastComparison = TBaseHelper.compareTo(this.user, typedOther.user);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -351,7 +340,8 @@ public class AuthInfo implements TBase<A
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetPassword()) {      lastComparison = TBaseHelper.compareTo(this.password, typedOther.password);
+    if (isSetPassword()) {
+      lastComparison = TBaseHelper.compareTo(this.password, typedOther.password);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -360,42 +350,42 @@ public class AuthInfo implements TBase<A
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetInstanceId()) {      lastComparison = TBaseHelper.compareTo(this.instanceId, typedOther.instanceId);
+    if (isSetInstanceId()) {
+      lastComparison = TBaseHelper.compareTo(this.instanceId, typedOther.instanceId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
     return 0;
   }
-
+  
   public void read(TProtocol iprot) throws TException {
     TField field;
     iprot.readStructBegin();
-    while (true)
-    {
+    while (true) {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == TType.STOP) {
         break;
       }
       switch (field.id) {
         case 1: // USER
           if (field.type == TType.STRING) {
             this.user = iprot.readString();
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // PASSWORD
           if (field.type == TType.STRING) {
             this.password = iprot.readBinary();
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // INSTANCE_ID
           if (field.type == TType.STRING) {
             this.instanceId = iprot.readString();
-          } else { 
+          } else {
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
@@ -405,14 +395,14 @@ public class AuthInfo implements TBase<A
       iprot.readFieldEnd();
     }
     iprot.readStructEnd();
-
+    
     // check for required fields of primitive type, which can't be checked in the validate method
     validate();
   }
-
+  
   public void write(TProtocol oprot) throws TException {
     validate();
-
+    
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.user != null) {
       oprot.writeFieldBegin(USER_FIELD_DESC);
@@ -432,7 +422,7 @@ public class AuthInfo implements TBase<A
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
-
+  
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder("AuthInfo(");
@@ -447,12 +437,15 @@ public class AuthInfo implements TBase<A
     if (this.password == null) {
       sb.append("null");
     } else {
-        int __password_size = Math.min(this.password.length, 128);
-        for (int i = 0; i < __password_size; i++) {
-          if (i != 0) sb.append(" ");
-          sb.append(Integer.toHexString(this.password[i]).length() > 1 ? Integer.toHexString(this.password[i]).substring(Integer.toHexString(this.password[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.password[i]).toUpperCase());
-        }
-        if (this.password.length > 128) sb.append(" ...");
+      int __password_size = Math.min(this.password.length, 128);
+      for (int i = 0; i < __password_size; i++) {
+        if (i != 0)
+          sb.append(" ");
+        sb.append(Integer.toHexString(this.password[i]).length() > 1 ? Integer.toHexString(this.password[i])
+            .substring(Integer.toHexString(this.password[i]).length() - 2).toUpperCase() : "0" + Integer.toHexString(this.password[i]).toUpperCase());
+      }
+      if (this.password.length > 128)
+        sb.append(" ...");
     }
     sb.append(", ");
     sb.append("instanceId:");
@@ -464,10 +457,9 @@ public class AuthInfo implements TBase<A
     sb.append(")");
     return sb.toString();
   }
-
+  
   public void validate() throws TException {
     // check for required fields
   }
-
+  
 }
-

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java?rev=1189806&r1=1189805&r2=1189806&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java Thu Oct 27 15:24:51 2011
@@ -5,7 +5,6 @@
  */
 package org.apache.accumulo.core.security.thrift;
 
-
 import org.apache.thrift.TEnum;
 
 public enum SecurityErrorCode implements TEnum {
@@ -18,25 +17,26 @@ public enum SecurityErrorCode implements
   GRANT_INVALID(6),
   BAD_AUTHORIZATIONS(7),
   INVALID_INSTANCEID(8);
-
+  
   private final int value;
-
+  
   private SecurityErrorCode(int value) {
     this.value = value;
   }
-
+  
   /**
    * Get the integer value of this enum value, as defined in the Thrift IDL.
    */
   public int getValue() {
     return value;
   }
-
+  
   /**
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
+   * 
    * @return null if the value is not found.
    */
-  public static SecurityErrorCode findByValue(int value) { 
+  public static SecurityErrorCode findByValue(int value) {
     switch (value) {
       case 0:
         return DEFAULT_SECURITY_ERROR;



Mime
View raw message