Removed unused methods

xueyuan · xueyuan · commit d71e358a9fd4 · 2013-06-11T16:49:49.000-07:00
diff --git 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 @@ boolean allocate(String vmInstanceName,
 
     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)
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -282,15 +282,7 @@ public void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru) {
         }
     }
     
-    @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());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -282,15 +282,7 @@ public void registerGuru(VirtualMachine.Type type, VirtualMachineGuru guru) {`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
`285`		`- @Override`
`286`		`- public Collection<VirtualMachineGuru> getRegisteredGurus() {`
`287`		`- synchronized(_vmGurus) {`
`288`		`- return _vmGurus.values();`
`289`		`- }`
`290`		`- }`
`291`		`-`
`292`		`- @Override`
`293`		`- public VirtualMachineGuru getVmGuru(VirtualMachine vm) {`
	`285`	`+ private VirtualMachineGuru getVmGuru(VirtualMachine vm) {`
`294`	`286`	`return _vmGurus.get(vm.getType());`
`295`	`287`	`}`
`296`	`288`