Changeset 1432 for DCWoRMS/branches

Timestamp:

09/15/14 14:02:40 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/resources/computing/ComputingResource.java (modified) (5 diffs)

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

@@ -125 +125 @@
                 ResourceEventCommand rec = new ResourceEventCommand(this);
                 rec.execute(event);
+                if(event.getReason() != EventReason.SIM_INIT)
+                        triggerEventUp(event);
                 if((scheduler != null && (parent != null && scheduler != parent.getScheduler()))  && !event.getSource().equals(scheduler.getFullName())){
                         SchedulingEventCommand sec = new SchedulingEventCommand(this);
@@ -147 +149 @@
 
         public void updateState(ResourceEvent event){
-                for (Device device: ((ComputingResourceCharacteristics)resourceCharacteristic).getDevices()) {
+                ResourceEventCommand rec = new ResourceEventCommand(this);
+                rec.execute(event);
+                /*for (Device device: ((ComputingResourceCharacteristics)resourceCharacteristic).getDevices()) {
                         for (Extension extension: device.getExtensionList()) {
                                 if (extension.supportsEvent(event)) {
@@ -161 +165 @@
                                 }
                         }
-                }
+                }*/
                 
         }
@@ -264 +268 @@
                                 }
                         }
-                        if(event.getReason() != EventReason.SIM_INIT)
-                                triggerEventUp(event);
+
                 }
                 
@@ -334 +337 @@
         }
 
+        public boolean contains(ComputingResource compRes){
+                if(compRes.equals(this)){
+                        return true;
+                } else {
+                        ComputingResource par = compRes.getParent();
+                        while(par != null){
+                                if (par.equals(this)){
+                                        return true;
+                                } 
+                                par = par.getParent();
+                        }       
+                }
+                return false;
+        }
 }