/**
* A general Registry
*
- * @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 - 2012 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core 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
*/
private static $registryInstance = NULL;
- /**
- * Instance registry
- */
- private $instanceRegistry = array();
-
- /**
- * Raw data entries (non-objects)
- */
- private $rawEntries = array();
-
/**
* Protected constructor
*
protected function __construct ($className) {
// Call parent constructor
parent::__construct($className);
+
+ // Init raw array
+ $this->initGenericArrayGroup('raw', 'generic');
}
/**
*/
public function instanceExists ($instanceKey) {
// Does this key exists?
- $exists = (isset($this->instanceRegistry[$instanceKey]));
+ $exists = $this->isGenericArrayKeySet('registry', 'instance', $instanceKey);
// Return the result
return $exists;
* @return void
*/
public function addInstance ($instanceKey, Registerable $objectInstance) {
- $this->instanceRegistry[$instanceKey] = $objectInstance;
+ $this->setGenericArrayKey('registry', 'instance', $instanceKey, $objectInstance);
}
/**
* @return $instanceRegistry The whole instance registry array
*/
public final function getInstanceRegistry () {
- return $this->instanceRegistry;
+ return $this->getGenericSubArray('registry', 'instance');
}
/**
* @return void
*/
public final function addEntry ($key, $value) {
- // Simply add it
- $this->rawEntries[$key][] = $value;
+ // Key must not be an array
+ assert(!is_array($key));
+
+ // Push it
+ $this->pushValueToGenericArrayKey('raw', 'generic', $key, $value);
}
/**
* @return $entries An array with entries from this registry
*/
public final function getEntries ($key = NULL) {
+ // Key must not be an array
+ assert(!is_array($key));
+
// Default is whole array
- $entries = $this->rawEntries;
+ $entries = $this->getGenericArray('raw');
// Is $key set?
if (!is_null($key)) {
// Then use this entry
- $entries = $this->rawEntries[$key];
+ $entries = $this->getGenericArrayKey('raw', 'generic', $key);
} // END - if
// Return the array
/**
* "Getter" for an array of all entries for given key
*
+ * @param $arrayKey The array (key) to look in
* @param $lookFor The key to look for
* @return $entry An array with all keys
*/
- public function getArrayFromKey ($lookFor) {
+ public function getArrayFromKey ($arrayKey, $lookFor) {
+ // Key must not be an array
+ assert(!is_array($arrayKey));
+
// Init array
$entry = array();
+ // Debug message
+ //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Checking arrayKey=' . $arrayKey . ',lookFor=' . $lookFor);
+
// "Walk" over all entries
- foreach ($this->getEntries('object-name') as $key => $value) {
+ foreach ($this->getEntries($arrayKey) as $key => $value) {
// Debug message
- //* DEBUG: */ $this->debugOutput('REGISTRY: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
+ //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
// If $value matches the $lookFor, we need to look for more entries for this!
if ($lookFor == $value) {
// Look for more entries
foreach ($this->getEntries() as $key2 => $value2) {
- // Debug message
- //* DEBUG: */ $this->debugOutput('REGISTRY: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
-
- // Both keys must match!
- if (($key == $key2) || (isset($value2[$key]))) {
+ // Now "walk" through all entries, if an array is returned
+ if (is_array($value2)) {
// Debug message
- //* DEBUG: */ $this->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+ //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Checking key2=' . $key2 . ',value2()=' . count($value2) . ',lookFor=' . $lookFor);
- // Then add it
- $entry[$key2] = $value2[$key];
+ // "Walk" through all of them
+ foreach ($value2 as $key3 => $value3) {
+ // $value3 needs to be an array
+ assert(is_array($value3));
+
+ // Debug message
+ //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Checking key=' . $key . ',key3=' . $key3 . ',isset()=' . isset($value3[$key]) . ' ...');
+
+ // Both keys must match!
+ if (($key == $key3) || (isset($value3[$key]))) {
+ // Debug message
+ //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Adding ' . $value3[$key] . ' ...');
+
+ // Then add it
+ $entry[$key3] = $value3[$key];
+ } // END - if
+ } // END - foreach
} // END - if
} // END - foreach
} // END - if
} // END - foreach
+ // Debug message
+ //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __METHOD__ . ':' . __LINE__ . ']: Returning entry(' . count($entry) . ')=' . print_r($entry, TRUE));
+
// Return it
return $entry;
}
} // END - if
// Get the instance
- $objectInstance = $this->instanceRegistry[$instanceKey];
+ $objectInstance = $this->getGenericArrayKey('registry', 'instance', $instanceKey);
// Return the result
return $objectInstance;