Changeset 1318 for DCWoRMS/branches

Timestamp:

03/31/14 16:01:59 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• airthroughput/AirThroughputInterfaceFactory.java (modified) (3 diffs)
• power/PowerInterfaceFactory.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/airthroughput/AirThroughputInterfaceFactory.java

@@ -6 +6 @@
 import schedframe.resources.computing.profiles.energy.airthroughput.ui.ComputingResourceAirThroughputInterface;
 import schedframe.resources.devices.PhysicalResource;
-import schedframe.resources.devices.PhysicalResourceAirThroughputInterface;
+import schedframe.resources.devices.DeviceAirThroughputInterface;
 import schedframe.resources.devices.coolemall.FanAirThroughputInterface;
 
@@ -16 +16 @@
                 AirThroughputInterface airThroughputInterface = null;
                 if(resource.getType().getName().equals(StandardResourceType.CRAH.getName()))
-                        airThroughputInterface = new PhysicalResourceAirThroughputInterface(resource, atp);
+                        airThroughputInterface = new DeviceAirThroughputInterface(resource, atp);
                 else if(resource.getType().getName().equals(StandardResourceType.Fan.getName()))
                         airThroughputInterface = new FanAirThroughputInterface(resource, atp);
@@ -24 +24 @@
                         airThroughputInterface = new FanAirThroughputInterface(resource, atp);
                 else if(resource.getType().getName().equals(StandardResourceType.CoolingDevice.getName()))
-                        airThroughputInterface = new PhysicalResourceAirThroughputInterface(resource, atp);
+                        airThroughputInterface = new DeviceAirThroughputInterface(resource, atp);
                 else
                         airThroughputInterface = new ComputingResourceAirThroughputInterface((ComputingResource)resource, atp);

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

@@ -4 +4 @@
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.profiles.energy.power.ui.PowerInterface;
+import schedframe.resources.devices.DevicePowerInterface;
 import schedframe.resources.devices.PhysicalResource;
-import schedframe.resources.devices.PhysicalResourcePowerInterface;
 
 public class PowerInterfaceFactory {
@@ -22 +22 @@
                         powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ProcessorPowerInterface((ComputingResource)resource, pp);
                 else if (resource.getType().getName().equals(StandardResourceType.CRAH.getName()))
-                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                        powerInterface = new DevicePowerInterface(resource, pp);
                 else if (resource.getType().getName().equals(StandardResourceType.Fan.getName()))
-                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                        powerInterface = new DevicePowerInterface(resource, pp);
                 else if (resource.getType().getName().equals(StandardResourceType.Inlet.getName()))
-                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                        powerInterface = new DevicePowerInterface(resource, pp);
                 else if (resource.getType().getName().equals(StandardResourceType.Outlet.getName()))
-                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                        powerInterface = new DevicePowerInterface(resource, pp);
                 else if (resource.getType().getName().equals(StandardResourceType.CoolingDevice.getName()))
-                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                        powerInterface = new DevicePowerInterface(resource, pp);
                 else if (resource.getType().getName().equals(StandardResourceType.Heatsink.getName()))
-                        powerInterface = new PhysicalResourcePowerInterface(resource, pp);
+                        powerInterface = new DevicePowerInterface(resource, pp);
                 else 
                         powerInterface = new schedframe.resources.computing.profiles.energy.power.ui.ComputingResourcePowerInterface((ComputingResource)resource, pp);