From edb58be9a2bd5d0d650dd1b927f48a9fa0a4caac Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 7 Jul 2010 12:32:34 -0700
Subject: [PATCH] Fix the Dispatcher pattern.

---
 init.rb                                   | 10 +++++++++-
 lib/overhead_deliverable_patch.rb         |  2 --
 lib/overhead_fixed_deliverable_patch.rb   |  3 ---
 lib/overhead_hourly_deliverable_patch.rb  |  3 ---
 lib/overhead_issue_patch.rb               |  2 --
 lib/overhead_time_entry_activity_patch.rb |  2 --
 lib/overhead_time_entry_patch.rb          |  2 --
 7 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/init.rb b/init.rb
index ce0bb3f..f689b4e 100644
--- a/init.rb
+++ b/init.rb
@@ -1,19 +1,27 @@
 require 'redmine'
 
 # Patches to the Redmine core.
-require 'dispatcher'
 require 'overhead_deliverable_patch'
 require 'overhead_hourly_deliverable_patch'
 require 'overhead_fixed_deliverable_patch'
 require 'overhead_issue_patch'
 require 'overhead_time_entry_patch'
 require 'overhead_time_entry_activity_patch'
+
+require 'dispatcher'
 Dispatcher.to_prepare do
+  require_dependency 'deliverable'
   Deliverable.send(:include, OverheadDeliverablePatch)
+  require_dependency 'hourly_deliverable'
   HourlyDeliverable.send(:include, OverheadHourlyDeliverablePatch)
+  require_dependency 'fixed_deliverable'
   FixedDeliverable.send(:include, OverheadFixedDeliverablePatch)
+  require_dependency 'issue'
   Issue.send(:include, OverheadIssuePatch)
+  require_dependency 'time_entry'
   TimeEntry.send(:include, OverheadTimeEntryPatch)
+  require_dependency 'enumeration'
+  require_dependency 'time_entry_activity'
   TimeEntryActivity.send(:include, OverheadTimeEntryActivityPatch)
 end
 
diff --git a/lib/overhead_deliverable_patch.rb b/lib/overhead_deliverable_patch.rb
index 00519fa..e34ca31 100644
--- a/lib/overhead_deliverable_patch.rb
+++ b/lib/overhead_deliverable_patch.rb
@@ -1,5 +1,3 @@
-require_dependency 'deliverable'
-
 module OverheadDeliverablePatch
   def self.included(base)
     base.send(:include, InstanceMethods)
diff --git a/lib/overhead_fixed_deliverable_patch.rb b/lib/overhead_fixed_deliverable_patch.rb
index 1f05b32..53476ca 100644
--- a/lib/overhead_fixed_deliverable_patch.rb
+++ b/lib/overhead_fixed_deliverable_patch.rb
@@ -1,6 +1,3 @@
-require_dependency 'deliverable'
-require_dependency 'fixed_deliverable'
-
 module OverheadFixedDeliverablePatch
   def self.included(base)
     base.send(:include, InstanceMethods)
diff --git a/lib/overhead_hourly_deliverable_patch.rb b/lib/overhead_hourly_deliverable_patch.rb
index f26cee9..4906ca2 100644
--- a/lib/overhead_hourly_deliverable_patch.rb
+++ b/lib/overhead_hourly_deliverable_patch.rb
@@ -1,6 +1,3 @@
-require_dependency 'deliverable'
-require_dependency 'hourly_deliverable'
-
 module OverheadHourlyDeliverablePatch
   def self.included(base)
     base.send(:include, InstanceMethods)
diff --git a/lib/overhead_issue_patch.rb b/lib/overhead_issue_patch.rb
index 04705de..37ace2c 100644
--- a/lib/overhead_issue_patch.rb
+++ b/lib/overhead_issue_patch.rb
@@ -1,5 +1,3 @@
-require_dependency 'issue'
-
 module OverheadIssuePatch
   def self.included(base)
     base.send(:include, InstanceMethods)
diff --git a/lib/overhead_time_entry_activity_patch.rb b/lib/overhead_time_entry_activity_patch.rb
index d2c06ae..42ff657 100644
--- a/lib/overhead_time_entry_activity_patch.rb
+++ b/lib/overhead_time_entry_activity_patch.rb
@@ -1,5 +1,3 @@
-require_dependency 'time_entry_activity'
-
 module OverheadTimeEntryActivityPatch
   def self.included(base)
     base.extend(ClassMethods)
diff --git a/lib/overhead_time_entry_patch.rb b/lib/overhead_time_entry_patch.rb
index 1e5b12e..4f1135b 100644
--- a/lib/overhead_time_entry_patch.rb
+++ b/lib/overhead_time_entry_patch.rb
@@ -1,5 +1,3 @@
-require_dependency 'time_entry'
-
 module OverheadTimeEntryPatch
   def self.included(base)
     base.class_eval do