Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistry.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 14 matching lines @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.protobuf;
 
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 /**
  * A table of known extensions, searchable by name or field number.  When
  * parsing a protocol message that might have extensions, you must provide
@@ skipping 48 matching lines @@
  * @author kenton@google.com Kenton Varda
  */
 public class ExtensionRegistry extends ExtensionRegistryLite {
   /** Construct a new, empty instance. */
   public static ExtensionRegistry newInstance() {
     return new ExtensionRegistry();
   }
 
   /** Get the unmodifiable singleton empty instance. */
   public static ExtensionRegistry getEmptyRegistry() {
-    return EMPTY_REGISTRY;
+    return EMPTY;
   }
 
 
   /** Returns an unmodifiable view of the registry. */
   @Override
   public ExtensionRegistry getUnmodifiable() {
     return new ExtensionRegistry(this);
   }
 
   /** A (Descriptor, Message) pair, returned by lookup methods. */
@@ skipping 121 matching lines @@
   /** Add an extension from a generated file to the registry. */
   public void add(final Extension<?, ?> extension) {
     if (extension.getExtensionType() != Extension.ExtensionType.IMMUTABLE &&
         extension.getExtensionType() != Extension.ExtensionType.MUTABLE) {
       // do not support other extension types. ignore
       return;
     }
     add(newExtensionInfo(extension), extension.getExtensionType());
   }
 
-  /** Add an extension from a generated file to the registry. */
-  public void add(final GeneratedMessage.GeneratedExtension<?, ?> extension) {
-    add((Extension<?, ?>) extension);
-  }
-
   static ExtensionInfo newExtensionInfo(final Extension<?, ?> extension) {
     if (extension.getDescriptor().getJavaType() ==
         FieldDescriptor.JavaType.MESSAGE) {
       if (extension.getMessageDefaultInstance() == null) {
         throw new IllegalStateException(
             "Registered message-type extension had null default instance: " +
                 extension.getDescriptor().getFullName());
       }
       return new ExtensionInfo(extension.getDescriptor(),
           (Message) extension.getMessageDefaultInstance());
@@ skipping 48 matching lines @@
     this.mutableExtensionsByNumber =
             Collections.unmodifiableMap(other.mutableExtensionsByNumber);
   }
 
   private final Map<String, ExtensionInfo> immutableExtensionsByName;
   private final Map<String, ExtensionInfo> mutableExtensionsByName;
   private final Map<DescriptorIntPair, ExtensionInfo> immutableExtensionsByNumber;
   private final Map<DescriptorIntPair, ExtensionInfo> mutableExtensionsByNumber;
 
   ExtensionRegistry(boolean empty) {
-    super(EMPTY_REGISTRY_LITE);
+    super(ExtensionRegistryLite.getEmptyRegistry());
     this.immutableExtensionsByName =
         Collections.<String, ExtensionInfo>emptyMap();
     this.mutableExtensionsByName =
         Collections.<String, ExtensionInfo>emptyMap();
     this.immutableExtensionsByNumber =
         Collections.<DescriptorIntPair, ExtensionInfo>emptyMap();
     this.mutableExtensionsByNumber =
             Collections.<DescriptorIntPair, ExtensionInfo>emptyMap();
   }
-  static final ExtensionRegistry EMPTY_REGISTRY = new ExtensionRegistry(true);
+  private static final ExtensionRegistry EMPTY = new ExtensionRegistry(true);
 
   private void add(
       final ExtensionInfo extension,
       final Extension.ExtensionType extensionType) {
     if (!extension.descriptor.isExtension()) {
       throw new IllegalArgumentException(
           "ExtensionRegistry.add() was given a FieldDescriptor for a regular " +
               "(non-extension) field.");
     }
 
@@ skipping 48 matching lines @@
     @Override
     public boolean equals(final Object obj) {
       if (!(obj instanceof DescriptorIntPair)) {
         return false;
       }
       final DescriptorIntPair other = (DescriptorIntPair)obj;
       return descriptor == other.descriptor && number == other.number;
     }
   }
 }