'public static final' is correct

[shipsimu.git] / application / ship-simu / main / structures / extended / cabines / ship / class_LuxuryCabin.php

diff --git a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
index 6b1e5805fbf15e0cfcec07bf52520832c0e83633..f6d12aec4d04c3b662b14e4c037c6b8eb129c3c6 100644 (file)
--- a/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
+++ b/application/ship-simu/main/structures/extended/cabines/ship/class_LuxuryCabin.php
@@ -4,9 +4,9 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.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.ship-simu.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
@@ -19,41 +19,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipPart {
        // Konstruktor
-       private function __construct () {
+       protected function __construct () {
                // Call parent constructor
-               parent::constructor(__CLASS__);
-
-               // Debug message
-               if (((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-
-               // Set description
-               $this->setPartDescr("Luxuskabine");
-
-               // Generate unique ID number
-               $this->createUniqueID();
-
-               // Clean up a little
-               $this->removeSystemArray();
+               parent::__construct(__CLASS__);
        }
 
        // Eine Luxuskabine erstellen
-       public final static function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) {
+       public static final function createLuxuryCabin ($numLuxury, $numRooms, $numBeds, $dim) {
                // Get new instance
                $luxuryInstance = new LuxuryCabin();
 
-               // Debug message
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $luxuryInstance->getDebugInstance()->output(sprintf("[%s:%d] Eine Luxuskabine wird konstruiert...<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-
                // Abmasse extrahieren
                $luxuryInstance->extractDimensions($dim);
 
@@ -69,47 +48,10 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP
                return $luxuryInstance;
        }
 
-       // Loesch-Methode fuer Anzahl Betten
-       public function removeNumBeds() {
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Anzahl Betten gel&ouml;scht.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-               unset($this->numBeds);
-               parent::removeNumBeds();
-       }
-
-       // Loesch-Methode fuer Anzahl Kabinen
-       public function removeNumCabin() {
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Anzahl Kabinen gel&ouml;scht.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-               unset($this->numCabin);
-               parent::removeNumCabin();
-       }
-
-       // Loesch-Methode fuer Anzahl Raeume
-       public function removeNumRooms() {
-               if ((defined('DEBUG_CABIN')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Anzahl R&auml;ume gel&ouml;scht.<br />\n",
-                       __CLASS__,
-                       __LINE__
-               ));
-               unset($this->numRooms);
-               parent::removeNumRooms();
-       }
-
        // Overwritten method for tradeable items
        public function isTradeable () {
                return true;
        }
-
-       /**
-        * Limits this object with an ObjectLimits instance
-        */
-       public function limitObject (ObjectLimits $limitInstance) {
-               ApplicationEntryPoint::app_die("".__METHOD__." reached! Stub!");
-       }
 }
 
 // [EOF]