Author: Derick Rethans
Date: 2006-09-28 10:46:30 +0200 (Thu, 28 Sep 2006)
New Revision: 3608
Log:
- Tabs to spaces
Modified:
trunk/Archive/src/archive_entry.php
trunk/ConsoleTools/src/structs/output_format.php
trunk/Database/src/sqlabstraction/implementations/query_select_oracle.php
trunk/EventLog/src/interfaces/writer.php
trunk/EventLog/src/log.php
trunk/EventLog/src/mapper/filter_rule.php
trunk/EventLog/src/writers/writer_file.php
trunk/EventLogDatabaseTiein/src/writers/writer_database.php
trunk/Graph/src/driver/svg.php
trunk/Graph/src/math/matrix.php
Modified: trunk/Archive/src/archive_entry.php
===================================================================
--- trunk/Archive/src/archive_entry.php 2006-09-28 08:36:04 UTC (rev 3607)
+++ trunk/Archive/src/archive_entry.php 2006-09-28 08:46:30 UTC (rev 3608)
@@ -99,40 +99,40 @@
*
* @param ezcArchiveFileStructure $struct
*/
- public function __construct( ezcArchiveFileStructure $struct )
- {
+ public function __construct( ezcArchiveFileStructure $struct )
+ {
$this->fileStructure = $struct;
- }
+ }
/**
* Returns true when this entry represents a directory.
*
* @return bool
*/
- public function isDirectory()
- {
+ public function isDirectory()
+ {
return ( $this->fileStructure->type == self::IS_DIRECTORY );
- }
+ }
/**
* Returns true when this entry represents a file.
*
* @return bool
*/
- public function isFile()
- {
+ public function isFile()
+ {
return ( $this->fileStructure->type == self::IS_FILE );
- }
+ }
/**
* Returns true when this entry represents a hard link.
*
* @return bool
*/
- public function isHardLink()
- {
+ public function isHardLink()
+ {
return ( $this->fileStructure->type == self::IS_LINK );
- }
+ }
/**
* Returns true when this entry represents a symbolic link.
@@ -195,8 +195,8 @@
*
* @return string
*/
- public function getPath( $withPrefix = true )
- {
+ public function getPath( $withPrefix = true )
+ {
if ( $withPrefix )
{
return $this->fileStructure->path;
@@ -205,7 +205,7 @@
{
return $this->getPathWithoutPrefix( $this->fileStructure->path,
$this->prefix );
}
- }
+ }
/**
* Returns the path without the prefix.
@@ -259,8 +259,8 @@
*
* @param bool $withPrefix
*/
- public function getLink( $withPrefix = true )
- {
+ public function getLink( $withPrefix = true )
+ {
if ( $withPrefix )
{
return $this->fileStructure->link;
@@ -269,17 +269,17 @@
{
return $this->getPathWithoutPrefix( $this->fileStructure->link,
$this->prefix );
}
- }
+ }
/**
* Returns a bit mask representing the permissions of this entry.
*
* @return int
*/
- public function getPermissions()
- {
+ public function getPermissions()
+ {
return $this->fileStructure->mode;
- }
+ }
/**
* Returns the file size.
Modified: trunk/ConsoleTools/src/structs/output_format.php
===================================================================
--- trunk/ConsoleTools/src/structs/output_format.php 2006-09-28 08:36:04 UTC
(rev 3607)
+++ trunk/ConsoleTools/src/structs/output_format.php 2006-09-28 08:46:30 UTC
(rev 3608)
@@ -15,14 +15,14 @@
* Struct class to store formating entities used by ezcConsoleOutput.
*
* Possible values of [EMAIL PROTECTED] ezcConsoleOutputFormat::$color} are:
- * - gray
- * - red
- * - green
- * - yellow
- * - blue
- * - magenta
- * - cyan
- * - white
+ * - gray
+ * - red
+ * - green
+ * - yellow
+ * - blue
+ * - magenta
+ * - cyan
+ * - white
* - default (representing the consoles default color)
*
* For [EMAIL PROTECTED] ezcConsoleOutputFormat::$bgcolor} the following
values are valid:
Modified:
trunk/Database/src/sqlabstraction/implementations/query_select_oracle.php
===================================================================
--- trunk/Database/src/sqlabstraction/implementations/query_select_oracle.php
2006-09-28 08:36:04 UTC (rev 3607)
+++ trunk/Database/src/sqlabstraction/implementations/query_select_oracle.php
2006-09-28 08:46:30 UTC (rev 3608)
@@ -144,10 +144,10 @@
*/
public function prepare()
{
- if ( $this->fromString == null || $this->fromString == "" )
- {
- $this->from( $this->getDummyTableName() );
- }
+ if ( $this->fromString == null || $this->fromString == '' )
+ {
+ $this->from( $this->getDummyTableName() );
+ }
return parent::prepare();
}
Modified: trunk/EventLog/src/interfaces/writer.php
===================================================================
--- trunk/EventLog/src/interfaces/writer.php 2006-09-28 08:36:04 UTC (rev
3607)
+++ trunk/EventLog/src/interfaces/writer.php 2006-09-28 08:46:30 UTC (rev
3608)
@@ -33,7 +33,7 @@
*
* @param string $message
* @param int $severity
- * ezcLog::DEBUG, ezcLog::SUCCES_AUDIT, ezcLog::FAIL_AUDIT,
ezcLog::INFO, ezcLog::NOTICE,
+ * ezcLog::DEBUG, ezcLog::SUCCES_AUDIT, ezcLog::FAIL_AUDIT,
ezcLog::INFO, ezcLog::NOTICE,
* ezcLog::WARNING, ezcLog::ERROR or ezcLog::FATAL.
* $param string $source
* @param string $category
Modified: trunk/EventLog/src/log.php
===================================================================
--- trunk/EventLog/src/log.php 2006-09-28 08:36:04 UTC (rev 3607)
+++ trunk/EventLog/src/log.php 2006-09-28 08:46:30 UTC (rev 3608)
@@ -492,9 +492,9 @@
$this->context->setSourceContext( $sources, $attributes );
}
- /**
- * This method can be set as error_handler to log using [EMAIL
PROTECTED] trigger_error()}.
- *
+ /**
+ * This method can be set as error_handler to log using [EMAIL PROTECTED]
trigger_error()}.
+ *
* This method can be assigned with the [EMAIL PROTECTED]
set_error_handler()} to handle the
* trigger_error calls. This method will get the log instance and forward
the
* message. But includes the following information:
Modified: trunk/EventLog/src/mapper/filter_rule.php
===================================================================
--- trunk/EventLog/src/mapper/filter_rule.php 2006-09-28 08:36:04 UTC (rev
3607)
+++ trunk/EventLog/src/mapper/filter_rule.php 2006-09-28 08:46:30 UTC (rev
3608)
@@ -34,30 +34,30 @@
*
* @var bool
*/
- private $continueProcessing;
+ private $continueProcessing;
/**
* The container that contains the result.
*
* @var array(mixed)
*/
- private $container;
+ private $container;
/**
* True if it matches all severities, otherwise false.
*
* @var bool
*/
- private $severityStar = false;
+ private $severityStar = false;
/**
* True if it matches all sources, otherwise false.
*
* @var bool
*/
- private $sourceStar = false;
+ private $sourceStar = false;
- /**
+ /**
* True if it matches all categories, otherwise false.
*
* @var bool
@@ -69,8 +69,8 @@
*
* @var array(string=>mixed)
*/
- private $structure;
-
+ private $structure;
+
/**
* Creates an ezcLogFilterRule.
*
@@ -84,32 +84,32 @@
* @param bool $continueProcessing
* @return void
*/
- public function __construct( ezcLogFilter $filter, $container,
$continueProcessing )
- {
+ public function __construct( ezcLogFilter $filter, $container,
$continueProcessing )
+ {
$this->filter = clone( $filter );
if ( $this->filter->severity == 0 )
- {
- $this->severityStar = true;
- }
+ {
+ $this->severityStar = true;
+ }
if ( sizeof( $this->filter->source ) == 0 )
- {
+ {
$this->filter->source = array( "*" );
- $this->sourceStar = true;
- }
+ $this->sourceStar = true;
+ }
if ( sizeof( $this->filter->category ) == 0 )
- {
+ {
$this->filter->category = array( "*" );
- $this->categoryStar = true;
- }
+ $this->categoryStar = true;
+ }
- $this->continueProcessing = $continueProcessing;
- $this->container = ( is_array( $container ) ? $container :
array( $container ) );
+ $this->continueProcessing = $continueProcessing;
+ $this->container = ( is_array( $container ) ? $container : array(
$container ) );
- $this->createStructure();
- }
+ $this->createStructure();
+ }
/**
* Creates an internal structure, to quickly lookup the combination of
severity, source, and
@@ -117,8 +117,8 @@
*
* @return void
*/
- protected function createStructure()
- {
+ protected function createStructure()
+ {
$severities = $this->getMaskArray( $this->filter->severity );
if ( sizeof( $severities ) == 0 )
{
@@ -131,13 +131,13 @@
{
foreach ( $this->filter->category as $category )
{
- $key = $severity . "_" . $source . "_"
. $category;
+ $key = $severity . "_" . $source . "_" . $category;
- $this->structure[ $key ] = true;
+ $this->structure[ $key ] = true;
}
}
}
- }
+ }
/**
* Returns true when the given $severity, $source, and $category matches
with this filter rule.
@@ -147,36 +147,36 @@
* @param string $category
* @return bool
*/
- public function isMatch( $severity, $source, $category )
- {
- if ( $this->severityStar )
+ public function isMatch( $severity, $source, $category )
+ {
+ if ( $this->severityStar )
{
$severity = "*";
}
- if ( $this->sourceStar )
+ if ( $this->sourceStar )
{
$source = "*";
}
- if ( $this->categoryStar )
+ if ( $this->categoryStar )
{
$category = "*";
}
- $key = $severity . "_" . $source . "_" . $category;
- return ( isset( $this->structure[ $key ] ) && $this->structure[
$key ] );
- }
+ $key = $severity . "_" . $source . "_" . $category;
+ return ( isset( $this->structure[ $key ] ) && $this->structure[ $key ]
);
+ }
/**
* Returns the container, containing the result.
*
* @return mixed
*/
- public function getContainer()
- {
- return $this->container;
- }
+ public function getContainer()
+ {
+ return $this->container;
+ }
/**
* Returns true if, after matching, should proceeded to the next filter
rule.
@@ -184,10 +184,10 @@
* @return bool
*/
- public function shouldContinueProcessing()
- {
- return $this->continueProcessing;
- }
+ public function shouldContinueProcessing()
+ {
+ return $this->continueProcessing;
+ }
/**
* Returns the bits set in $mask as separate values in an array.
Modified: trunk/EventLog/src/writers/writer_file.php
===================================================================
--- trunk/EventLog/src/writers/writer_file.php 2006-09-28 08:36:04 UTC (rev
3607)
+++ trunk/EventLog/src/writers/writer_file.php 2006-09-28 08:46:30 UTC (rev
3608)
@@ -253,31 +253,31 @@
}
- /**
- * Maps the filename $fileName to the messages specified by the [EMAIL
PROTECTED] ezcLogFilter} $logFilter.
+ /**
+ * Maps the filename $fileName to the messages specified by the [EMAIL
PROTECTED] ezcLogFilter} $logFilter.
*
* Log messages that matches with the filter are written to the file
$fileName.
*
* @param ezcLogFilter $logFilter
* @param string $fileName
* @return void
- */
- public function setFile( ezcLogFilter $logFilter, $fileName )
- {
+ */
+ public function setFile( ezcLogFilter $logFilter, $fileName )
+ {
$fh = $this->openFile( $fileName );
$this->fileMap->appendRule( new ezcLogFilterRule( $logFilter, $fh,
true ) );
- }
+ }
//
-// /**
-// * Unmaps the filename $fileName from the messages specified by the
[EMAIL PROTECTED] ezcLogFilter} $logFilter.
+// /**
+// * Unmaps the filename $fileName from the messages specified by the
[EMAIL PROTECTED] ezcLogFilter} $logFilter.
// *
// * Log messages that matches with the filter are no longer written to
the file $fileName.
// *
// * @param ezcLogFilter $logFilter
// * @param string $fileName
// * @return void
-// */
+// */
// public function unmap( $logFilter, $fileName )
// {
// $this->fileMap->unmap( $logFilter->severity, $logFilter->source,
$logFilter->category, $this->openFiles[ $fileName ] );
Modified: trunk/EventLogDatabaseTiein/src/writers/writer_database.php
===================================================================
--- trunk/EventLogDatabaseTiein/src/writers/writer_database.php 2006-09-28
08:36:04 UTC (rev 3607)
+++ trunk/EventLogDatabaseTiein/src/writers/writer_database.php 2006-09-28
08:46:30 UTC (rev 3608)
@@ -138,7 +138,7 @@
* @throws ezcLogWriterException when the log writer was unable to write
the log message.
* @param string $message
* @param int $severity
- * ezcLog:: DEBUG, SUCCES_AUDIT, FAILED_AUDIT, INFO, NOTICE,
WARNING, ERROR or FATAL.
+ * ezcLog:: DEBUG, SUCCES_AUDIT, FAILED_AUDIT, INFO, NOTICE,
WARNING, ERROR or FATAL.
*
* $param string $source
* @param string $category
@@ -210,8 +210,8 @@
}
- /**
- * Maps the table $tableName to the messages specified by the [EMAIL
PROTECTED] ezcLogFilter} $logFilter.
+ /**
+ * Maps the table $tableName to the messages specified by the [EMAIL
PROTECTED] ezcLogFilter} $logFilter.
*
* Log messages that matches with the filter are written to the table
$tableName.
* This method works the same as [EMAIL PROTECTED] ezclog::map()}.
@@ -219,14 +219,14 @@
* @param ezcLogFilter $logFilter
* @param string $tableName
* @return void
- */
- public function setTable( ezcLogFilter $logFilter, $tableName )
- {
+ */
+ public function setTable( ezcLogFilter $logFilter, $tableName )
+ {
$this->map->appendRule( new ezcLogFilterRule( $logFilter, $tableName,
true ) );
- }
+ }
- /**
- * Unmaps the table $tableName from the messages specified by the
[EMAIL PROTECTED] ezcLogFilter} $logFilter.
+ /**
+ * Unmaps the table $tableName from the messages specified by the [EMAIL
PROTECTED] ezcLogFilter} $logFilter.
*
* Log messages that matches with the filter are no longer written to the
table $tableName.
* This method works the same as [EMAIL PROTECTED] ezclog::unmap()}.
@@ -234,7 +234,7 @@
* @param ezcLogFilter $logFilter
* @param string $fileName
* @return void
- */
+ */
public function unmap( ezcLogFilter $logFilter, $tableName )
{
$this->map->unmap( $logFilter->severity, $logFilter->source,
$logFilter->category, $tableName );
Modified: trunk/Graph/src/driver/svg.php
===================================================================
--- trunk/Graph/src/driver/svg.php 2006-09-28 08:36:04 UTC (rev 3607)
+++ trunk/Graph/src/driver/svg.php 2006-09-28 08:46:30 UTC (rev 3608)
@@ -319,20 +319,20 @@
{
$this->createDocument();
- $lastPoint = end( $points );
+ $lastPoint = end( $points );
$pointString = sprintf( ' M %.4f,%.4f',
$lastPoint->x + $this->options->graphOffset->x,
$lastPoint->y + $this->options->graphOffset->y
);
- foreach ( $points as $point )
+ foreach ( $points as $point )
{
$pointString .= sprintf( ' L %.4f,%.4f',
$point->x + $this->options->graphOffset->x,
$point->y + $this->options->graphOffset->y
);
}
- $pointString .= ' z ';
+ $pointString .= ' z ';
$path = $this->dom->createElement( 'path' );
$path->setAttribute( 'd', $pointString );
@@ -342,7 +342,7 @@
$this->getStyle( $color, $filled, $thickness )
);
$path->setAttribute( 'id', $id = ( $this->options->idPrefix .
'Polygon_' . ++$this->elementID ) );
- $this->elements->appendChild( $path );
+ $this->elements->appendChild( $path );
return $id;
}
Modified: trunk/Graph/src/math/matrix.php
===================================================================
--- trunk/Graph/src/math/matrix.php 2006-09-28 08:36:04 UTC (rev 3607)
+++ trunk/Graph/src/math/matrix.php 2006-09-28 08:46:30 UTC (rev 3608)
@@ -285,7 +285,7 @@
return $this;
}
- /**
+ /**
* Multiplies two matrices
*
* Multiply current matrix with another matrix and returns the result
@@ -294,7 +294,7 @@
* @param ezcGraphMatrix $matrix Second factor
* @returns ezcGraphMatrix Result matrix
*/
- public function multiply( ezcGraphMatrix $matrix )
+ public function multiply( ezcGraphMatrix $matrix )
{
$mColumns = $matrix->columns();
if ( $this->columns !== ( $mRows = $matrix->rows() ) )
@@ -304,18 +304,18 @@
$result = new ezcGraphMatrix( $this->rows, $mColumns );
- for ( $i = 0; $i < $this->rows; ++$i )
+ for ( $i = 0; $i < $this->rows; ++$i )
{
- for ( $j = 0; $j < $mColumns; ++$j )
+ for ( $j = 0; $j < $mColumns; ++$j )
{
- $sum = 0;
- for ( $k = 0; $k < $mRows; ++$k ) {
- $sum += $this->matrix[$i][$k] *
$matrix->get( $k, $j );
- }
+ $sum = 0;
+ for ( $k = 0; $k < $mRows; ++$k ) {
+ $sum += $this->matrix[$i][$k] * $matrix->get( $k, $j );
+ }
- $result->set( $i, $j, $sum );
- }
- }
+ $result->set( $i, $j, $sum );
+ }
+ }
return $result;
}
@@ -339,9 +339,9 @@
{
// Build complete equatation
$equatation = new ezcGraphMatrix( $this->rows, $columns = (
$this->columns + 1 ) );
- for ( $i = 0; $i < $this->rows; ++$i )
+ for ( $i = 0; $i < $this->rows; ++$i )
{
- for ( $j = 0; $j < $this->columns; ++$j )
+ for ( $j = 0; $j < $this->columns; ++$j )
{
$equatation->set( $i, $j, $this->matrix[$i][$j] );
}
@@ -349,9 +349,9 @@
}
// Compute upper triangular matrix on left side of equatation
- for ( $i = 0; $i < ( $this->rows - 1 ); ++$i )
+ for ( $i = 0; $i < ( $this->rows - 1 ); ++$i )
{
- for ( $j = $i + 1; $j < $this->rows; ++$j )
+ for ( $j = $i + 1; $j < $this->rows; ++$j )
{
if ( $equatation->get( $j, $i ) !== 0 )
{
@@ -373,7 +373,7 @@
}
// Normalize values on left side matrix diagonale
- for ( $i = 0; $i < $this->rows; ++$i )
+ for ( $i = 0; $i < $this->rows; ++$i )
{
if ( ( ( $value = $equatation->get( $i, $i ) ) != 1 ) &&
( $value != 0 ) )
@@ -447,9 +447,9 @@
$l = new ezcGraphMatrix( $this->columns, $this->rows );
$r = new ezcGraphMatrix( $this->columns, $this->rows );
- for ( $i = 0; $i < $this->columns; ++$i )
+ for ( $i = 0; $i < $this->columns; ++$i )
{
- for ( $j = $i; $j < $this->rows; ++$j )
+ for ( $j = $i; $j < $this->rows; ++$j )
{
$r->set( $i, $j, $this->matrix[$i][$j] );
for ( $k = 0; $k <= ( $i - 1 ); ++$k )
@@ -458,7 +458,7 @@
}
}
- for ( $j = $i + 1; $j < $this->rows; ++$j )
+ for ( $j = $i + 1; $j < $this->rows; ++$j )
{
$l->set( $j, $i, $this->matrix[$j][$i] );
for ( $k = 0; $k <= ( $i - 1 ); ++$k )
@@ -484,10 +484,10 @@
{
$string = sprintf( "%d x %d matrix:\n", $this->rows, $this->columns );
- for ( $i = 0; $i < $this->rows; ++$i )
+ for ( $i = 0; $i < $this->rows; ++$i )
{
$string .= '| ';
- for ( $j = 0; $j < $this->columns; ++$j )
+ for ( $j = 0; $j < $this->columns; ++$j )
{
$string .= sprintf( '%04.2f ', $this->get( $i, $j ) );
}
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
