You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/01 17:46:01 UTC

[08/21] incubator-brooklyn git commit: Delete deprecated Feed.isActive

Delete deprecated Feed.isActive


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/29cbd0f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/29cbd0f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/29cbd0f6

Branch: refs/heads/master
Commit: 29cbd0f6a32ee37e6ebe738d50db8e3e68e2bb8a
Parents: 1b3dc15
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jul 28 22:46:28 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Sat Aug 1 00:13:31 2015 +0100

----------------------------------------------------------------------
 api/src/main/java/brooklyn/entity/Feed.java              | 6 ------
 core/src/main/java/brooklyn/event/feed/AbstractFeed.java | 5 -----
 2 files changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29cbd0f6/api/src/main/java/brooklyn/entity/Feed.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/Feed.java b/api/src/main/java/brooklyn/entity/Feed.java
index 029ed78..a708bdc 100644
--- a/api/src/main/java/brooklyn/entity/Feed.java
+++ b/api/src/main/java/brooklyn/entity/Feed.java
@@ -47,12 +47,6 @@ public interface Feed extends EntityAdjunct, Rebindable {
      */
     boolean isActivated();
     
-    /** 
-     * @return true iff the feed is actually running (like {@link #isActivated()}, but including other items like poll jobs not cancelled)
-     * @deprecated since 0.7.0 use {@link #isRunning()}
-     */ @Deprecated
-    boolean isActive();
-    
     void start();
 
     /** suspends this feed (stops the poller, or indicates that the feed should start in a state where the poller is stopped) */

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29cbd0f6/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
index d487a9a..58cab2a 100644
--- a/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
+++ b/core/src/main/java/brooklyn/event/feed/AbstractFeed.java
@@ -181,11 +181,6 @@ public abstract class AbstractFeed extends AbstractEntityAdjunct implements Feed
         return activated;
     }
     
-    @Override
-    public boolean isActive() {
-        return isRunning();
-    }
-    
     public EntityLocal getEntity() {
         return entity;
     }