Deprecated call removed

[shipsimu.git] / application / ship-simu / main / class_WorksContract.php

diff --git a/application/ship-simu/main/class_WorksContract.php b/application/ship-simu/main/class_WorksContract.php
index f56c2fae74ca79eefb906d9756af3569c076e07e..ff4e019907f59eacd5fe66fe99fc260dc8a7e2a3 100644 (file)
--- a/application/ship-simu/main/class_WorksContract.php
+++ b/application/ship-simu/main/class_WorksContract.php
@@ -4,7 +4,7 @@
  *
  * @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
  *
@@ -44,10 +44,6 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeSystemArray();
-               $this->removeNumberFormaters();
        }
 
        // Neuen Bauvertrag generieren
@@ -255,7 +251,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                        throw new NullPointerException($shipInstance, self::EXCEPTION_IS_NULL_POINTER);
                } elseif (!is_object($shipInstance)) {
                        // Not an object! ;-(
-                       throw new NoObjectException($shipInstance, self::EXCEPTION_IS_NO_OBJECT);
+                       throw new InvalidObjectException($shipInstance, self::EXCEPTION_IS_NO_OBJECT);
                } elseif (!$shipInstance instanceof ConstructableShip) {
                        // Does not have the required feature (method)
                        throw new ShipIsInvalidException(array($shipInstance), self::EXCEPTION_INVALID_SHIP_INSTANCE);
@@ -284,7 +280,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                                throw new NullPointerException($item, self::EXCEPTION_IS_NULL_POINTER);
                        } elseif (!is_object($item)) {
                                // Not an object! ;-(
-                               throw new NoObjectException($item, self::EXCEPTION_IS_NO_OBJECT);
+                               throw new InvalidObjectException($item, self::EXCEPTION_IS_NO_OBJECT);
                        } elseif (!$item instanceof BaseSimulator) {
                                // Does not have the required feature (method)
                                throw new MissingMethodException(array($item, 'getPartInstance'), self::EXCEPTION_MISSING_METHOD);
@@ -299,7 +295,7 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract {
                                throw new NullPointerException($part, self::EXCEPTION_IS_NULL_POINTER);
                        } elseif (!is_object($part)) {
                                // Not an object! ;-(
-                               throw new NoObjectException($part, self::EXCEPTION_IS_NO_OBJECT);
+                               throw new InvalidObjectException($part, self::EXCEPTION_IS_NO_OBJECT);
                        } elseif (!method_exists($part, 'getPrice')) {
                                // Does not have the required feature (method)
                                throw new MissingMethodException(array($part, 'getPrice'), self::EXCEPTION_MISSING_METHOD);