From 9528bca8aabd224cf87751a6e365abdf2aa25533 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 20 Nov 2008 19:55:34 +0000 Subject: [PATCH] Controller instance shall now be fetched from registry --- application/ship-simu/main/filter/class_ | 6 +----- .../class_ShipSimuGovermentPaysStartupHelpFilter.php | 8 ++------ .../class_ShipSimuGovermentPaysTrainingFilter.php | 6 +----- .../ship-simu/main/filter/page/class_RefillPageFilter.php | 6 +----- .../validator/class_RefillRequestValidatorFilter.php | 6 +----- .../main/filter/verifier/class_BirthdayVerifierFilter.php | 6 +----- 6 files changed, 7 insertions(+), 31 deletions(-) diff --git a/application/ship-simu/main/filter/class_ b/application/ship-simu/main/filter/class_ index bb35473..6a0bb77 100644 --- a/application/ship-simu/main/filter/class_ +++ b/application/ship-simu/main/filter/class_ @@ -35,16 +35,12 @@ class ???Filter extends BaseShipSimuFilter implements Filterable { /** * Creates an instance of this filter class * - * @param $controllerInstance An instance of a Controller class * @return $filterInstance An instance of this filter class */ - public final static function create???Filter (Controller $controllerInstance) { + public final static function create???Filter () { // Get a new instance $filterInstance = new ???Filter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php index 74ef33d..ed1cdea 100644 --- a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php +++ b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysStartupHelpFilter.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -3class ShipSimuGovermentPaysStartupHelpFilter extends BaseShipSimuFilter implements Filterable { +class ShipSimuGovermentPaysStartupHelpFilter extends BaseShipSimuFilter implements Filterable { /** * Protected constructor * @@ -35,16 +35,12 @@ /** * Creates an instance of this filter class * - * @param $controllerInstance An instance of a Controller class * @return $filterInstance An instance of this filter class */ - public final static function createShipSimuGovermentPaysStartupHelpFilter (Controller $controllerInstance) { + public final static function createShipSimuGovermentPaysStartupHelpFilter () { // Get a new instance $filterInstance = new ShipSimuGovermentPaysStartupHelpFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php index 5b51ae3..8146499 100644 --- a/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php +++ b/application/ship-simu/main/filter/goverment/class_ShipSimuGovermentPaysTrainingFilter.php @@ -35,16 +35,12 @@ class ShipSimuGovermentPaysTrainingFilter extends BaseShipSimuFilter implements /** * Creates an instance of this filter class * - * @param $controllerInstance An instance of a Controller class * @return $filterInstance An instance of this filter class */ - public final static function createShipSimuGovermentPaysTrainingFilter (Controller $controllerInstance) { + public final static function createShipSimuGovermentPaysTrainingFilter () { // Get a new instance $filterInstance = new ShipSimuGovermentPaysTrainingFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/application/ship-simu/main/filter/page/class_RefillPageFilter.php b/application/ship-simu/main/filter/page/class_RefillPageFilter.php index d33661e..1f3d3e8 100644 --- a/application/ship-simu/main/filter/page/class_RefillPageFilter.php +++ b/application/ship-simu/main/filter/page/class_RefillPageFilter.php @@ -35,16 +35,12 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { /** * Creates an instance of this filter class * - * @param $controllerInstance An instance of a Controller class * @return $filterInstance An instance of this filter class */ - public final static function createRefillPageFilter (Controller $controllerInstance) { + public final static function createRefillPageFilter () { // Get a new instance $filterInstance = new RefillPageFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php index 71e9b2d..43dc7c6 100644 --- a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php +++ b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php @@ -35,16 +35,12 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera /** * Creates an instance of this filter class * - * @param $controllerInstance An instance of a Controller class * @return $filterInstance An instance of this filter class */ - public final static function createRefillRequestValidatorFilter (Controller $controllerInstance) { + public final static function createRefillRequestValidatorFilter () { // Get a new instance $filterInstance = new RefillRequestValidatorFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } diff --git a/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php b/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php index 240b9a6..db5a026 100644 --- a/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php +++ b/application/ship-simu/main/filter/verifier/class_BirthdayVerifierFilter.php @@ -35,16 +35,12 @@ class BirthdayVerifierFilter extends BaseShipSimuFilter implements Filterable { /** * Creates an instance of this filter class * - * @param $controllerInstance An instance of a Controller class * @return $filterInstance An instance of this filter class */ - public final static function createBirthdayVerifierFilter (Controller $controllerInstance) { + public final static function createBirthdayVerifierFilter () { // Get a new instance $filterInstance = new BirthdayVerifierFilter(); - // Set the controller - $filterInstance->setControllerInstance($controllerInstance); - // Return the instance return $filterInstance; } -- 2.30.2