Removed unused methods
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d71e358a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d71e358a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d71e358a Branch: refs/heads/vmsync Commit: d71e358a9fd4bcd7c663eba21111a21693db1e4a Parents: 1310535 Author: Alex Huang <[email protected]> Authored: Tue Jun 11 16:49:49 2013 -0700 Committer: Alex Huang <[email protected]> Committed: Tue Jun 11 16:49:49 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/vm/VirtualMachineManager.java | 7 ------- server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 10 +--------- 2 files changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d71e358a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java ---------------------------------------------------------------------- diff --git a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java index 5e5c3e9..83ec485 100644 --- a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java +++ b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java @@ -17,7 +17,6 @@ package com.cloud.vm; import java.net.URI; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -96,12 +95,6 @@ public interface VirtualMachineManager extends Manager { void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru); - // FIXME: This method is added by VirtualMachinePowerStateSyncImpl - Collection<VirtualMachineGuru> getRegisteredGurus(); - - // FIXME: Apparently this method is added by Kelven for VmWorkJobDispatcher. Should look into removing this. - VirtualMachineGuru getVmGuru(VirtualMachine vm); - boolean stateTransitTo(VMInstanceVO vm, VirtualMachine.Event e, Long hostId) throws NoTransitionException; void advanceStart(String vmUuid, Map<VirtualMachineProfile.Param, Object> params, DeploymentPlan planToDeploy) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d71e358a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index 57c6852..f04a589 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -282,15 +282,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } } - @Override - public Collection<VirtualMachineGuru> getRegisteredGurus() { - synchronized(_vmGurus) { - return _vmGurus.values(); - } - } - - @Override - public VirtualMachineGuru getVmGuru(VirtualMachine vm) { + private VirtualMachineGuru getVmGuru(VirtualMachine vm) { return _vmGurus.get(vm.getType()); }
