Changeset 781 for DCWoRMS/trunk/src/schedframe/resources/units

Timestamp:

01/15/13 10:15:01 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/schedframe/resources/units/ResourceUnitFactory.java (modified) (3 diffs)

DCWoRMS/trunk/src/schedframe/resources/units/ResourceUnitFactory.java

@@ -1 +1 @@
 package schedframe.resources.units;
-
-
 
 
@@ -20 +18 @@
         
         public static ResourceUnit createUnit(String unitName, String resId, int totalAmount, int usedAmount){
-                if(unitName.equals(StandardResourceUnitName.CPU.getName()))
+                if(unitName.equalsIgnoreCase(StandardResourceUnitName.CPU.getName()))
                         return new PEUnit(resId, totalAmount, usedAmount);
-                if(unitName.equals(StandardResourceUnitName.PE.getName()))
+                if(unitName.equalsIgnoreCase(StandardResourceUnitName.PE.getName()))
                         return new PEUnit(resId, totalAmount, usedAmount);
-                else if(unitName.equals(StandardResourceUnitName.MEMORY.getName()))
+                else if(unitName.equalsIgnoreCase(StandardResourceUnitName.MEMORY.getName()))
                          return new Memory(resId, totalAmount, usedAmount);
-                else if(unitName.equals(StandardResourceUnitName.STORAGE.getName()))
+                else if(unitName.equalsIgnoreCase(StandardResourceUnitName.STORAGE.getName()))
                          return new Storage(resId, totalAmount, usedAmount);
-                else if(unitName.equals(StandardResourceUnitName.GPU.getName()))
+                else if(unitName.equalsIgnoreCase(StandardResourceUnitName.GPU.getName()))
                          return new GPU(resId, totalAmount, usedAmount);
-                else if (unitName.equals(StandardResourceUnitName.CPUSPEED.getName()))
+                else if (unitName.equalsIgnoreCase(StandardResourceUnitName.CPUSPEED.getName()))
                         return new CpuSpeed(resId, totalAmount, usedAmount); 
-                else if (unitName.equals(StandardResourceUnitName.COST.getName()))
+                else if (unitName.equalsIgnoreCase(StandardResourceUnitName.COST.getName()))
                         return new Cost(resId, totalAmount);
-                else if (unitName.equals(StandardResourceUnitName.APPLICATION.getName()))
+                else if (unitName.equalsIgnoreCase(StandardResourceUnitName.APPLICATION.getName()))
                         return new Applications(resId); 
                 else
@@ -41 +39 @@
         
         public static ResourceUnit createUnit(String unitName, int totalAmount, int usedAmount){
-                if(unitName.equals(StandardResourceUnitName.CPU.getName()))
+                if(unitName.equalsIgnoreCase(StandardResourceUnitName.CPU.getName()))
                         return new PEUnit(totalAmount, usedAmount, 1);
-                else if(unitName.equals(StandardResourceUnitName.MEMORY.getName()))
+                else if(unitName.equalsIgnoreCase(StandardResourceUnitName.MEMORY.getName()))
                          return new Memory(totalAmount, usedAmount);
-                else if (unitName.equals(StandardResourceUnitName.CPUSPEED.getName()))
+                else if (unitName.equalsIgnoreCase(StandardResourceUnitName.CPUSPEED.getName()))
                         return new CpuSpeed(totalAmount, usedAmount); 
                 else