Author: grobmeier
Date: Mon May 4 15:31:18 2009
New Revision: 771333
URL: http://svn.apache.org/viewvc?rev=771333&view=rev
Log:
added default implementation of activateOptions: return true, since only one
Layout needs to do something here
Modified:
incubator/log4php/trunk/src/main/php/LoggerLayout.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php
incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php
incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
Modified: incubator/log4php/trunk/src/main/php/LoggerLayout.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerLayout.php?rev=771333&r1=771332&r2=771333&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerLayout.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerLayout.php Mon May 4 15:31:18
2009
@@ -42,9 +42,12 @@
}
/**
- * Override this method
+ * Activates options for this layout.
+ * Override this method if you have options to be activated.
*/
- abstract function activateOptions();
+ public function activateOptions() {
+ return true;
+ }
/**
* Override this method to create your own layout format.
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php?rev=771333&r1=771332&r2=771333&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutHtml.php Mon May
4 15:31:18 2009
@@ -116,14 +116,6 @@
}
/**
- * No options to activate.
- */
- function activateOptions()
- {
- return true;
- }
-
- /**
* @param LoggerLoggingEvent $event
* @return string
*/
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php?rev=771333&r1=771332&r2=771333&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php
(original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutSimple.php Mon May
4 15:31:18 2009
@@ -40,10 +40,6 @@
return;
}
- function activateOptions() {
- return;
- }
-
/**
* Returns the log statement in a format consisting of the
* <b>level</b>, followed by " - " and then the
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php?rev=771333&r1=771332&r2=771333&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerLayoutTTCC.php Mon May
4 15:31:18 2009
@@ -79,10 +79,6 @@
return;
}
- public function activateOptions() {
- return;
- }
-
/**
* The <b>ThreadPrinting</b> option specifies whether the name of the
* current thread is part of log output or not. This is true by default.
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php?rev=771333&r1=771332&r2=771333&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
(original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php Mon
May 4 15:31:18 2009
@@ -201,14 +201,6 @@
return $this->pattern;
}
- /**
- * Does not do anything as options become effective
- */
- function activateOptions()
- {
- // nothing to do.
- }
-
function ignoresThrowable()
{
return true;
