Changeset 1396 for DCWoRMS/branches/coolemall/src/schedframe/resources/units/ResourceUnitNameFactory.java

Timestamp:

06/26/14 14:18:01 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/resources/units/ResourceUnitNameFactory.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/resources/units/ResourceUnitNameFactory.java

@@ -6 +6 @@
         public static ResourceUnitName createResourceUnitName(String unitName){
 
-                if(unitName.equals(StandardResourceUnitName.MEMORY.getName()))
+                if(unitName.equals(StandardResourceUnitName.MEMORY.getLabel()))
                         return StandardResourceUnitName.MEMORY;
                 
-                else if (unitName.equals(StandardResourceUnitName.STORAGE.getName()))
+                else if (unitName.equals(StandardResourceUnitName.STORAGE.getLabel()))
                         return StandardResourceUnitName.STORAGE;
                 
-                else if (unitName.equals(StandardResourceUnitName.PE.getName()))
+                else if (unitName.equals(StandardResourceUnitName.PE.getLabel()))
                         return StandardResourceUnitName.PE;
                 
-                else if (unitName.equals(StandardResourceUnitName.CPUSPEED.getName()))
+                else if (unitName.equals(StandardResourceUnitName.CPUSPEED.getLabel()))
                         return StandardResourceUnitName.CPUSPEED;
                 
-                else if (unitName.equals(StandardResourceUnitName.GPU.getName()))
+                else if (unitName.equals(StandardResourceUnitName.GPU.getLabel()))
                         return StandardResourceUnitName.GPU;
                 
-                else if (unitName.equals(StandardResourceUnitName.APPLICATION.getName()))
+                else if (unitName.equals(StandardResourceUnitName.APPLICATION.getLabel()))
                         return StandardResourceUnitName.APPLICATION;
                 
-                else if (unitName.equals(StandardResourceUnitName.COST.getName()))
+                else if (unitName.equals(StandardResourceUnitName.COST.getLabel()))
                         return StandardResourceUnitName.COST;
 
-                else return new UserResourceUnitName(unitName);
+                else return new CustomResourceUnitName(unitName);
         }
 }