Changeset 1457 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing

Timestamp:

12/18/14 15:49:58 (10 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy

Files:

• power/PowerInterfaceFactory.java (modified) (2 diffs)
• thermal/ThermalInterfaceFactory.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/PowerInterfaceFactory.java

@@ -3 +3 @@
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.computing.profiles.energy.power.ui.ComputingResourcePowerInterface;
 import schedframe.resources.computing.profiles.energy.power.ui.PowerInterface;
+import schedframe.resources.devices.Device;
 import schedframe.resources.devices.DevicePowerInterface;
 import schedframe.resources.devices.PhysicalResource;
@@ -33 +35 @@
                 else if (resource.getType().getName().equals(StandardResourceType.Heatsink.getName()))
                         powerInterface = new DevicePowerInterface(resource, pp);
+                else if (resource instanceof Device)
+                        powerInterface = new DevicePowerInterface(resource, pp);
                 else 
-                        powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingResourcePowerInterface((ComputingResource)resource, pp);
+                        powerInterface = new ComputingResourcePowerInterface((ComputingResource)resource, pp);
 
                 /*switch(resource.getType()){

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/thermal/ThermalInterfaceFactory.java

@@ -5 +5 @@
 import schedframe.resources.computing.profiles.energy.thermal.ui.ComputingResourceThermalInterface;
 import schedframe.resources.computing.profiles.energy.thermal.ui.ThermalInterface;
+import schedframe.resources.devices.Device;
+import schedframe.resources.devices.DeviceThermalInterface;
 import schedframe.resources.devices.PhysicalResource;
-import schedframe.resources.devices.DeviceThermalInterface;
 
 public class ThermalInterfaceFactory {
@@ -21 +22 @@
                 else if(resource.getType().getName().equals(StandardResourceType.Outlet.getName()))
                         thermalInterface = new DeviceThermalInterface(resource, tp);
+                else if(resource instanceof Device)
+                        thermalInterface = new DeviceThermalInterface(resource, tp);
                 else 
                         thermalInterface = new ComputingResourceThermalInterface((ComputingResource)resource, tp);