Changeset 1316 for DCWoRMS

Timestamp:

03/31/14 16:01:19 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src

Files:

• gridsim/dcworms/DCWormsTags.java (modified) (1 diff)
• schedframe/events/EventCommand.java (modified) (1 diff)
• schedframe/events/ResourceEventCommand.java (modified) (1 diff)
• schedframe/events/scheduling/ResourceStateChangedEvent.java (added)
• schedframe/events/scheduling/SchedulingEvent.java (modified) (3 diffs)
• schedframe/events/scheduling/SchedulingEventCommand.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/gridsim/dcworms/DCWormsTags.java

@@ -34 +34 @@
         public static final int TASK_REQUESTED_TIME_EXPIRED = DCWORMSBASE + 6;
         
-        public static final int POWER_LIMIT_EXCEEDED = DCWORMSBASE + 7;
+        public static final int RESOURCE_STATE_CHANGED = DCWORMSBASE + 7;
+        
+        public static final int POWER_LIMIT_EXCEEDED = DCWORMSBASE + 8;
 
         

DCWoRMS/branches/coolemall/src/schedframe/events/EventCommand.java

@@ -4 +4 @@
 
 public interface EventCommand {
-
-        public void execute(EventType evType);
         
         public void execute(Event event);

DCWoRMS/branches/coolemall/src/schedframe/events/ResourceEventCommand.java

@@ -10 +10 @@
                 this.resource = resource;
         }
-        
-        public void execute(EventType evType) {
-                //TODO - add event factory
-                throw new RuntimeException("not implemented");
-        }
 
         public void execute(Event event) {

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling/SchedulingEvent.java

@@ -16 +16 @@
         
         public SchedulingEvent(EventType eventType, EventReason eventReason){
-                type = eventType;
-                reason = eventReason;
+                this.type = eventType;
+                this.reason = eventReason;
         }
         
@@ -39 +39 @@
         
         public String getSource(){
-                return this.source;
+                return source;
         }
 
@@ -46 +46 @@
         }
 
-        @Override
         public Object getData() {
                 return null;

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling/SchedulingEventCommand.java

@@ -3 +3 @@
 import schedframe.events.Event;
 import schedframe.events.EventCommand;
-import schedframe.events.EventType;
 import schedframe.resources.computing.ComputingResource;
 
@@ -14 +13 @@
         }
         
-        public void execute(EventType evType) {
-                SchedulingEvent ev = new SchedulingEvent(evType);
-                ev.setSource(compResource.getFullName());
-                compResource.getEventHandler().handleSchedulingEvent(ev);
-        }
-        
         public void execute(Event event) {
-                SchedulingEvent ev = new SchedulingEvent(event.getType());
+                SchedulingEvent ev = new ResourceStateChangedEvent(compResource.getFullName(), event.getType());
                 ev.setSource(compResource.getFullName());
                 compResource.getEventHandler().handleSchedulingEvent(ev);