Changeset 1396 for DCWoRMS/branches/coolemall/src/schedframe/resources/units

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/units

Files:

• CustomResourceUnitName.java (moved) (moved from DCWoRMS/branches/coolemall/src/schedframe/resources/units/UserResourceUnitName.java) (1 diff)
• ResourceUnitFactory.java (modified) (1 diff)
• ResourceUnitName.java (modified) (1 diff)
• ResourceUnitNameFactory.java (modified) (1 diff)
• StandardResourceUnitName.java (modified) (1 diff)

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

@@ -1 +1 @@
 package schedframe.resources.units;
 
-public class UserResourceUnitName implements ResourceUnitName {
+public class CustomResourceUnitName implements ResourceUnitName {
 
         protected String name;
 
-        public UserResourceUnitName(String name) {
+        public CustomResourceUnitName(String name) {
                 this.name = name;
         }
 
-        public String getName() {
+        public String getLabel() {
                 return name;
         }

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

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

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

@@ -3 +3 @@
 public interface ResourceUnitName {
         
-        public String getName();
+        public String getLabel();
 
 }

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);
         }
 }

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

@@ -46 +46 @@
     }
 
-    public String getName(){
+    public String getLabel(){
         return this.name;
     }