brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [8/9] git commit: Move isRebinding up to AbstractBrooklynObject
Date Thu, 07 Aug 2014 21:55:42 GMT
Move isRebinding up to AbstractBrooklynObject


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

Branch: refs/heads/master
Commit: 79b49a9cc0d9dd4d026b7e8690baa2cd77f9e6c1
Parents: 6cb55b5
Author: Aled Sage <aled.sage@gmail.com>
Authored: Thu Aug 7 13:42:18 2014 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Thu Aug 7 13:43:33 2014 +0100

----------------------------------------------------------------------
 core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java   | 5 +++++
 core/src/main/java/brooklyn/entity/basic/AbstractEntity.java    | 4 ----
 .../src/main/java/brooklyn/location/basic/AbstractLocation.java | 5 -----
 .../main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java  | 4 ----
 4 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/79b49a9c/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
index 8396ec7..b15e73d 100644
--- a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
+++ b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.proxying.InternalFactory;
+import brooklyn.entity.rebind.RebindManagerImpl;
 import brooklyn.management.ManagementContext;
 import brooklyn.management.internal.ManagementContextInternal;
 import brooklyn.util.config.ConfigBag;
@@ -138,6 +139,10 @@ public abstract class AbstractBrooklynObject implements BrooklynObjectInternal
{
         return managementContext;
     }
 
+    protected boolean isRebinding() {
+        return RebindManagerImpl.RebindTracker.isRebinding();
+    }
+    
     protected void requestPersist() {
         // TODO Could add PolicyChangeListener, similar to EntityChangeListener; should we
do that?
         if (getManagementContext() != null) {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/79b49a9c/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
index 729a2ff..ad2043c 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -355,10 +355,6 @@ public abstract class AbstractEntity extends AbstractBrooklynObject implements
E
                 (o instanceof Entity && Objects.equal(getId(), ((Entity)o).getId()));
     }
     
-    protected boolean isRebinding() {
-        return RebindManagerImpl.RebindTracker.isRebinding();
-    }
-    
     public void setProxy(Entity proxy) {
         if (selfProxy != null) throw new IllegalStateException("Proxy is already set; cannot
reset proxy for "+toString());
         selfProxy = checkNotNull(proxy, "proxy");

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/79b49a9c/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
index 734b1c8..c4b4ee0 100644
--- a/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
+++ b/core/src/main/java/brooklyn/location/basic/AbstractLocation.java
@@ -37,7 +37,6 @@ import brooklyn.config.ConfigKey;
 import brooklyn.config.ConfigKey.HasConfigKey;
 import brooklyn.entity.basic.EntityDynamicType;
 import brooklyn.entity.rebind.BasicLocationRebindSupport;
-import brooklyn.entity.rebind.RebindManagerImpl;
 import brooklyn.entity.rebind.RebindSupport;
 import brooklyn.entity.trait.Configurable;
 import brooklyn.event.basic.BasicConfigKey;
@@ -263,10 +262,6 @@ public abstract class AbstractLocation extends AbstractBrooklynObject
implements
         }
     }
     
-    protected boolean isRebinding() {
-        return RebindManagerImpl.RebindTracker.isRebinding();
-    }
-    
     public boolean isManaged() {
         return getManagementContext() != null && managed;
     }

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/79b49a9c/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
index a8cf150..7f0e08f 100644
--- a/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
+++ b/core/src/main/java/brooklyn/policy/basic/AbstractEntityAdjunct.java
@@ -162,10 +162,6 @@ public abstract class AbstractEntityAdjunct extends AbstractBrooklynObject
imple
         return _legacyNoConstructionInit;
     }
 
-    protected boolean isRebinding() {
-        return RebindManagerImpl.RebindTracker.isRebinding();
-    }
-    
     public <T> T getConfig(ConfigKey<T> key) {
         return configsInternal.getConfig(key);
     }


Mime
View raw message