Changeset 1095 for DCWoRMS/branches/coolemall/src/schedframe

Timestamp:

06/12/13 15:06:11 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources

Files:

• CoolEmAllResourceType.java (added)
• ResourceTypeFactory.java (modified) (1 diff)
• StandardResourceType.java (modified) (1 diff)
• computing/ResourceFactory.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/ResourceTypeFactory.java

@@ -14 +14 @@
                 else if (typeName.equals(StandardResourceType.Rack.getName()))
                         return StandardResourceType.Rack;
-                
-                else if (typeName.equals(StandardResourceType.RECS.getName()))
-                        return StandardResourceType.RECS;
-                
+
                 else if (typeName.equals(StandardResourceType.ComputingNode.getName()))
                         return StandardResourceType.ComputingNode;

DCWoRMS/branches/coolemall/src/schedframe/resources/StandardResourceType.java

@@ -7 +7 @@
         DataCenter,
         Rack,
-        RECS,
         ComputingNode,
         Processor,

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ResourceFactory.java

@@ -1 +1 @@
 package schedframe.resources.computing;
 
+import schedframe.resources.CoolEmAllResourceType;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.UserResourceType;
 import schedframe.resources.computing.description.ComputingResourceDescription;
 import schedframe.resources.computing.recs.ComputeBox1;
@@ -32 +32 @@
                 else if (resDesc.getType().equals(StandardResourceType.Core))
                         return new Core(resDesc);
-                else if (resDesc.getType().getName().equals(new UserResourceType("ComputeBox1").getName()))
+                else if (resDesc.getType().equals(CoolEmAllResourceType.ComputeBox1))
                         return new ComputeBox1(resDesc);
-                else if (resDesc.getType().getName().equals(new UserResourceType("NodeGroup").getName()))
+                else if (resDesc.getType().equals(CoolEmAllResourceType.NodeGroup))
                         return new NodeGroup(resDesc);
-                else if (resDesc.getType().getName().equals(new UserResourceType("Node").getName()))
+                else if (resDesc.getType().equals(CoolEmAllResourceType.Node))
                         return new Node(resDesc);
+                else if (resDesc.getType().equals(CoolEmAllResourceType.Processor))
+                        return new Processor(resDesc);
+                else if (resDesc.getType().equals(CoolEmAllResourceType.Core))
+                        return new Core(resDesc);
                 else
                         return new ComputingResource(resDesc);