Changeset 1447 for DCWoRMS/branches/coolemall/src/schedframe/scheduling

Timestamp:

09/24/14 15:51:26 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling

Files:

• Scheduler.java (modified) (2 diffs)
• plugin/SchedulingPluginConfiguration.java (modified) (1 diff)
• policy/AbstractManagementSystem.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/Scheduler.java

@@ -17 +17 @@
 import schedframe.Initializable;
 import schedframe.PluginConfiguration;
+import schedframe.events.EventType;
 import schedframe.events.scheduling.SchedulingEventType;
 import schedframe.resources.Resource;
@@ -107 +108 @@
                 PluginConfiguration pluginConfig = managementSystem.getSchedulingPluginConfiguration();
                 if (pluginConfig != null) {
-                        Map<SchedulingEventType, Object> events = pluginConfig.getServedEvents();
+                        Map<EventType, Object> events = pluginConfig.getServedEvents();
                         if (events != null) {
                                 Object obj = events.get(SchedulingEventType.TIMER);

DCWoRMS/branches/coolemall/src/schedframe/scheduling/plugin/SchedulingPluginConfiguration.java

@@ -5 +5 @@
 
 import schedframe.PluginConfiguration;
-import schedframe.events.scheduling.SchedulingEventType;
+import schedframe.events.EventType;
 
 public class SchedulingPluginConfiguration implements PluginConfiguration {
         
-        private Map<SchedulingEventType, Object> events;
+        private Map<EventType, Object> events;
 
         public SchedulingPluginConfiguration(){
-                this.events = new HashMap<SchedulingEventType, Object>();
+                this.events = new HashMap<EventType, Object>(2);
         }
         
-        public void addServedEvent(SchedulingEventType eventType, Object argument){
+        public void addServedEvent(EventType eventType, Object argument){
                 events.put(eventType, argument);
         }
         
-        public Map<SchedulingEventType, Object> getServedEvents() {
+        public Map<EventType, Object> getServedEvents() {
                 return events;
         }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/AbstractManagementSystem.java

@@ -13 +13 @@
 
 import schedframe.PluginConfiguration;
+import schedframe.events.EventType;
 import schedframe.events.scheduling.SchedulingEventType;
 import schedframe.scheduling.Scheduler;
@@ -185 +186 @@
                 PluginConfiguration pluginConfig = schedulingPlugin.getConfiguration();
                 if (pluginConfig != null) {
-                        Map<SchedulingEventType, Object> events = pluginConfig.getServedEvents();
+                        Map<EventType, Object> events = pluginConfig.getServedEvents();
                         if (events != null) {
                                 Object obj = events.get(SchedulingEventType.TIMER);