More style convensions applied, interface updated

[shipsimu.git] / application / ship-simu / main / ships / passenger / class_PassengerShip.php

diff --git a/application/ship-simu/main/ships/passenger/class_PassengerShip.php b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
index 947bba2cfa074ee4a0c339d61197cbd1e11d429f..4e0dd198cc1b1207d54e44a0445a12fdcb532163 100644 (file)
--- a/application/ship-simu/main/ships/passenger/class_PassengerShip.php
+++ b/application/ship-simu/main/ships/passenger/class_PassengerShip.php
@@ -20,24 +20,16 @@
  * 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 PassengerShip extends BaseShip implements ConstructableShip, LimitableObject {
        // Konstruktor
-       private function __construct () {
+       protected function __construct () {
                // Eltern-Kontruktor aufrufen
-               parent::constructor(__CLASS__);
-
-               // Debug message
-               if (((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) && (defined('DEBUG_CONSTRUCT'))) {
-                       $this->getDebugInstance()->output(sprintf("[%s:%d] Konstruktor erreicht.<br />\n",
-                               __CLASS__,
-                               __LINE__
-                       ));
-               }
+               parent::__construct(__CLASS__);
 
                // Set description
-               $this->setPartDescr("Passagier-Schiff");
+               $this->setObjectDescription("Passagier-Schiff");
 
                // Generate unique ID number
                $this->createUniqueID();
@@ -97,7 +89,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
                                        $cab = $el->getPartInstance();
                                        if (!is_null($cab)) {
                                                // Kabinenbeschreibung holen
-                                               $cabType = $cab->getPartDescr();
+                                               $cabType = $cab->getObjectDescription();
                                        }
 
                                        // Debug-Meldung ausgeben
@@ -113,7 +105,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
                                if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] <strong>%s</strong> ist keine Kabine.<br />\n",
                                        __CLASS__,
                                        __LINE__,
-                                       $el->getPartDescr()
+                                       $el->getObjectDescription()
                                ));
                        }
                }
@@ -121,7 +113,7 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
                if ((defined('DEBUG_SHIP')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Das <strong>%s</strong> mit dem Namen <strong>%s</strong> hat <strong>%d</strong> Betten.<br />\n",
                        __CLASS__,
                        __LINE__,
-                       $this->getPartDescr(),
+                       $this->getObjectDescription(),
                        $this->getShipName(),
                        $numBeds
                ));
@@ -131,20 +123,17 @@ class PassengerShip extends BaseShip implements ConstructableShip, LimitableObje
        }
 
        /**
-        * Stub!
-        */
-       public function saveObjectToDatabase () {
-               $this->getDebugInstance()->output(sprintf("[%s:] Stub <strong>%s</strong> erreicht.",
-                       $this->__toString(),
-                       __FUNCTION__
-               ));
-       }
-
-       /**
-        * Limits this object with an ObjectLimits instance
+        * Reduces the volume of a processed object.
+        *
+        * @param               $limitInstance          An instance to ObjectLimits which holds
+        *                              attribute names that we want to include in the processing
+        *                              phase. Other attributes except $uniqueID and $realClass will
+        *                              be ignored and keept out.
+        * @return      void
         */
-       public function limitObject (ObjectLimits $limitInstance) {
-               ApplicationEntryPoint::app_die("".__METHOD__." reached! Stub!");
+       function limitObject (ObjectLimits $limitInstance) {
+               // Work in progress
+               $this->partialStub("Unfinished method called.");
        }
 }