Author: grobmeier
Date: Mon May 18 10:09:14 2009
New Revision: 775885
URL: http://svn.apache.org/viewvc?rev=775885&view=rev
Log:
fixed bracket flow
Modified:
incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php
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=775885&r1=775884&r2=775885&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
(original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php Mon
May 18 10:09:14 2009
@@ -172,8 +172,7 @@
* {...@link LOG4PHP_LOGGER_PATTERN_LAYOUT_DEFAULT_LAYOUT_PATTERN}.
* The default pattern just produces the application supplied message.
*/
- function LoggerPatternLayout($pattern = null)
- {
+ function LoggerPatternLayout($pattern = null) {
if ($pattern === null) {
$this->LoggerPatternLayout(LOG4PHP_LOGGER_PATTERN_LAYOUT_DEFAULT_CONVERSION_PATTERN);
} else {
@@ -186,8 +185,7 @@
* controls formatting and consists of a mix of literal content and
* conversion specifiers.
*/
- function setConversionPattern($conversionPattern)
- {
+ function setConversionPattern($conversionPattern) {
$this->pattern = $conversionPattern;
$patternParser = new LoggerPatternParser($this->pattern);
$this->head = $patternParser->parse();
@@ -196,13 +194,11 @@
/**
* @return string Returns the value of the <b>ConversionPattern</b> option.
*/
- function getConversionPattern()
- {
+ function getConversionPattern() {
return $this->pattern;
}
- function ignoresThrowable()
- {
+ function ignoresThrowable() {
return true;
}
@@ -212,8 +208,7 @@
* @param LoggerLoggingEvent $event
* @return string
*/
- function format($event)
- {
+ function format($event) {
// Reset working stringbuffer
$this->sbuf = '';
$c = $this->head;
@@ -223,5 +218,4 @@
}
return $this->sbuf;
}
-
}
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php?rev=775885&r1=775884&r2=775885&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerXmlLayout.php Mon May 18
10:09:14 2009
@@ -72,8 +72,7 @@
/**
* No options to activate.
*/
- function activateOptions()
- {
+ function activateOptions() {
if ($this->getLog4jNamespace()) {
$this->_namespace = LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS;
$this->_namespacePrefix =
LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS_PREFIX;
@@ -86,8 +85,7 @@
/**
* @return string
*/
- function getHeader()
- {
+ function getHeader() {
return "<{$this->_namespacePrefix}:eventSet ".
"xmlns:{$this->_namespacePrefix}=\"{$this->_namespace}\" ".
"version=\"0.3\" ".
@@ -101,8 +99,7 @@
* @param LoggerLoggingEvent $event
* @return string
*/
- function format($event)
- {
+ function format($event) {
$loggerName = $event->getLoggerName();
$timeStamp = number_format((float)($event->getTimeStamp() * 1000), 0,
'', '');
$thread = $event->getThreadName();
@@ -141,8 +138,7 @@
/**
* @return string
*/
- function getFooter()
- {
+ function getFooter() {
return "</{$this->_namespacePrefix}:eventSet>\r\n";
}
@@ -150,16 +146,14 @@
/**
* @return boolean
*/
- function getLocationInfo()
- {
+ function getLocationInfo() {
return $this->locationInfo;
}
/**
* @return boolean
*/
- function getLog4jNamespace()
- {
+ function getLog4jNamespace() {
return $this->log4jNamespace;
}
@@ -168,8 +162,7 @@
* return value <b>false</b>.
* @return boolean
*/
- function ignoresThrowable()
- {
+ function ignoresThrowable() {
return false;
}
@@ -180,16 +173,14 @@
* true, then the file name and line number of the statement at the
* origin of the log statement will be output.
*/
- function setLocationInfo($flag)
- {
+ function setLocationInfo($flag) {
$this->locationInfo = LoggerOptionConverter::toBoolean($flag, true);
}
/**
* @param boolean
*/
- function setLog4jNamespace($flag)
- {
+ function setLog4jNamespace($flag) {
$this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, true);
}