fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-3700

Browse Source 
Fix Tree ambiguos class. Resolved renaming Tree to PmTree
This commit is contained in:
David Callizaya
2017-08-21 10:39:10 -04:00
parent c4a70d35d9
commit bfe2b7ec38
17 changed files with 257 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gulliver/system/class.tree.php
View File

@@ -1,38 +1,10 @@
<?php
/**
* class.tree.php
*
* @package gulliver.system
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2011 Colosa Inc.
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
* <20>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
/**
*
* @package gulliver.system
*/
class Tree extends Xml_Node
class PmTree extends Xml_Node
{
public $template = 'tree.html';
@@ -55,7 +27,7 @@ class Tree extends Xml_Node
*
* @return none
*/
public function Tree($xmlnode = null)
public function PmTree($xmlnode = null)
{
if (!isset($xmlnode)) {
return;
@@ -66,7 +38,7 @@ class Tree extends Xml_Node
foreach ($xmlnode as $key => $value) {
if ($key === 'children') {
foreach ($xmlnode->children as $key => $value) {
$this->children[$key] = new Tree($value->toTree());
$this->children[$key] = new PmTree($value->toTree());
}
} elseif ($key === 'attributes') {
foreach ($xmlnode->attributes as $key => $value) {
@@ -89,7 +61,7 @@ class Tree extends Xml_Node
*/
public function &addChild($name, $label, $attributes = array())
{
$newNode = new Tree(new Xml_Node($name, 'open', $label, $attributes));
$newNode = new PmTree(new Xml_Node($name, 'open', $label, $attributes));
$this->children[] = & $newNode;
return $newNode;
}
@@ -156,4 +128,3 @@ class Tree extends Xml_Node
return $obj->printObject(array('node' => &$this));
}
}