Author: grobmeier
Date: Sun Jul 19 23:00:21 2009
New Revision: 795655
URL: http://svn.apache.org/viewvc?rev=795655&view=rev
Log:
commented out unnecessary methods - to be removed after careful consideration
Modified:
incubator/log4php/trunk/src/main/php/Logger.php
Modified: incubator/log4php/trunk/src/main/php/Logger.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/Logger.php?rev=795655&r1=795654&r2=795655&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/Logger.php (original)
+++ incubator/log4php/trunk/src/main/php/Logger.php Sun Jul 19 23:00:21 2009
@@ -57,8 +57,8 @@
/** @var Logger The parent of this category. Null if this is the root
logger*/
private $parent = null;
- /** @var LoggerHierarchy the object repository */
- private $repository = null;
+// /** @var LoggerHierarchy the object repository */
+// private $repository = null;
/**
* @var array collection of appenders
@@ -164,9 +164,9 @@
}
private function logLevel($message, $level, $caller = null) {
- if($this->repository->isDisabled($level)) {
- return;
- }
+// if($this->repository->isDisabled($level)) {
+// return;
+// }
if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
$this->forcedLog($this->fqcn, $caller, $level,
$message);
}
@@ -235,26 +235,26 @@
return $this->level;
}
- /**
- * Get a Logger by name (Delegate to {...@link LoggerManager})
- *
- * @param string $name logger name
- * @param LoggerFactory $factory a {...@link LoggerFactory} instance or
null
- * @return Logger
- * @static
- */
- // TODO: remove method? confusing design
- public function getLogger($name) {
- return LoggerManager::getLogger($name);
- }
-
- /**
- * Return the the repository where this Category is attached.
- * @return LoggerHierarchy
- */
- public function getLoggerRepository() {
- return $this->repository;
- }
+// /**
+// * Get a Logger by name (Delegate to {...@link LoggerManager})
+// *
+// * @param string $name logger name
+// * @param LoggerFactory $factory a {...@link LoggerFactory} instance or
null
+// * @return Logger
+// * @static
+// */
+// // TODO: remove method? confusing design
+// public function getLogger($name) {
+// return LoggerManager::getLogger($name);
+// }
+//
+// /**
+// * Return the the repository where this Category is attached.
+// * @return LoggerHierarchy
+// */
+// public function getLoggerRepository() {
+// return $this->repository;
+// }
/**
* Return the category name.
@@ -272,24 +272,24 @@
return $this->parent;
}
- /**
- * Return the root of the default category hierarchy.
- * @return LoggerRoot
- */
- // TODO: remove method? confusing design
- public function getRoot() {
- return LoggerManager::getRootLogger();
- }
-
- /**
- * get the Root Logger (Delegate to {...@link LoggerManager})
- * @return LoggerRoot
- * @static
- */
- // TODO: remove method? confusing design
- public static function getRootLogger() {
- return LoggerManager::getRootLogger();
- }
+// /**
+// * Return the root of the default category hierarchy.
+// * @return LoggerRoot
+// */
+// // TODO: remove method? confusing design
+// public function getRoot() {
+// return LoggerManager::getRootLogger();
+// }
+
+// /**
+// * get the Root Logger (Delegate to {...@link LoggerManager})
+// * @return LoggerRoot
+// * @static
+// */
+// // TODO: remove method? confusing design
+// public static function getRootLogger() {
+// return LoggerManager::getRootLogger();
+// }
/**
* Is the appender passed as parameter attached to this category?
@@ -315,9 +315,9 @@
* @return boolean
*/
public function isEnabledFor($level) {
- if($this->repository->isDisabled($level)) {
- return false;
- }
+// if($this->repository->isDisabled($level)) {
+// return false;
+// }
return
(bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
}
@@ -383,8 +383,9 @@
*
* @param LoggerHierarchy $repository
*/
+ // TODO: remove method?
public function setHierarchy($repository) {
- $this->repository = $repository;
+// $this->repository = $repository;
}
/**
