Refactor raname {CMS_SETUP}.modules as {CMS_SETUP}.available_modules

Refactor raname {CMS_SETUP}.modules_enabled as {CMS_SETUP}.enabled_modules
Updated code to use the new features names.
This commit is contained in:
jvelilla
2014-11-19 13:20:07 -03:00
parent aac01e093a
commit c3d022ce46
5 changed files with 16 additions and 18 deletions

View File

@@ -135,11 +135,11 @@ feature -- CMS setup
do do
create {BASIC_AUTH_MODULE} m.make create {BASIC_AUTH_MODULE} m.make
m.enable m.enable
a_setup.modules.extend (m) a_setup.available_modules.extend (m)
create {CMS_DEMO_MODULE} m.make create {CMS_DEMO_MODULE} m.make
m.enable m.enable
a_setup.modules.extend (m) a_setup.available_modules.extend (m)
end end
setup_storage (a_setup: CMS_SETUP) setup_storage (a_setup: CMS_SETUP)

View File

@@ -27,7 +27,7 @@ feature {NONE} -- Initialization
-- Initialize varius cms components. -- Initialize varius cms components.
do do
configure configure
create modules.make (3) create available_modules.make (3)
build_mailer build_mailer
initialize_modules initialize_modules
end end
@@ -65,12 +65,12 @@ feature {NONE} -- Initialization
create {NODE_MODULE} m.make (Current) create {NODE_MODULE} m.make (Current)
m.enable m.enable
modules.extend (m) available_modules.extend (m)
end end
feature -- Access feature -- Access
modules: CMS_MODULE_COLLECTION available_modules: CMS_MODULE_COLLECTION
-- <Precursor> -- <Precursor>
is_html: BOOLEAN is_html: BOOLEAN

View File

@@ -24,19 +24,19 @@ feature -- Access
deferred deferred
end end
modules: CMS_MODULE_COLLECTION available_modules: CMS_MODULE_COLLECTION
-- List of available modules. -- List of available modules.
deferred deferred
end end
modules_enabled: CMS_MODULE_COLLECTION enabled_modules: CMS_MODULE_COLLECTION
-- List of enabled modules. -- List of enabled modules.
local local
l_module: CMS_MODULE l_module: CMS_MODULE
do do
create Result.make (modules.count) create Result.make (available_modules.count)
across across
modules as ic available_modules as ic
loop loop
l_module := ic.item l_module := ic.item
if l_module.is_enabled then if l_module.is_enabled then

View File

@@ -65,7 +65,7 @@ feature {NONE} -- Initialization
initialize_modules initialize_modules
-- Intialize modules and keep only enabled modules. -- Intialize modules and keep only enabled modules.
do do
modules := setup.modules_enabled modules := setup.enabled_modules
ensure ensure
only_enabled_modules: across modules as ic all ic.item.is_enabled end only_enabled_modules: across modules as ic all ic.item.is_enabled end
end end

View File

@@ -36,19 +36,17 @@ feature {NONE} -- Initialization
register_hooks register_hooks
local local
l_module: CMS_MODULE l_module: CMS_MODULE
l_available_modules: CMS_MODULE_COLLECTION l_enabled_modules: CMS_MODULE_COLLECTION
do do
l_available_modules := setup.modules l_enabled_modules := setup.enabled_modules
across across
l_available_modules as ic l_enabled_modules as ic
loop loop
l_module := ic.item l_module := ic.item
if l_module.is_enabled then if attached {CMS_HOOK_AUTO_REGISTER} l_module as l_auto then
if attached {CMS_HOOK_AUTO_REGISTER} l_module as l_auto then l_auto.auto_subscribe_to_hooks (Current)
l_auto.auto_subscribe_to_hooks (Current)
end
l_module.register_hooks (Current)
end end
l_module.register_hooks (Current)
end end
end end