am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""

* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
  Revert "Upgraded Guava to unmodified v14.0.1"

1 files changed, 0 insertions, 23 deletions

diff --git a/guava/src/com/google/common/util/concurrent/ForwardingService.java b/guava/src/com/google/common/util/concurrent/ForwardingService.java
index 8774232..e39e4db 100644
--- a/guava/src/com/google/common/util/concurrent/ForwardingService.java
+++ b/guava/src/com/google/common/util/concurrent/ForwardingService.java
@@ -19,22 +19,13 @@ package com.google.common.util.concurrent;
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ForwardingObject;
 
-import java.util.concurrent.Executor;
-
 /**
  * A {@link Service} that forwards all method calls to another service.
  *
- * @deprecated Instead of using a {@link ForwardingService}, consider using the 
- * {@link Service.Listener} functionality to hook into the {@link Service} 
- * lifecycle, or if you really do need to provide access to some Service 
- * methods, consider just providing the few that you actually need (e.g. just 
- * {@link #startAndWait()}) and not implementing Service.
- *
  * @author Chris Nokleberg
  * @since 1.0
  */
 @Beta
-@Deprecated
 public abstract class ForwardingService extends ForwardingObject
     implements Service {
 
@@ -66,20 +57,6 @@ public abstract class ForwardingService extends ForwardingObject
   @Override public boolean isRunning() {
     return delegate().isRunning();
   }
-  
-  /**
-   * @since 13.0
-   */
-  @Override public void addListener(Listener listener, Executor executor) {
-    delegate().addListener(listener, executor);
-  }
-
-  /**
-   * @since 14.0
-   */
-  @Override public Throwable failureCause() {
-    return delegate().failureCause();
-  }
 
   /**
    * A sensible default implementation of {@link #startAndWait()}, in terms of