Changeset 223 for xssim/trunk/src/test/rewolucja/resources/manager/implementation/ResourceManager.java

Timestamp:

04/06/12 11:04:29 (13 years ago)

Author:

wojtekp

Message:

 

File:

• xssim/trunk/src/test/rewolucja/resources/manager/implementation/ResourceManager.java (modified) (11 diffs)

xssim/trunk/src/test/rewolucja/resources/manager/implementation/ResourceManager.java

@@ -22 +22 @@
 import test.rewolucja.resources.UnitState;
 import test.rewolucja.resources.exception.ResourceException;
-import test.rewolucja.resources.logical.LogicalResource;
+import test.rewolucja.resources.logical.base.LogicalResource;
 import test.rewolucja.resources.manager.interfaces.ResourceManagerInterface;
 import test.rewolucja.resources.physical.base.ComputingResource;
@@ -32 +32 @@
         //private Log log = LogFactory.getLog(ResourceManager.class);
 
-        protected List<ComputingResource> resources;
-        protected List<LogicalResource> logicalResource;
+        protected List<ComputingResource> compResources;
+        protected List<LogicalResource> logicalResources;
         protected ResourceCharacteristics resourceCharacteristic;
 
-        public ResourceManager(List<ComputingResource> resources, List<LogicalResource> logicalLayers) {
-                this.resources = resources;
-                this.logicalResource = logicalLayers;
+        public ResourceManager(List<ComputingResource> resources, List<LogicalResource> logicalRes) {
+                this.compResources = resources;
+                this.logicalResources = logicalRes;
                 this.resourceCharacteristic = new ResourceCharacteristics();
                 for(ComputingResource resource : resources){
@@ -53 +53 @@
 
         public ResourceManager(ComputingResource resource) {
-                this.resources = resource.getChildren();
+                this.compResources = resource.getChildren();
                 this.resourceCharacteristic = resource.getResourceCharacteristic();
                 // this.logicalLayers = resource.getLogaicaLayer().getChildren();
@@ -59 +59 @@
 
         public List<ComputingResource> getResources() {
-                return resources;
+                return compResources;
         }
 
         public boolean areResourcesAchievable(ResourceType type) {
-                if (resources != null) {
+                if (compResources != null) {
                         Stack<ComputingResource> toExamine = new Stack<ComputingResource>();
-                        for (ComputingResource resource : resources)
+                        for (ComputingResource resource : compResources)
                                 toExamine.push(resource);
 
@@ -89 +89 @@
         public List<? extends ComputingResource> getResourcesOfType(ResourceType type) throws ResourceException {
                 List<ComputingResource> resourcesOfType = new ArrayList<ComputingResource>();
-                for (ComputingResource resource : resources) {
+                for (ComputingResource resource : compResources) {
                         if (resource.getType() == type) {
                                 resourcesOfType.add(resource);
@@ -102 +102 @@
 
                 List<ComputingResource> resourcesOfType = new ArrayList<ComputingResource>();
-                for (ComputingResource resource : resources) {
+                for (ComputingResource resource : compResources) {
                         if (resource.getType() == type) {
                                 if (resource.getStatus() == status) {
@@ -116 +116 @@
 
                 ComputingResource resourceWithName = null;
-                for (int i = 0; i < resources.size() && resourceWithName == null; i++) {
-                        ComputingResource resource = resources.get(i);
+                for (int i = 0; i < compResources.size() && resourceWithName == null; i++) {
+                        ComputingResource resource = compResources.get(i);
                         if (resource.getName().compareTo(resourceName) == 0)
                                 resourceWithName = resource;
@@ -129 +129 @@
                 List<ResourceUnit> resourceUnit = new ArrayList<ResourceUnit>();
                 Stack<ComputingResource> toExamine = new Stack<ComputingResource>();
-                for (ComputingResource resource : resources)
+                for (ComputingResource resource : compResources)
                         toExamine.push(resource);
                 while (!toExamine.isEmpty()) {
@@ -169 +169 @@
         public List<? extends ComputingResource> filterResources(Properties properties) {
                 List<ComputingResource> descendants = new ArrayList<ComputingResource>();
-                for (ComputingResource resource : resources) {
+                for (ComputingResource resource : compResources) {
                         ResourceValidator resourceValidator =  new ResourcePropertiesValidator(properties);
                         if (resourceValidator.validate(resource))
@@ -180 +180 @@
 
         public List<LogicalResource> getResourceProviders() {
-                return logicalResource;
+                return logicalResources;
         }
         
@@ -188 +188 @@
                 }
                 ComputingResource resourceWithName = null;
-                for(int i = 0 ; i < resources.size() && resourceWithName == null; i++){
-                        ComputingResource resource = resources.get(i);
+                for(int i = 0 ; i < compResources.size() && resourceWithName == null; i++){
+                        ComputingResource resource = compResources.get(i);
                         if(resource.getName().equals(resName))
                                 resourceWithName = resource;