Changeset 211 for xssim/trunk/src

Timestamp:

04/06/12 11:01:36 (13 years ago)

Author:

wojtekp

Message:

 

Location:

xssim/trunk/src/test/rewolucja/resources/logical/base

Files:

• . (added)
• LogicalResource.java (copied) (copied from xssim/trunk/src/test/rewolucja/resources/logical/LogicalResource.java) (7 diffs)

xssim/trunk/src/test/rewolucja/resources/logical/base/LogicalResource.java

@@ -1 @@
-package test.rewolucja.resources.logical;
+package test.rewolucja.resources.logical.base;
 
 import eduni.simjava.Sim_event;
@@ -38 +38 @@
         protected ManagementSystem managementSystem;
         
-        protected List<ComputingResource> resources;
+        protected List<ComputingResource> compResources;
         
         protected LogicalResource parent;
@@ -48 +48 @@
                 super(manSys.getName(), 1);
                 this.managementSystem = manSys;
-                this.resources = new ArrayList<ComputingResource>();
+                this.compResources = new ArrayList<ComputingResource>();
                 this.status = ResourceStatus.AVAILABLE;
                 init();
@@ -56 +56 @@
                 super(manSys.getName(), 1);
                 this.managementSystem = manSys;
-                this.resources = new ArrayList<ComputingResource>();
+                this.compResources = new ArrayList<ComputingResource>();
                 this.status = ResourceStatus.AVAILABLE;
                 addResources(res);
@@ -97 +97 @@
 
         public void addResource(ComputingResource resource) {
-                resources.add(resource);
+                compResources.add(resource);
         }
 
         public void addResources(List<ComputingResource> res) {
                 for(ComputingResource resource:res){
-                        resources.add(resource);
+                        compResources.add(resource);
                         resource.setLogicalResource(this);
                         for(ComputingResource child: resource.filterDescendants(new Properties())){
@@ -111 +111 @@
 
         public List<ComputingResource> getResources() {
-                return resources;
+                return compResources;
         }
 
@@ -238 +238 @@
         public LogicalResource getLogicalResource(String resourceName){
                 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(resourceName))
                                 resourceWithName = resource;