third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 102 matching lines @@
 
   /**
    * Returns whether the FieldSet is immutable. This is true if it is the
    * {@link #emptySet} or if {@link #makeImmutable} were called.
    *
    * @return whether the FieldSet is immutable.
    */
   public boolean isImmutable() {
     return isImmutable;
   }
-  
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
-    
+
     if (!(o instanceof FieldSet)) {
       return false;
     }
-    
+
     FieldSet<?> other = (FieldSet<?>) o;
-    return other.fields.equals(other.fields);
+    return fields.equals(other.fields);
   }
-  
+
   @Override
   public int hashCode() {
     return fields.hashCode();
   }
 
   /**
    * Clones the FieldSet. The returned FieldSet will be mutable even if the
    * original FieldSet was immutable.
    *
    * @return the newly cloned FieldSet
@@ skipping 338 matching lines @@
   static int getWireFormatForFieldType(final WireFormat.FieldType type,
                                        boolean isPacked) {
     if (isPacked) {
       return WireFormat.WIRETYPE_LENGTH_DELIMITED;
     } else {
       return type.getWireType();
     }
   }
 
   /**
-   * Like {@link Message.Builder#mergeFrom(Message)}, but merges from another 
+   * Like {@link Message.Builder#mergeFrom(Message)}, but merges from another
    * {@link FieldSet}.
    */
   public void mergeFrom(final FieldSet<FieldDescriptorType> other) {
     for (int i = 0; i < other.fields.getNumArrayEntries(); i++) {
       mergeFromField(other.fields.getArrayEntryAt(i));
     }
     for (final Map.Entry<FieldDescriptorType, Object> entry :
              other.fields.getOverflowEntries()) {
       mergeFromField(entry);
     }
@@ skipping 124 matching lines @@
    * Write a single tag-value pair to the stream.
    *
    * @param output The output stream.
    * @param type   The field's type.
    * @param number The field's number.
    * @param value  Object representing the field's value.  Must be of the exact
    *               type which would be returned by
    *               {@link Message#getField(Descriptors.FieldDescriptor)} for
    *               this field.
    */
-  private static void writeElement(final CodedOutputStream output,
-                                   final WireFormat.FieldType type,
-                                   final int number,
-                                   final Object value) throws IOException {
+  static void writeElement(
+      final CodedOutputStream output,
+      final WireFormat.FieldType type,
+      final int number,
+      final Object value) throws IOException {
     // Special case for groups, which need a start and end tag; other fields
     // can just use writeTag() and writeFieldNoTag().
     if (type == WireFormat.FieldType.GROUP) {
         output.writeGroup(number, (MessageLite) value);
     } else {
       output.writeTag(number, getWireFormatForFieldType(type, false));
       writeElementNoTag(output, type, value);
     }
   }
 
@@ skipping 142 matching lines @@
    * Compute the number of bytes that would be needed to encode a
    * single tag/value pair of arbitrary type.
    *
    * @param type   The field's type.
    * @param number The field's number.
    * @param value  Object representing the field's value.  Must be of the exact
    *               type which would be returned by
    *               {@link Message#getField(Descriptors.FieldDescriptor)} for
    *               this field.
    */
-  private static int computeElementSize(
-      final WireFormat.FieldType type,
-      final int number, final Object value) {
+  static int computeElementSize(
+      final WireFormat.FieldType type, final int number, final Object value) {
     int tagSize = CodedOutputStream.computeTagSize(number);
     if (type == WireFormat.FieldType.GROUP) {
       // Only count the end group tag for proto2 messages as for proto1 the end
       // group tag will be counted as a part of getSerializedSize().
         tagSize *= 2;
     }
     return tagSize + computeElementSizeNoTag(type, value);
   }
 
   /**
@@ skipping 79 matching lines @@
         for (final Object element : (List<?>)value) {
           size += computeElementSize(type, number, element);
         }
         return size;
       }
     } else {
       return computeElementSize(type, number, value);
     }
   }
 }