cvs: pear /XML_Transformer Transformer.php /XML_Transformer/Transformer CallbackRegistry.php

sebastian Fri Sep 26 13:05:01 2003 EDT Modified files: /pear/XML_Transformer Transformer.php /pear/XML_Transformer/Transformer CallbackRegistry.php Log: singleton() -> getInstance() Index: pear/XML_Transformer/Transformer.php diff -u pear/XML_Transformer/Transformer.php:1.113 pear/XML_Transformer/Transformer.php:1.114 --- pear/XML_Transformer/Transformer.php:1.113 Fri Sep 26 12:52:35 2003 +++ pear/XML_Transformer/Transformer.php Fri Sep 26 13:05:00 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: Transformer.php,v 1.113 2003/09/26 16:52:35 sebastian Exp $ +// $Id: Transformer.php,v 1.114 2003/09/26 17:05:00 sebastian Exp $ // require_once 'XML/Transformer/CallbackRegistry.php'; @@ -29,7 +29,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.113 $ +* @version $Revision: 1.114 $ * @access public */ class XML_Transformer { @@ -154,7 +154,7 @@ // Initialize callback registry. - $this->_callbackRegistry = &XML_Transformer_CallbackRegistry::singleton( + $this->_callbackRegistry = &XML_Transformer_CallbackRegistry::getInstance( $recursiveOperation ); Index: pear/XML_Transformer/Transformer/CallbackRegistry.php diff -u pear/XML_Transformer/Transformer/CallbackRegistry.php:1.16 pear/XML_Transformer/Transformer/CallbackRegistry.php:1.17 --- pear/XML_Transformer/Transformer/CallbackRegistry.php:1.16 Sat Jan 18 13:01:23 2003 +++ pear/XML_Transformer/Transformer/CallbackRegistry.php Fri Sep 26 13:05:01 2003 @@ -13,7 +13,7 @@ // | license@php.net so we can mail you a copy immediately. | // +---------------------------------------------------------------------------+ // -// $Id: CallbackRegistry.php,v 1.16 2003/01/18 18:01:23 sebastian Exp $ +// $Id: CallbackRegistry.php,v 1.17 2003/09/26 17:05:01 sebastian Exp $ // /** @@ -21,7 +21,7 @@ * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @author Kristian Köhntopp <kris@koehntopp.de> -* @version $Revision: 1.16 $ +* @version $Revision: 1.17 $ * @access public */ class XML_Transformer_CallbackRegistry { @@ -63,15 +63,16 @@ } // }}} - // {{{ function &singleton($recursiveOperation) + // {{{ function &getInstance($recursiveOperation) /** - * Singleton. + * Returns an instance of XML_Transformer_CallbackRegistry. * * @param boolean + * @return XML_Transformer_CallbackRegistry * @access public */ - function &singleton($recursiveOperation) { + function &getInstance($recursiveOperation) { static $instance; if (!isset($instance)) {