X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fpersonell%2Fclass_SimulatorPersonell.php;h=86b1ba0d42ee944af5607f0351d64c0acad01c94;hp=724980be21c988f28f0374ec3c4d1392449b103e;hb=6019ae86707cb6decaddc63f191e3ef6eb5e4d44;hpb=b3e47fb693fb8d40868158b0192b3392b309d97a

diff --git a/application/ship-simu/main/personell/class_SimulatorPersonell.php b/application/ship-simu/main/personell/class_SimulatorPersonell.php
index 724980b..86b1ba0 100644
--- a/application/ship-simu/main/personell/class_SimulatorPersonell.php
+++ b/application/ship-simu/main/personell/class_SimulatorPersonell.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, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -122,16 +122,11 @@ class SimulatorPersonell extends BasePersonell {
 	 * Create a SimulatorPersonell object by loading the specified personell
 	 * list from an existing database backend
 	 *
-	 * @param		$idNumber		The ID number (only right part) of the list
-	 * @return	$personellInstance	An instance of
-	 * @throws	InvalidIDFormatException		If the given id number
-	 *									$idNumber is invalid
-	 * @throws	NullPointerException		If a null pointer (instance)
-	 *									has been returned.
-	 * @throws	NoObjectException			If a non-object has been
-	 *									returned
-	 * @throws	MissingMethodException		If a required method is missing
-	 * @throws	MissingSimulatorIDException	If an ID number was not found
+	 * @param	$idNumber			The ID number (only right part) of the list
+	 * @return	$personellInstance	An instance of this class
+	 * @throws	InvalidIDFormatException	If the given id number
+	 *										$idNumber is invalid
+	 * @throws	MissingSimulatorIdException		If an ID number was not found
 	 */
 	public final static function createSimulatorPersonellByID ($idNumber) {
 		// Add the class name if it was not found
@@ -155,22 +150,10 @@ class SimulatorPersonell extends BasePersonell {
 		// Get database instance
 		$dbInstance = $personellInstance->getDatabaseInstance();
 
-		// Is this a valid database instance?
-		if (is_null($dbInstance)) {
-			// No class returned
-			throw new NullPointerException($personellInstance, self::EXCEPTION_IS_NULL_POINTER);
-		} elseif (!is_object($dbInstance)) {
-			// Not an object! ;-(
-			throw new NoObjectException($dbInstance, self::EXCEPTION_IS_NO_OBJECT);
-		} elseif (!method_exists($dbInstance, 'isUniqueIdUsed')) {
-			// Required method not found
-			throw new MissingMethodException(array($dbInstance, 'isUniqueIdUsed'), self::EXCEPTION_MISSING_METHOD);
-		}
-
 		// Is the unique ID already used? Then it must be there!
 		if (!$dbInstance->isUniqueIdUsed($tempID))  {
 			// Entry not found!
-			throw new MissingSimulatorIDException(array($personellInstance, $idNumber), self::EXCEPTION_SIMULATOR_ID_INVALID);
+			throw new MissingSimulatorIdException(array($personellInstance, $idNumber), self::EXCEPTION_SIMULATOR_ID_INVALID);
 		}
 
 		// Load the personell list and add it to this object
@@ -208,7 +191,7 @@ class SimulatorPersonell extends BasePersonell {
 	// Add new personell object to our list
 	public function addRandomPersonell () {
 		// Gender list...
-		$genders = array('M', 'F');
+		$genders = array("M", "F");
 
 		// Create new personell members
 		$personellInstance = new SimulatorPersonell();
@@ -262,7 +245,7 @@ class SimulatorPersonell extends BasePersonell {
 		$this->setCacheCond($serialized);
 
 		// Create cached list
-		$this->setAllCacheList(new FrameworkArrayObject("FakedCacheList"));
+		$this->setAllCacheList(new FrameworkArrayObject('FakedCacheList'));
 
 		// Search all unemployed personells
 		for ($idx = $this->personellList->getIterator(); $idx->valid(); $idx->next()) {
@@ -344,10 +327,11 @@ class SimulatorPersonell extends BasePersonell {
 	 * Getter for surname. If no surname is set then default surnames are set
 	 * for male and female personells.
 	 *
-	 * @return	$surname		The personell' surname
+	 * @return	$surname	The personell' surname
 	 */
 	public final function getSurname () {
 		$surname = parent::getSurname();
+
 		// Make sure every one has a surname...
 		if (empty($surname)) {
 			if ($this->isMale()) {
@@ -360,7 +344,9 @@ class SimulatorPersonell extends BasePersonell {
 
 			// Set typical family name
 			parent::setFamily("Smith");
-		}
+		} // END - if
+
+		// Return surname
 		return $surname;
 	}
 
@@ -376,22 +362,19 @@ class SimulatorPersonell extends BasePersonell {
 	/**
 	 * Loads the mostly pre-cached personell list
 	 *
-	 * @param		$idNumber		The ID number we shall use for looking up
+	 * @param	$idNumber	The ID number we shall use for looking up
 	 *						the right data.
 	 * @return	void
 	 * @throws	ContainerItemIsNullException	If a container item is null
 	 * @throws	ContainerItemIsNoArrayException	If a container item is
-	 *										not an array
+	 *											not an array
 	 * @throws	ContainerMaybeDamagedException	If the container item
-	 *										is missing the indexes
-	 *										'name' and/or 'value'
-	 * @see		SerializationContainer	A special container class which
-	 *								helps storing only some attributes
-	 *								of a class.
+	 *											is missing the indexes
+	 *											'name' and/or 'value'
 	 */
 	public function loadPersonellList ($idNumber) {
 		// Cleared because old code
-		$this->partialStub("Clear because of old lost code was usaged.");
+		$this->partialStub("Cleared because old lost code was used.");
 	}
 }