More renamed

[shipsimu.git] / application / ship-simu / main / filter / validator / class_RefillRequestValidatorFilter.php

diff --git a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
index 76fe612dae3e3b9b1c1eea98f63b1b79028553d2..3abd7baa14d4bcbd98061f8ec5b4ad9d76cb6033 100644 (file)
--- a/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
+++ b/application/ship-simu/main/filter/validator/class_RefillRequestValidatorFilter.php
@@ -2,11 +2,11 @@
 /**
  * A filter for validating the refill request
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class RefillRequestValidatorFilter extends BaseFrameworkSystem implements Filterable {
+class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filterable {
        /**
         * Protected constructor
         *
@@ -30,10 +30,6 @@ class RefillRequestValidatorFilter extends BaseFrameworkSystem implements Filter
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -41,7 +37,7 @@ class RefillRequestValidatorFilter extends BaseFrameworkSystem implements Filter
         *
         * @return      $filterInstance         An instance of this filter class
         */
-       public final static function createRefillRequestValidatorFilter () {
+       public static final function createRefillRequestValidatorFilter () {
                // Get a new instance
                $filterInstance = new RefillRequestValidatorFilter();
 
@@ -55,11 +51,15 @@ class RefillRequestValidatorFilter extends BaseFrameworkSystem implements Filter
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
-        * @todo        0% done
+        * @todo        Maybe we need to added some more generic tests on the request here?
+        * @throws      FilterChainException    If this filter fails to operate
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+               // Execute the parent execute method
+               parent::execute($requestInstance, $responseInstance);
+
                // Are all required request fields set?
-               if ((!$requestInstance->isRequestElementSet('type')) || (!$requestInstance->isRequestElementSet('amount'))) {
+               if (($requestInstance->isRequestElementSet('type') === false) || ($requestInstance->isRequestElementSet('amount') === false)) {
                        // Something important is missing
                        $requestInstance->requestIsValid(false);
 
@@ -67,11 +67,8 @@ class RefillRequestValidatorFilter extends BaseFrameworkSystem implements Filter
                        $responseInstance->addFatalMessage('refill_page_required_fields_missing');
 
                        // Abort here
-                       return false;
+                       throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                } // END - if
-
-               // Unfinised part
-               $this->partialStub("Unfinished method.");
        }
 }