Continued:

[shipsimu.git] / application / shipsimu / classes / companies / class_ShippingCompany.php

diff --git a/application/shipsimu/classes/companies/class_ShippingCompany.php b/application/shipsimu/classes/companies/class_ShippingCompany.php
index 7263f0baa5b2b1bafbda33a86d95a3cdd7a959bf..9601126fd435af8f8ccb5643eed2eb28ee2e2fbd 100644 (file)
--- a/application/shipsimu/classes/companies/class_ShippingCompany.php
+++ b/application/shipsimu/classes/companies/class_ShippingCompany.php
@@ -92,7 +92,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        // Then do some nasty caching here but don't throw an exception
                        // because then you will hurt our web helpers... :/
                        $companyInstance->partialStub("Don't throw exceptions here.");
-               } // END - if
+               }
 
                // Init all lists
                $companyInstance->initCompanyLists();
@@ -124,7 +124,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($resultInstance instanceof SearchableResult) {
                        // Set the result instance
                        $this->setResultInstance($resultInstance);
-               } // END - if
+               }
 
                // Return result
                return $participates;
@@ -146,8 +146,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                // Is it set?
                if ($resultInstance instanceof SearchableResult) {
                        // Result found so analyse it
-                       $this->partialStub("Check if user is company founder.");
-               } // END - if
+                       DebugMiddleware::getSelfInstance()->partialStub('Check if user is company founder.');
+               }
 
                // Return result
                return $isFounder;
@@ -169,8 +169,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                // Is it set?
                if ($resultInstance instanceof SearchableResult) {
                        // Result found so analyse it
-                       $this->partialStub("Check if user is company owner.");
-               } // END - if
+                       DebugMiddleware::getSelfInstance()->partialStub('heck if user is company owner.');
+               }
 
                // Return result
                return $isOwner;
@@ -192,7 +192,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($resultInstance instanceof SearchableResult) {
                        // Result found so he is employee
                        $isEmployee = true;
-               } // END - if
+               }
 
                // Return result
                return $isEmployee;
@@ -240,7 +240,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                $dummy = explode(" ", $this->getCompanyName());
                foreach ($dummy as $part) {
                        $this->shortName .= substr($part, 0, 1);
-               } // END - if
+               }
        }
 
        // Reedereien Werften bauen lassen
@@ -304,7 +304,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($totalUnemployed < $amount) {
                        // Reichte nicht aus!
                        throw new ToMuchEmployeesException(array($amount, $personellInstance->getAllUnemployed()), self::EXCEPTION_NOT_ENOUGTH_UNEMPLOYEES);
-               } // END - if
+               }
 
                // Get list for all unemployed people
                $list = $personellInstance->getSpecialPersonellList(false); // Should be cached
@@ -328,7 +328,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                if ($iterator->valid() === false) {
                                        // Should normally not happen... :(
                                        throw new StructuresOutOfBoundsException($idx, self::EXCEPTION_INDEX_OUT_OF_BOUNDS);
-                               } // END - if
+                               }
 
                                // Get current element
                                $employee = $iterator->current();
@@ -392,7 +392,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        if ($shipyardIter->valid() === false) {
                                // Rewind to first position
                                $shipyardIter->seek(0);
-                       } // END - if
+                       }
 
                        // Get Shipyard object
                        $shipyard = $shipyardIter->current();
@@ -603,7 +603,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($partnerInstance->isContractPartner($contractInstance) === false) {
                        // Invalid contract partner!
                        throw new InvalidContractPartnerException($partnerInstance, self::EXCEPTION_CONTRACT_PARTNER_INVALID);
-               } // END - if
+               }
 
                // Determine if company "signs" own contract (must be done) or with an other party
                if ($this->equals($partnerInstance)) {