More renamed

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

diff --git a/application/ship-simu/main/companies/class_ShippingCompany.php b/application/ship-simu/main/companies/class_ShippingCompany.php
index 972e6e4dbfec7798c10e34ff34df249639b914ba..de959b62f836e6f272d9de6d6e74e676a24994bf 100644 (file)
--- a/application/ship-simu/main/companies/class_ShippingCompany.php
+++ b/application/ship-simu/main/companies/class_ShippingCompany.php
@@ -2,11 +2,11 @@
 /**
  * A shipping company may be founded with this class
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
  * @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
@@ -83,7 +83,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
         * @return      $companyInstance        Prepared company instance
         * @todo        Add functionality if user participates in a company
         */
-       public final static function createShippingCompany (ManageableAccount $userInstance) {
+       public static final function createShippingCompany (ManageableAccount $userInstance) {
                // Get new instance
                $companyInstance = new ShippingCompany();
 
@@ -403,7 +403,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                        } elseif (!is_object($shipyard)) {
                                // Not an object! ;-(
-                               throw new NoObjectException($shipyard, self::EXCEPTION_IS_NO_OBJECT);
+                               throw new InvalidObjectException($shipyard, self::EXCEPTION_IS_NO_OBJECT);
                        } elseif ($shipyard->isClass("Shipyard") === false) {
                                // Nope, so throw exception
                                throw new ClassMismatchException(array($shipyard->__toString(), "Shipyard"), self::EXCEPTION_CLASSES_NOT_MATCHING);
@@ -471,7 +471,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                // Is the class there?
                if (!class_exists($shipType)) {
                        // Throw exception
-                       throw new ClassNotFoundException($shipType, self::EXCEPTION_CLASS_NOT_FOUND);
+                       throw new NoClassException($shipType, self::EXCEPTION_CLASS_NOT_FOUND);
                }
 
                // Create dummy ship
@@ -491,7 +491,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                        } elseif (!is_object($shipyard)) {
                                // Not an object! ;-(
-                               throw new NoObjectException($shipyard, self::EXCEPTION_IS_NO_OBJECT);
+                               throw new InvalidObjectException($shipyard, self::EXCEPTION_IS_NO_OBJECT);
                        } elseif ($shipyard->isClass("Shipyard") === false) {
                                // Class is not a shipyard
                                throw new ClassMismatchException(array($shipyard->__toString(), "Shipyard"), self::EXCEPTION_CLASSES_NOT_MATCHING);
@@ -513,7 +513,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        throw new NullPointerException($this, 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);
                }
 
                // Get it's real class name
@@ -550,7 +550,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                        } elseif (!is_object($shipyard)) {
                                // Not an object! ;-(
-                               throw new NoObjectException($shipyard, self::EXCEPTION_IS_NO_OBJECT);
+                               throw new InvalidObjectException($shipyard, self::EXCEPTION_IS_NO_OBJECT);
                        } elseif ($shipyard->isClass("Shipyard") === false) {
                                // Class is not a shipyard
                                throw new ClassMismatchException(array($shipyard->__toString(), "Shipyard"), self::EXCEPTION_CLASSES_NOT_MATCHING);
@@ -651,7 +651,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
                } elseif (!is_object($contractInstance)) {
                        // Not an object! ;-(
-                       throw new NoObjectException($contractInstance, self::EXCEPTION_IS_NO_OBJECT);
+                       throw new InvalidObjectException($contractInstance, self::EXCEPTION_IS_NO_OBJECT);
                } elseif ($contractInstance->isClass("WorksContract") === false) {
                        // Is not a merchant
                        throw new ClassMismatchException(array($contractInstance->__toString(), "WorksContract"), self::EXCEPTION_CLASSES_NOT_MATCHING);