Vergleich inc/3rdparty/diff/Diff/Renderer.php - 1.6.1 - 1.6.12

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 5Zeile 5
 * This class renders the diff in classic diff format. It is intended that
* this class be customized via inheritance, to obtain fancier outputs.
*

 * This class renders the diff in classic diff format. It is intended that
* this class be customized via inheritance, to obtain fancier outputs.
*

 * $Horde: framework/Text_Diff/Diff/Renderer.php,v 1.5.10.10 2008/01/04 10:37:27 jan Exp $
*
* Copyright 2004-2008 The Horde Project (http://www.horde.org/)

 * Copyright 2004-2011 Horde LLC (http://www.horde.org/)



 *
* See the enclosed file COPYING for license information (LGPL). If you did

 *
* See the enclosed file COPYING for license information (LGPL). If you did

 * not receive this file, see http://opensource.org/licenses/lgpl-license.php.

 * not receive this file, see http://www.horde.org/licenses/lgpl21.

 *
* @package Text_Diff
*/

 *
* @package Text_Diff
*/

class Text_Diff_Renderer {

 




 
// Disallow direct access to this file for security reasons
if(!defined("IN_MYBB"))
{
die("Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.");
}

class Horde_Text_Diff_Renderer
{

    /**
* Number of leading context "lines" to preserve.
*
* This should be left at zero for this class, but subclasses may want to
* set this to other values.
*/

    /**
* Number of leading context "lines" to preserve.
*
* This should be left at zero for this class, but subclasses may want to
* set this to other values.
*/

    var $_leading_context_lines = 0;

    protected $_leading_context_lines = 0;


/**
* Number of trailing context "lines" to preserve.


/**
* Number of trailing context "lines" to preserve.

Zeile 30Zeile 35
     * This should be left at zero for this class, but subclasses may want to
* set this to other values.
*/

     * This should be left at zero for this class, but subclasses may want to
* set this to other values.
*/

    var $_trailing_context_lines = 0;

    protected $_trailing_context_lines = 0;


/**
* Constructor.
*/


/**
* Constructor.
*/

    function Text_Diff_Renderer($params = array())

    public function __construct($params = array())

    {
foreach ($params as $param => $value) {
$v = '_' . $param;

    {
foreach ($params as $param => $value) {
$v = '_' . $param;

Zeile 50Zeile 55
     *
* @return array All parameters of this renderer object.
*/

     *
* @return array All parameters of this renderer object.
*/

    function getParams()

    public function getParams()

    {
$params = array();
foreach (get_object_vars($this) as $k => $v) {

    {
$params = array();
foreach (get_object_vars($this) as $k => $v) {

Zeile 65Zeile 70
    /**
* Renders a diff.
*

    /**
* Renders a diff.
*

     * @param Text_Diff $diff  A Text_Diff object.

     * @param Horde_Text_Diff $diff  A Horde_Text_Diff object.

     *
* @return string The formatted output.
*/

     *
* @return string The formatted output.
*/

    function render($diff)

    public function render($diff)

    {
$xi = $yi = 1;
$block = false;

    {
$xi = $yi = 1;
$block = false;

Zeile 85Zeile 90
            /* If these are unchanged (copied) lines, and we want to keep
* leading or trailing context lines, extract them from the copy
* block. */

            /* If these are unchanged (copied) lines, and we want to keep
* leading or trailing context lines, extract them from the copy
* block. */

            if (is_a($edit, 'Text_Diff_Op_copy')) {

            if ($edit instanceof Horde_Text_Diff_Op_Copy) {

                /* Do we have any diff blocks yet? */
if (is_array($block)) {
/* How many lines to keep as context from the copy

                /* Do we have any diff blocks yet? */
if (is_array($block)) {
/* How many lines to keep as context from the copy

Zeile 100Zeile 105
                            /* Create a new block with as many lines as we need
* for the trailing context. */
$context = array_slice($edit->orig, 0, $ntrail);

                            /* Create a new block with as many lines as we need
* for the trailing context. */
$context = array_slice($edit->orig, 0, $ntrail);

                            $block[] = &new Text_Diff_Op_copy($context);

                            $block[] = new Horde_Text_Diff_Op_Copy($context);

                        }
/* @todo */
$output .= $this->_block($x0, $ntrail + $xi - $x0,

                        }
/* @todo */
$output .= $this->_block($x0, $ntrail + $xi - $x0,

Zeile 120Zeile 125
                    $y0 = $yi - count($context);
$block = array();
if ($context) {

                    $y0 = $yi - count($context);
$block = array();
if ($context) {

                        $block[] = &new Text_Diff_Op_copy($context);

                        $block[] = new Horde_Text_Diff_Op_Copy($context);

                    }
}
$block[] = $edit;

                    }
}
$block[] = $edit;

Zeile 141Zeile 146
        }

return $output . $this->_endDiff();

        }

return $output . $this->_endDiff();

    }

function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
{

    }

protected function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
{

        $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));

foreach ($edits as $edit) {

        $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));

foreach ($edits as $edit) {

            switch (strtolower(get_class($edit))) {
case 'text_diff_op_copy':

            switch (get_class($edit)) {
case 'Horde_Text_Diff_Op_Copy':

                $output .= $this->_context($edit->orig);

                $output .= $this->_context($edit->orig);

                break;

                break;





            case 'text_diff_op_add':

            case 'Horde_Text_Diff_Op_Add':

                $output .= $this->_added($edit->final);

                $output .= $this->_added($edit->final);

                break;

                break;





            case 'text_diff_op_delete':

            case 'Horde_Text_Diff_Op_Delete':

                $output .= $this->_deleted($edit->orig);

                $output .= $this->_deleted($edit->orig);

                break;

                break;





            case 'text_diff_op_change':

            case 'Horde_Text_Diff_Op_Change':

                $output .= $this->_changed($edit->orig, $edit->final);
break;
}

                $output .= $this->_changed($edit->orig, $edit->final);
break;
}

Zeile 170Zeile 175
        return $output . $this->_endBlock();
}


        return $output . $this->_endBlock();
}


    function _startDiff()
{
return '';
}

function _endDiff()
{
return '';
}

function _blockHeader($xbeg, $xlen, $ybeg, $ylen)

    protected function _startDiff()
{
return '';
}

protected function _endDiff()
{
return '';
}

protected function _blockHeader($xbeg, $xlen, $ybeg, $ylen)

    {
if ($xlen > 1) {
$xbeg .= ',' . ($xbeg + $xlen - 1);

    {
if ($xlen > 1) {
$xbeg .= ',' . ($xbeg + $xlen - 1);

Zeile 195Zeile 200
        } elseif (!$xlen) {
$xbeg--;
}

        } elseif (!$xlen) {
$xbeg--;
}





        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
}


        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
}


    function _startBlock($header)

    protected function _startBlock($header)

    {
return $header . "\n";

    {
return $header . "\n";

    }

    }





    function _endBlock()

    protected function _endBlock()

    {
return '';
}


    {
return '';
}


    function _lines($lines, $prefix = ' ')
{
return $prefix . implode("\n$prefix", $lines) . "\n";
}

function _context($lines)

    protected function _lines($lines, $prefix = ' ')
{
return $prefix . implode("\n$prefix", $lines) . "\n";
}

protected function _context($lines)

    {
return $this->_lines($lines, ' ');

    {
return $this->_lines($lines, ' ');

    }

    }





    function _added($lines)

    protected function _added($lines)

    {
return $this->_lines($lines, '> ');
}


    {
return $this->_lines($lines, '> ');
}


    function _deleted($lines)
{
return $this->_lines($lines, '< ');
}

function _changed($orig, $final)

    protected function _deleted($lines)
{
return $this->_lines($lines, '< ');
}

protected function _changed($orig, $final)

    {
return $this->_deleted($orig) . "---\n" . $this->_added($final);
}

    {
return $this->_deleted($orig) . "---\n" . $this->_added($final);
}



 
}

}