X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fconstructions%2Fyards%2Fclass_Shipyard.php;h=474821a237f8118d0dc8dce20e5f5e94bc3d9488;hp=3fdb10a4e93436c238889900a587057149640ec3;hb=efba981c9bf18c733dfde945b09111ff4b6007ce;hpb=3cdaf6ce082d9e7a20cbeb06d525c28b3dd95c15

diff --git a/application/ship-simu/main/constructions/yards/class_Shipyard.php b/application/ship-simu/main/constructions/yards/class_Shipyard.php
index 3fdb10a..474821a 100644
--- a/application/ship-simu/main/constructions/yards/class_Shipyard.php
+++ b/application/ship-simu/main/constructions/yards/class_Shipyard.php
@@ -5,9 +5,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, this is free software
  * @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
@@ -27,10 +27,10 @@ class Shipyard extends BaseConstruction {
 	private $shipyardName    = "Namenlose Werft";
 
 	// Arbeiter-Liste
-	private $staffList       = null;
+	private $staffList = null;
 
 	// Queue-Liste fuer zu bauende Schiffe
-	private $queueList       = null;
+	private $queueList = null;
 
 	// Aktuell im Bau befindliches Schiff
 	private $currShipInConst = null;
@@ -57,7 +57,7 @@ class Shipyard extends BaseConstruction {
 		$this->createShipTypeList();
 
 		// Generate unique ID number
-		$this->createUniqueID();
+		$this->generateUniqueId();
 	}
 
 	// Create a shipyard and notify it about it's owner
@@ -81,7 +81,7 @@ class Shipyard extends BaseConstruction {
 		$shipyardInstance = new Shipyard();
 
 		// Debug message
-		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $shipyardInstance->getDebugInstance()->output(sprintf("[%s:%d] Eine Werft mit dem Namen <strong>%s</strong> wird im Hafen <strong>%s</strong> konstruiert.<br />\n",
+		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $shipyardInstance->debugOutput(sprintf("[%s:%d] Eine Werft mit dem Namen <strong>%s</strong> wird im Hafen <strong>%s</strong> konstruiert.",
 			__CLASS__,
 			__LINE__,
 			$shipyardName,
@@ -104,7 +104,7 @@ class Shipyard extends BaseConstruction {
 		$shipyardInstance->removeSystemArray();
 
 		// Debug-Meldung
-		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $shipyardInstance->getDebugInstance()->output(sprintf("[%s:%d] Die Werft <strong>%s</strong> wurde gebaut.<br />\n",
+		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $shipyardInstance->debugOutput(sprintf("[%s:%d] Die Werft <strong>%s</strong> wurde gebaut.",
 			__CLASS__,
 			__LINE__,
 			$shipyardName
@@ -116,21 +116,11 @@ class Shipyard extends BaseConstruction {
 
 	// Create staff list
 	private function createStaffList () {
-		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Werft <strong>%s</strong> erh&auml;lt eine Arbeiterliste.<br />\n",
-			__CLASS__,
-			__LINE__,
-			$this->getShipyardName()
-		));
 		$this->staffList = new FrameworkArrayObject("FakedStaffList");
 	}
 
 	// Create ship type list
 	private function createShipTypeList () {
-		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Werft <strong>%s</strong> erh&auml;lt eine Typenliste.<br />\n",
-			__CLASS__,
-			__LINE__,
-			$this->getShipyardName()
-		));
 		$this->shipTypeList = new FrameworkArrayObject("FakedShipTypeList");
 	}
 
@@ -176,7 +166,7 @@ class Shipyard extends BaseConstruction {
 		$shipType = (string) $shipType;
 
 		// Debug message
-		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Werft <strong>%s</strong> kann bald Schiffe vom Typ <strong>%s</strong> bauen.<br />\n",
+		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] Die Werft <strong>%s</strong> kann bald Schiffe vom Typ <strong>%s</strong> bauen.",
 			__CLASS__,
 			__LINE__,
 			$this->getShipyardName(),
@@ -196,7 +186,7 @@ class Shipyard extends BaseConstruction {
 		$shipType = (string) $shipType;
 
 		// Debug message
-		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Werft <strong>%s</strong> pr&uuml;ft, ob Schiffe vom Typ <strong>%s</strong> baubar sind.<br />\n",
+		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] Die Werft <strong>%s</strong> pr&uuml;ft, ob Schiffe vom Typ <strong>%s</strong> baubar sind.",
 			__CLASS__,
 			__LINE__,
 			$this->getShipyardName(),
@@ -216,7 +206,7 @@ class Shipyard extends BaseConstruction {
 		}
 
 		// Debug message
-		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->getDebugInstance()->output(sprintf("[%s:%d] Die Werft <strong>%s</strong> hat die Suche nach dem Schiffstyp <strong>%s</strong> abgeschlossen.<br />\n",
+		if ((defined('DEBUG_SHIPYARD')) || (defined('DEBUG_ALL'))) $this->debugOutput(sprintf("[%s:%d] Die Werft <strong>%s</strong> hat die Suche nach dem Schiffstyp <strong>%s</strong> abgeschlossen.",
 			__CLASS__,
 			__LINE__,
 			$this->getShipyardName(),