From 431a5e00852a44c4a0ad4828ca12ea352a4bb0f3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 21 Feb 2019 11:32:32 +0100 Subject: [PATCH] Streamline usage of a node's name --- application/forms/AddNodeForm.php | 2 +- application/forms/EditNodeForm.php | 2 +- library/Businessprocess/BpNode.php | 8 ++++---- .../Modification/NodeCreateAction.php | 2 +- library/Businessprocess/Renderer/Breadcrumb.php | 2 +- library/Businessprocess/Renderer/TileRenderer.php | 5 ++--- .../Renderer/TileRenderer/NodeTile.php | 15 +++++++-------- library/Businessprocess/Renderer/TreeRenderer.php | 6 +++--- test/php/library/Businessprocess/HostNodeTest.php | 2 +- 9 files changed, 21 insertions(+), 23 deletions(-) diff --git a/application/forms/AddNodeForm.php b/application/forms/AddNodeForm.php index ad24cc0..2c0c36c 100644 --- a/application/forms/AddNodeForm.php +++ b/application/forms/AddNodeForm.php @@ -425,7 +425,7 @@ class AddNodeForm extends QuickForm $name = '@' . $file . ':' . $name; } - $list[$name] = (string) $node; // display name? + $list[$name] = $node->getName(); // display name? } } diff --git a/application/forms/EditNodeForm.php b/application/forms/EditNodeForm.php index f1fd29c..02f9337 100644 --- a/application/forms/EditNodeForm.php +++ b/application/forms/EditNodeForm.php @@ -359,7 +359,7 @@ class EditNodeForm extends QuickForm foreach ($this->bp->getNodes() as $node) { if ($node instanceof BpNode && ! isset($parents[$node->getName()])) { - $list[(string) $node] = (string) $node; // display name? + $list[$node->getName()] = $node->getName(); // display name? } } diff --git a/library/Businessprocess/BpNode.php b/library/Businessprocess/BpNode.php index c2a8b4a..643af1b 100644 --- a/library/Businessprocess/BpNode.php +++ b/library/Businessprocess/BpNode.php @@ -160,7 +160,7 @@ class BpNode extends Node $tree = array(); foreach ($this->getProblematicChildren() as $child) { - $name = (string) $child; + $name = $child->getName(); $tree[$name] = array( 'node' => $child, 'children' => array() @@ -197,11 +197,11 @@ class BpNode extends Node foreach ($this->getChildren() as $child) { if ($child->isMissing()) { - $missing[(string) $child] = $child; + $missing[$child->getName()] = $child; } foreach ($child->getMissingChildren() as $m) { - $missing[(string) $m] = $m; + $missing[$m->getName()] = $m; } } @@ -313,7 +313,7 @@ class BpNode extends Node public function getHtmlId() { - return 'businessprocess-' . preg_replace('/[\r\n\t\s]/', '_', (string) $this); + return 'businessprocess-' . preg_replace('/[\r\n\t\s]/', '_', $this->getName()); } protected function invertSortingState($state) diff --git a/library/Businessprocess/Modification/NodeCreateAction.php b/library/Businessprocess/Modification/NodeCreateAction.php index aa9162e..167d3bc 100644 --- a/library/Businessprocess/Modification/NodeCreateAction.php +++ b/library/Businessprocess/Modification/NodeCreateAction.php @@ -22,7 +22,7 @@ class NodeCreateAction extends NodeAction */ public function setParent(Node $name) { - $this->parentName = (string) $name; + $this->parentName = $name->getName(); } /** diff --git a/library/Businessprocess/Renderer/Breadcrumb.php b/library/Businessprocess/Renderer/Breadcrumb.php index aeb81b1..d848992 100644 --- a/library/Businessprocess/Renderer/Breadcrumb.php +++ b/library/Businessprocess/Renderer/Breadcrumb.php @@ -69,7 +69,7 @@ class Breadcrumb extends BaseHtmlElement // TODO: something more generic than NodeTile? $renderer = clone($renderer); $renderer->lock()->setIsBreadcrumb(); - $p = new NodeTile($renderer, (string) $node, $node, $path); + $p = new NodeTile($renderer, $node, $path); $p->setTag('li'); return $p; } diff --git a/library/Businessprocess/Renderer/TileRenderer.php b/library/Businessprocess/Renderer/TileRenderer.php index db66cb3..c77aa9f 100644 --- a/library/Businessprocess/Renderer/TileRenderer.php +++ b/library/Businessprocess/Renderer/TileRenderer.php @@ -35,14 +35,13 @@ class TileRenderer extends Renderer $path = $this->getCurrentPath(); foreach ($nodes as $name => $node) { - $this->add(new NodeTile($this, $name, $node, $path)); + $this->add(new NodeTile($this, $node, $path)); } if ($this->wantsRootNodes()) { $unbound = $this->createUnboundParent($bp); if ($unbound->hasChildren()) { - $name = $unbound->getName(); - $this->add(new NodeTile($this, $name, $unbound)); + $this->add(new NodeTile($this, $unbound)); } } diff --git a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php index 91f9bc6..9535da2 100644 --- a/library/Businessprocess/Renderer/TileRenderer/NodeTile.php +++ b/library/Businessprocess/Renderer/TileRenderer/NodeTile.php @@ -36,10 +36,9 @@ class NodeTile extends BaseHtmlElement * @param Node $node * @param null $path */ - public function __construct(Renderer $renderer, $name, Node $node, $path = null) + public function __construct(Renderer $renderer, Node $node, $path = null) { $this->renderer = $renderer; - $this->name = $name; $this->node = $node; $this->path = $path; } @@ -72,9 +71,9 @@ class NodeTile extends BaseHtmlElement $attributes = $this->getAttributes(); $attributes->add('class', $renderer->getNodeClasses($node)); - $attributes->add('id', 'bp-' . (string) $node); + $attributes->add('id', 'bp-' . $node->getName()); if (! $renderer->isLocked()) { - $attributes->add('data-node-name', (string) $node); + $attributes->add('data-node-name', $node->getName()); } if (! $renderer->isBreadcrumb()) { @@ -260,7 +259,7 @@ class NodeTile extends BaseHtmlElement [ 'href' => $renderer->getUrl() ->with('action', 'simulation') - ->with('simulationnode', $this->name), + ->with('simulationnode', $this->node->getName()), 'title' => mt( 'businessprocess', 'Show the business impact of this node by simulating a specific state' @@ -274,7 +273,7 @@ class NodeTile extends BaseHtmlElement [ 'href' => $renderer->getUrl() ->with('action', 'editmonitored') - ->with('editmonitorednode', $node->getName()), + ->with('editmonitorednode', $this->node->getName()), 'title' => mt('businessprocess', 'Modify this monitored node') ], Html::tag('i', ['class' => 'icon icon-edit']) @@ -282,7 +281,7 @@ class NodeTile extends BaseHtmlElement } if (! $this->renderer->getBusinessProcess()->getMetadata()->canModify() - || $node->getName() === '__unbound__' + || $this->node->getName() === '__unbound__' ) { return; } @@ -293,7 +292,7 @@ class NodeTile extends BaseHtmlElement [ 'href' => $renderer->getUrl() ->with('action', 'edit') - ->with('editnode', $node->getName()), + ->with('editnode', $this->node->getName()), 'title' => mt('businessprocess', 'Modify this business process node') ], Html::tag('i', ['class' => 'icon icon-edit']) diff --git a/library/Businessprocess/Renderer/TreeRenderer.php b/library/Businessprocess/Renderer/TreeRenderer.php index d543373..5dce546 100644 --- a/library/Businessprocess/Renderer/TreeRenderer.php +++ b/library/Businessprocess/Renderer/TreeRenderer.php @@ -75,7 +75,7 @@ class TreeRenderer extends Renderer */ protected function getId(Node $node, $path) { - return md5(implode(';', $path) . (string) $node); + return md5(implode(';', $path) . $node->getName()); } protected function getStateClassNames(Node $node) @@ -192,7 +192,7 @@ class TreeRenderer extends Renderer 'config' => $node->getBpConfig()->getName(), 'node' => $node instanceof ImportedNode ? $node->getNodeName() - : (string) $node + : $node->getName() ]) ->getAbsoluteUrl() ]); @@ -215,7 +215,7 @@ class TreeRenderer extends Renderer $li = Html::tag('li', [ 'class' => 'movable', 'id' => $this->getId($node, $path ?: []), - 'data-node-name' => (string) $node + 'data-node-name' => $node->getName() ]); $li->add($this->getNodeIcons($node, $path)); diff --git a/test/php/library/Businessprocess/HostNodeTest.php b/test/php/library/Businessprocess/HostNodeTest.php index ff23476..069f432 100644 --- a/test/php/library/Businessprocess/HostNodeTest.php +++ b/test/php/library/Businessprocess/HostNodeTest.php @@ -20,7 +20,7 @@ class HostNodeTest extends BaseTestCase { $this->assertEquals( 'localhost;Hoststatus', - (string) $this->localhost() + $this->localhost()->getName() ); }