'public static final' is the right thing, some variables renamed to make clear what...

[hub.git] / application / hub / main / filter / console / class_ConsoleWelcomeTeaserFilter.php

diff --git a/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php b/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php
index 7f65b323c7712a36f8e6f8679c819effa6915539..34fbfcd80f85d90b2bc00af03dde3a1e184f7d77 100644 (file)
--- a/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php
+++ b/application/hub/main/filter/console/class_ConsoleWelcomeTeaserFilter.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -37,7 +37,7 @@ class ConsoleWelcomeTeaserFilter extends BaseFilter implements Filterable {
         *
         * @return      $filterInstance         An instance of this filter class
         */
-       public final static function createConsoleWelcomeTeaserFilter () {
+       public static final function createConsoleWelcomeTeaserFilter () {
                // Get a new instance
                $filterInstance = new ConsoleWelcomeTeaserFilter();
 
@@ -51,18 +51,12 @@ class ConsoleWelcomeTeaserFilter extends BaseFilter implements Filterable {
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
-        * @throws      FilterChainException    If the nodeInstance was not set
+        * @throws      FilterChainException    If $nodeInstance is null (no NullPointerException here)
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get node instance
                $nodeInstance = Registry::getRegistry()->getInstance('node');
 
-               // Sanity-check on it
-               if (is_null($nodeInstance)) {
-                       // Throws a FilterChainException to stop further processing
-                       throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
-
                // Now output the teaser
                $nodeInstance->outputConsoleTeaser();
        }